Commit Graph

361 Commits

Author SHA1 Message Date
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
Daniel Kaspo 9d557785e3 linkify in markup.js now adds keys to multiple links.
Notably, LID "VIEWWALLET_Subtitle" was causing an issue here, since it
had more than one link. React was complaining about it but now it's all
good.
2017-05-31 19:58:03 -04:00
Daniel Kaspo 083b7c5caa Merge pull request #7 from MyEtherWallet/more_translations
More translations
2017-05-31 00:37:46 -04:00
Daniel Kaspo e49e72d250 Let to Const 2017-05-31 00:36:00 -04:00
Daniel Ternyak db70e17a67 PR comments 2017-05-30 22:34:57 -05:00
Daniel Kaspo 4a140b7901 Merge pull request #8 from MyEtherWallet/linting-routing
Linting routing
2017-05-30 20:57:46 -04:00
Daniel Kaspo 943161a863 Linting double quotes to single 2017-05-30 20:53:14 -04:00
Daniel Ternyak 62dcec96d9 fix merge conflicts 2017-05-30 18:35:30 -05:00
crptm e9cddb516e actually use friendly errors webpack plugin 2017-05-31 01:00:30 +04:00
crptm 96cf7f5969 eslint 2017-05-31 00:36:52 +04:00
crptm e80ad3b053 trick reconciler into re-render on language change 2017-05-30 15:19:51 +04:00
crptm b7ffa458b0 decode &s 2017-05-30 15:18:59 +04:00
crptm ec4212ae8f fix footer spacing 2017-05-30 15:18:39 +04:00
crptm f9b351b4c8 Revert "fix & sign"
This reverts commit 448ffe64f4.
2017-05-30 15:02:20 +04:00
Daniel Ternyak f4e7f0648b improve GenerateWalletPasswordComponent translation support 2017-05-30 01:18:44 -05:00
Daniel Ternyak 448ffe64f4 fix & sign 2017-05-30 01:18:23 -05:00