Commit Graph

976 Commits

Author SHA1 Message Date
Daniel Ternyak c46ed8f6ed clean up Generate Wallet actions to not use boilerplate 2017-06-19 22:15:38 -05:00
Daniel Kaspo 3f6bf916cd Added sanity checks so decrypt doesn't blow up on null. 2017-06-19 21:02:29 -04:00
Daniel Kaspo 91c854f2e1 Replaced component with key in wallet-decrypt state. 2017-06-19 21:02:28 -04:00
Daniel Kaspo 6d48e5b36b Changing how we handle event functions. 2017-06-19 21:02:28 -04:00
Daniel Kaspo 37e78df682 Logging public and private key temporarily for Travis 2017-06-19 21:02:28 -04:00
Daniel Kaspo ce3749000f Keystore decryption initial implementation. 2017-06-19 21:02:28 -04:00
Daniel Kaspo c448e7331f Properly bound onChange handler for wallet decrypt. 2017-06-19 21:01:45 -04:00
Daniel Kaspo 670e283dbf Returned null instead of an empty div. 2017-06-19 21:01:45 -04:00
Daniel Kaspo 87121c8a6d Added logic for changing of decryption selections. 2017-06-19 21:01:45 -04:00
Daniel Kaspo 6ac6237f72 Added folders for future decryption components. 2017-06-19 21:01:45 -04:00
Daniel Kaspo a77c973bb4 Made method to build markup for decryption choices. 2017-06-19 21:01:45 -04:00
Daniel Kaspo 1ba467b355 Removed un-needed constructors 2017-06-19 21:01:45 -04:00
Daniel Kaspo 70d71b158b Added initial Keystore Decrypt component
Markup isn't quite right just yet but that'll be added in the next
commit.
2017-06-19 21:01:45 -04:00
Daniel Kaspo 413b61c335 Changed route name back to ViewWallet 2017-06-19 21:01:45 -04:00
Daniel Kaspo f8e9906b37 Added and marked up wallet decrypt component.
Still needs lots of work at this point, but all the visuals are done,
it's been renamed to what Taylor said it should be called, and all the
Aria labels have been properly updated.
2017-06-19 21:01:44 -04:00
Daniel Ternyak 227abd5ff6 Merge pull request #13 from MyEtherWallet/swap
WIP Swap Part 1
2017-06-19 18:51:01 -05:00
Daniel Ternyak b33d2ef590 don't pass around bityRates when you can access from state in reducer 2017-06-19 18:47:11 -05:00
Daniel Ternyak e6ce0b928a don't put store on window anymore 2017-06-19 18:41:45 -05:00
Daniel Ternyak c820cf8ce3 remove unused propType 2017-06-19 18:35:52 -05:00
Daniel Ternyak e7d8284d69 move state building into swap reducer instead of in wantToSwapMy component 2017-06-19 18:35:14 -05:00
Daniel Ternyak 67d57c3d4b remove eslint warning because store was undefined since it was global 2017-06-19 00:49:52 -05:00
Daniel Ternyak 6f638c66da remove unused actions 2017-06-19 00:39:57 -05:00
Daniel Ternyak 67a5eee0a9 Reformat 2017-06-19 00:39:07 -05:00
Daniel Ternyak f32a2d6631 Reformat: common/containers/Tabs/Swap/components/wantToSwapMy.js 2017-06-19 00:37:17 -05:00
Daniel Ternyak f0d00b3815 deleted common/libs/inputValidator.js 2017-06-18 23:57:46 -05:00
Daniel Ternyak 3cf43d04ad address additional comments 2017-06-18 23:56:32 -05:00
Daniel Ternyak c77f5ef300 address sleep() hack -- get state directly from redux instead of relying on props 2017-06-18 23:53:32 -05:00
Daniel Ternyak 192efd4404 reformat 2017-06-18 20:00:54 -05:00
Daniel Ternyak f2b8045c21 address additional comments 2017-06-18 19:56:11 -05:00
Daniel Ternyak 1ae411fbf0 Merge branch 'develop' of https://github.com/MyEtherWallet/MyEtherWallet into swap 2017-06-18 19:32:44 -05:00
Daniel Ternyak 3ec7b5c834 Merge pull request #14 from MyEtherWallet/cleanup
Cleanup
2017-06-18 15:00:54 -05:00
Daniel Ternyak 3333169c27 Fix duplicate location key due to bad marge 2017-06-18 15:00:15 -05:00
Daniel Ternyak 125d8742ae Merge branch 'cleanup' into swap 2017-06-18 14:58:45 -05:00
Daniel Ternyak 8e530fe476 use props.location instead of window 2017-06-18 14:56:12 -05:00
Daniel Ternyak fb73be4214 WIP address comments 2017-06-18 14:47:00 -05:00
Daniel Ternyak 00e5962ae0 Merge branch 'cleanup' into swap 2017-06-18 14:39:46 -05:00
Daniel Ternyak ef4c7c8868 Merge branch 'develop' of https://github.com/MyEtherWallet/MyEtherWallet into swap 2017-06-18 14:31:02 -05:00
Daniel Ternyak e98ac4ac57 Merge pull request #17 from MyEtherWallet/windows-run-build
Use `fs` library so even Windows users can run build.
2017-06-18 14:27:41 -05:00
Daniel Kaspo d9ec50f859 Use `fs` library so even Windows users can run build. 2017-06-12 20:20:52 -04:00
Daniel Ternyak df3ddd7351 Add swap link; fix activeOrNot nav option selection. 2017-06-11 20:08:48 -05:00
Daniel Ternyak ee8c411c4e Remove comments. 2017-06-11 20:08:19 -05:00
Daniel Ternyak 81d5f64100 Swap: add axios and lodash to package.json 2017-06-11 20:05:36 -05:00
Daniel Ternyak d745729d95 Swap: Initial Swap Home View 2017-06-11 20:02:39 -05:00
Daniel Ternyak e8a10b3848 Swap: Initial Bity API Class 2017-06-11 20:01:27 -05:00
Daniel Ternyak 0304bc8a67 Swap: Redux actions; Redux Reducers 2017-06-11 20:00:28 -05:00
Daniel Ternyak 9144d2c666 Merge pull request #11 from MyEtherWallet/feat/translator-names
translator names
2017-06-01 23:46:21 -05:00
crptm 3718e4f128 translator names 2017-06-02 00:45:00 +04:00
crptm aca012af6a tarnslate: html entites test 2017-06-02 00:13:59 +04:00
Daniel Ternyak 69e1fbd8ff Merge pull request #10 from MyEtherWallet/key-markup-links
linkify in markup.js now adds keys to multiple links.
2017-05-31 20:06:59 -05:00
Daniel Kaspo 608f50ae1c Added keys for bolding and linking for markup.js
If you were to mix-and-match or use multiple markdown elements in one
string, this would cause a React key error. This fixes it by key-ing all
the things!
2017-05-31 20:46:03 -04:00