Commit Graph

527 Commits

Author SHA1 Message Date
Daniel Ternyak 06ae70988a merge develop into 'swap_part_3' 2017-07-03 22:21:19 -05:00
crptm bead2b30ad fix merge errors 2017-07-04 06:22:16 +04:00
crptm 40f2c4466a merge develop 2017-07-04 06:18:16 +04:00
crptm 85759d73b4 type dropdown, config actions 2017-07-04 05:25:01 +04:00
Daniel Ternyak 20b1d85bb8 undo donation address hardcode temp 2017-07-03 19:39:36 -05:00
Daniel Ternyak 7846b2125a merge develop info 'donation_addresses' 2017-07-03 19:24:22 -05:00
Daniel Ternyak 164e6a07bb fix additional hardcoded address issues 2017-07-03 19:20:47 -05:00
crptm 13bb96e966 merge develop 2017-07-04 04:17:57 +04:00
Daniel Ternyak 29be2821a3 refactor donation addresses map; fix hardcoded instance of address in send 2017-07-03 19:16:20 -05:00
Daniel Ternyak 8f77aedc70 swapProgress: create computed class for active step; cleanup 2017-07-03 19:09:33 -05:00
Daniel Ternyak 513b4c67b9 Bity: refactor and remove unnecessary class 2017-07-03 19:08:35 -05:00
crptm 65234a26c0 fix flow sagas errors 2017-07-04 03:59:27 +04:00
Daniel Ternyak 62150fb63b swapProgress: add translations and remove ng-scopes 2017-07-03 16:53:02 -05:00
Daniel Ternyak 73d54f562d merge develop info 'swap_part_3' 2017-07-03 13:23:44 -05:00
Daniel Ternyak 4c3f3b8cd1 Merge branch 'develop' into feat/send-page 2017-07-03 12:50:36 -05:00
Daniel Ternyak 727a6d3975 Keep redux state across hot module reloads 2017-07-02 12:55:58 -05:00
Daniel Ternyak 7cf3d26bbe Merge feat/send-page 2017-07-02 00:49:06 -05:00
Daniel Ternyak b623a3efe9 Swap Part 3 WIP 2017-07-02 00:45:22 -05:00
crptm 63e7eb89e4 unlock wip 2017-06-30 03:03:11 +04:00
crptm d6b7cca10a merge send-tx 2017-06-27 03:36:21 +04:00
crptm 0ad93101e7 validators merge 2017-06-27 03:27:26 +04:00
crptm 240007fe43 merge develop 2017-06-27 03:13:21 +04:00
crptm 9f2a209da5 typing fixes 2017-06-27 03:08:52 +04:00
crptm 96c8c88ab6 remove obsolete comment 2017-06-27 02:46:15 +04:00
crptm 1fb4a004ac send wip 2017-06-27 02:27:55 +04:00
Daniel Ternyak afe2adbb5a add translation support 2017-06-25 00:57:43 -05:00
Daniel Ternyak dab75a48b0 address comments 2017-06-24 15:39:03 -05:00
Daniel Ternyak 738606bdf0 Merge branch 'swap_part_2_more' into swap_part_2 2017-06-24 15:05:26 -05:00
Daniel Ternyak d5875614de create simplified toFixedIfLarger 2017-06-24 14:53:53 -05:00
Daniel Ternyak 08f44e1d4a Merge branch 'swap_part_2' into swap_part_2_more 2017-06-24 13:19:14 -05:00
Daniel Ternyak 119dda77e1 Create toFixedIfLarger function, unit test, and use in app. 2017-06-24 13:17:09 -05:00
Daniel Ternyak 28415cd0e8 Consume new receivingAddressSwap action creator and receivingAddress state, validate receiving address input using Validator class. 2017-06-24 01:09:44 -05:00
Daniel Ternyak c77f8430c5 Create Validator class and add deps to package.json 2017-06-24 01:08:57 -05:00
Daniel Ternyak bc9765d99b Redux: Add SWAP_RECEIVING_ADDRESS action creators/reducers. 2017-06-24 01:08:33 -05:00
Daniel Ternyak cb36331c2d Refactor: remove stray ng-binding 2017-06-23 20:34:13 -05:00
Daniel Ternyak 07bde87658 Refactor: Use global donation mapping instead of hardcoding donation address in footer 2017-06-23 20:27:17 -05:00
Daniel Ternyak 943a0532d7 Swap: Create components/adjust containers as neccesasary for part 2 of swap 2017-06-23 20:26:54 -05:00
Daniel Ternyak fc94460af0 Prototype Extesion: Create toFixedIfLarger and add test (that doesn't work yet) 2017-06-23 20:26:08 -05:00
Daniel Ternyak 2eab0082a6 Redux: Add partOneComplete actions/action creators/reducers. 2017-06-23 20:25:12 -05:00
crptm 51f2c8596e address review comments 2017-06-23 01:16:21 +04:00
crptm d0becf7746 notifications 2017-06-22 03:31:59 +04:00
Daniel Ternyak 1a4fac1dec accidently swapped verb and namespace order for action creators originally; fixed 2017-06-20 01:28:22 -05:00
Daniel Ternyak ba6d46e91d reformat 2017-06-20 01:14:35 -05:00
Daniel Ternyak ff81133b5e reformat 2017-06-20 01:14:23 -05:00
Daniel Ternyak 3644cb5515 format 2017-06-20 01:13:21 -05:00
Daniel Ternyak 3cee501da1 format 2017-06-20 01:08:26 -05:00
Daniel Ternyak 9a612eb6de use standard action creator naming convention 2017-06-20 00:59:54 -05:00
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 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 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 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 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
crptm 3718e4f128 translator names 2017-06-02 00:45:00 +04: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 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 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
Daniel Ternyak db19b45c0d fix active bug in navbar 2017-05-30 01:18:12 -05:00
Daniel Ternyak cf36d9eb52 footer, generate wallet improved translations 2017-05-29 23:53:28 -05:00
crptm 1602e19214 support translations markup 2017-05-26 02:05:11 +04:00
crptm bea2b12f2d add Korean to languages dropdown 2017-05-25 22:32:34 +04:00
crptm 6b7a555f19 + ko.js 2017-05-25 22:29:55 +04:00
crptm 8b021be460 update ja.js 2017-05-25 22:27:14 +04:00
crptm bb99a6f0b2 Merge branch 'develop' into feat/translations 2017-05-25 10:06:53 +00:00
crptm 8516b03343 baby translations 2017-05-25 04:06:30 +04:00
crptm 68516d2e79 remove translation key dupes. NEED REVIEW 2017-05-25 03:21:28 +04:00
crptm 7dc1c1d244 bring back dupe de key 2017-05-25 03:16:38 +04:00
crptm 530c477c66 translation files added 2017-05-25 03:15:01 +04:00
crptm 4345497a6d remove config boilerplate 2017-05-25 02:43:41 +04:00
crptm fa964a56d4 make flow work with aliasing 2017-05-25 02:39:58 +04:00
Daniel Ternyak 37f611ef91 make help a stateless component 2017-05-23 21:25:51 -05:00
Daniel Ternyak c6b172562a create initial help view 2017-05-23 21:23:33 -05:00
crptm ca889ce874 fix App dispatch typings 2017-05-24 03:22:06 +04:00
crptm 94b7111761 cleanup header 2017-05-24 03:06:01 +04:00
Daniel Ternyak 1e83abab33 add actions for downloading file and proceeding to paper wallet 2017-04-27 01:17:42 -05:00
Daniel Ternyak c5b6461631 reformat/refactor 2017-04-27 01:16:23 -05:00
Daniel Ternyak fdc4bfa3b8 remove nested <a> in <Link> element 2017-04-27 01:15:57 -05:00
Daniel Ternyak 180173735e use new redux state and actions in component 2017-04-27 01:15:27 -05:00
Daniel Ternyak 5d63e693ec pass new redux state and props through smart container 2017-04-27 01:15:07 -05:00
Daniel Ternyak e5c44afc75 remove all react warnings for ViewWallet initial view 2017-04-27 01:14:38 -05:00
Daniel Ternyak 32d9763cb1 fix bug in nodeselectordropdown reducer 2017-04-27 01:13:59 -05:00
Daniel Ternyak d79b54ff35 add cases for downloaded file and continue to paper actions 2017-04-27 01:13:33 -05:00
Daniel Ternyak aea605ec80 remove console.log 2017-04-27 01:12:37 -05:00
Daniel Ternyak 947bc1ce4b Create stateless component for Ledger Trezor Warning on GenerateWallet Page 2017-04-27 01:12:15 -05:00
Daniel Ternyak 20c256fc77 add route linking to tabs 2017-04-26 23:03:46 -05:00
Daniel Ternyak 0c457c8e82 whitespace reformatting 2017-04-26 23:02:38 -05:00
Daniel Ternyak e23409cbac better styling on ViewWallet view 2017-04-26 23:02:03 -05:00
Daniel Ternyak 9758aa6df3 export ViewWallet module from Tab 2017-04-26 23:01:26 -05:00
Daniel Ternyak 8f14403135 Don't make Tab a module anymore (part of dir re-structuring) 2017-04-26 23:00:22 -05:00
Daniel Ternyak 3207c367ed routing uses new dir structure; wire up ViewWallet route 2017-04-26 22:59:51 -05:00
Daniel Ternyak 3d8461617e restructure routing/container structure 2017-04-26 22:58:01 -05:00
Daniel Ternyak 6f6826c88c Bring in Confirm/Download and wire up initial local state 2017-04-26 22:16:01 -05:00
Daniel Ternyak 9450971bd6 re-enable tab options 2017-04-26 22:14:16 -05:00
Daniel Ternyak 7245df71a9 whitespace reformat 2017-04-26 22:13:59 -05:00
Daniel Ternyak 1ddcc3f32a remove github pages specific config 2017-04-26 22:13:39 -05:00
Daniel Ternyak 7c1e3e337d Refactor/dead code removal/code reformat. 2017-04-24 19:03:41 -05:00
Daniel Ternyak fa18b408cd Remove authCheck dead code. 2017-04-24 19:03:08 -05:00
Daniel Ternyak 5f11991b7f Refactor/code reformat. 2017-04-24 19:02:33 -05:00
Daniel Ternyak fa8d2e0907 Remove unneeded redux action imports. 2017-04-24 19:01:21 -05:00
Daniel Ternyak 30c51b9f72 refactor 2017-04-24 19:00:58 -05:00
Daniel Ternyak 270c4911c8 Remove unneeded reducer imports. 2017-04-24 18:59:57 -05:00
Daniel Ternyak 67c4b826f5 Add Flow types. 2017-04-24 18:59:28 -05:00
Daniel Ternyak eb658ec9ff Refactor/remove commented out codes. 2017-04-24 18:58:48 -05:00
Daniel Ternyak a12d720c8a Resolve broken prod css 2017-04-24 18:36:59 -05:00
Daniel Ternyak 5652c56995 Add WIP TabsOption Component. 2017-04-18 18:37:11 -05:00
Daniel Ternyak 2cf54a8221 reformat 2017-04-18 18:36:53 -05:00
Daniel Ternyak e8c5ab355d refactors/reformatting. 2017-04-18 18:36:29 -05:00
Daniel Ternyak 3bb0a84916 add generateWallet actions. 2017-04-18 18:34:42 -05:00
Daniel Ternyak fcc03dc6d9 Create generateWallet reducer and add to combined reducer. 2017-04-18 18:34:24 -05:00
Daniel Ternyak 44701f8756 Integrate Redux-Form for GenerateWalletInput.
Break out GenerateWalletPasswordInputComponent into separate component.

Add required props to propTypes.

Add Generate Wallet Input actions and states.

Add Show Generate Wallet Password action and state.

Define validators for Field.
2017-04-18 18:01:25 -05:00
Daniel Ternyak e14631a70b Define redux state props and actions to be passed down to GenerateWalletComponent 2017-04-18 17:58:19 -05:00
Daniel Ternyak f7bd90405b Remove unneeded imports. 2017-04-17 23:03:49 -05:00
Daniel Ternyak 1b1ab097a0 delete unused boilerplate scss 2017-04-14 02:12:40 -05:00
Daniel Ternyak 8c92ad7287 Use prop-types package instead of React.PropTypes. 2017-04-14 01:27:01 -05:00
Daniel Ternyak 498fbfcf41 Use prop-types package instead of React.PropTypes. 2017-04-14 01:26:25 -05:00
Daniel Ternyak 00c808fd7f create config reducer and move config component default state into reducer 2017-04-14 01:25:01 -05:00
Daniel Ternyak 37e8c0817e add config reducers to RootReducer/CombineReducer 2017-04-14 01:24:16 -05:00
Daniel Ternyak cb9cba8d79 Add redux-logging middleware. 2017-04-14 01:23:36 -05:00
Daniel Ternyak cf1b003956 Use prop-types package instead of React.PropTypes. 2017-04-14 01:23:09 -05:00
Daniel Ternyak 212455cfd2 Bind redux state, actions to high-level "App" Container.
Refactor/remove unneeded boilerplate redux state/dispatch.
2017-04-14 01:22:53 -05:00
Daniel Ternyak bfbd3b2319 Use prop-types package instead of React.PropTypes. 2017-04-14 01:21:22 -05:00
Daniel Ternyak 024c14610b Allow redux state to flow through Header component into LanguageDropDown/NodeDropDown Components. 2017-04-14 01:20:39 -05:00
Daniel Ternyak c890c8872a Wire up NodeDropdownComponent to use Redux actions and remove local state. 2017-04-14 01:19:43 -05:00
Daniel Ternyak b6adc5330e Wire up LanguageDropdownComponent to use Redux actions and remove local state. 2017-04-14 01:19:26 -05:00
Daniel Ternyak 29b3f9e44b Make href of logo relative path instead of hardcoded to myetherwallet.com 2017-04-14 01:17:53 -05:00
Daniel Ternyak 736ad23f1c Create "config" redux action file the including following actions:
- CHANGE_LANGUAGE
- TOGGLE_LANGUAGE_DROPDOWN
- CHANGE_NODE
- TOGGLE_NODE_DROPDOWN
2017-04-14 01:17:22 -05:00
Daniel Ternyak c2745c985e adjust routing to point toward new Tabs container 2017-04-13 20:35:56 -05:00
Daniel Ternyak 0a33708370 Create "Tabs" container and refactor as required. 2017-04-13 20:30:11 -05:00
Daniel Ternyak 7d8ba8aac5 Create GenerateWalletPassword component - will be a component of GenerateWallet tab components. 2017-04-13 20:27:28 -05:00
Daniel Ternyak 2a64e009f0 Delete unneeded files. 2017-04-13 20:26:28 -05:00
Daniel Ternyak 2fc8cf4116 Create NodeDropdownComponent with working, adjustable local state. 2017-04-13 20:25:28 -05:00
Daniel Ternyak f91f47b877 Create LanguageDropdownComponent with working, adjustable local state. 2017-04-13 20:25:08 -05:00
Daniel Ternyak 746d2f5802 Break header into multiple Components
Delete commented out code / misc cleanup.
2017-04-13 20:24:24 -05:00
Daniel Ternyak a17b97cbc2 create react/redux boilerplate 2017-04-12 00:04:27 -05:00