aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components
Commit message (Expand)AuthorAgeFilesLines
* Remove .onlyDan2018-06-011-1/+1
* Merge branch 'i3725-refactor-send-component-' of github.com:MetaMask/metamask...Dan2018-06-015-153/+70
|\
| * Merge pull request #4386 from MetaMask/i4077-replace-currency-input-with-nume...Dan J Miller2018-06-015-153/+70
| |\
| | * Improve input width calculation in currency-display.jsDan2018-06-011-3/+2
| | * Fix currency display send integration tests.Dan2018-05-311-1/+1
| | * Delete currency-input.jsDan2018-05-302-114/+0
| | * Remove currency input from input-numberDan2018-05-301-4/+4
| | * Stop using external NumericInput component.Dan2018-05-301-8/+15
| | * Replaces currency-input.js with NumericInputDan2018-05-293-38/+63
* | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-0138-200/+539
|\ \ \ | |/ / |/| |
| * | Add new alert modalsAlexander Tseung2018-06-0115-155/+271
| * | Change btn-secondary styles to btn-default. Make btn-secondary red warning st...Alexander Tseung2018-06-0114-37/+53
| * | Prevent loading screen from overlaying the app bar (#4417)Alexander Tseung2018-05-312-9/+2
| * | Fix error handling on incorrect password (#4401)Alexander Tseung2018-05-311-11/+9
| * | Add notification for dropped retry transactions (#4363)Alexander Tseung2018-05-3010-39/+215
| * | Fix add-token token list placeholder width (#4365)Alexander Tseung2018-05-301-0/+4
| * | Fix text field labels of first time flow. Add text fields to storybook (#4389)Alexander Tseung2018-05-292-44/+80
| * | newui - unlock - dont catch errors unrelated to tryUnlockMetamaskkumavis2018-05-291-2/+2
* | | Update amount error on update of send screen.Dan2018-05-313-23/+30
* | | Fix setting of token balance on account switch in send screen from field.Dan2018-05-313-3/+3
| |/ |/|
* | Send refactor: fix error handling and form disabling in send form.Dan2018-05-268-47/+37
* | Clean up for send refactor PR.Dan2018-05-255-15/+7
* | Move formShouldBeDisabled from send-footer util to component.Dan2018-05-254-40/+72
* | Fix order of button text in page-container-footer.Dan2018-05-252-10/+4
* | Display correct titles and subtitles on send token and editing send transacti...Dan2018-05-258-14/+105
* | Fix display of primary currency symbol in send amount rowDan2018-05-252-2/+8
* | Send refactor: fix amount max button for tokens.Dan2018-05-241-1/+12
* | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-2443-502/+1168
|\|
| * Merge pull request #4308 from MetaMask/i4232-addtokenkumavis2018-05-2334-481/+1106
| |\
| | * Update input field border on focusAlexander Tseung2018-05-221-1/+3
| | * Fix testsAlexander Tseung2018-05-211-11/+6
| | * Update designs for Add Token screenAlexander Tseung2018-05-2034-481/+1109
| * | Move setAccountLabel into PreferencesControllerWhymarrh Whitby2018-05-175-10/+10
| |/
| * Merge pull request #4255 from MetaMask/i4233-dropdownskumavis2018-05-172-6/+52
| |\
| | * Fix account and network dropdowns in confirm screenAlexander Tseung2018-05-152-6/+52
| * | ui - unlock - remove setNetworkEndpoints calls from new unlock screenkumavis2018-05-172-3/+0
| * | ui - remove files accidently added by bad mergekumavis2018-05-171-189/+0
| * | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-1721-10/+681
| |\ \
| | * | Add error message when passwords don't match in first time flow. Change input...Alexander Tseung2018-05-141-0/+5
| | |/
| | * Add TextField component to storybookAlexander Tseung2018-05-123-2/+25
| | * Add new unlock screen designAlexander Tseung2018-05-1212-196/+476
| | * Add storybook integrationAlexander Tseung2018-05-043-0/+86
| | * Merge pull request #4156 from MetaMask/i4010-spinnerkumavis2018-05-036-8/+91
| | |\
| | | * Fix styling of the app spinnerAlexander Tseung2018-05-016-8/+91
| * | | lint - cleanup some unused variableskumavis2018-05-032-2/+0
| * | | network - remove setNetworkEndpointskumavis2018-05-012-5/+0
| |/ /
| * | Handle Promise rejections when importing accounts (#4142)Paul Bouchon2018-05-012-0/+4
| * | Merge pull request #4059 from MetaMask/i-4033-seed-wordskumavis2018-05-015-147/+215
| |\ \
| | * | Redirect to correct seed phrase screenAlexander Tseung2018-04-271-2/+2
| | * | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-231-1/+9
| | |\ \
| | * | | Use new design for reveal seed screen. Persist seed words only in first time ...Alexander Tseung2018-04-234-145/+213
| * | | | Fix ShapeShift purchases on new UIbitpshr2018-04-291-6/+7
| * | | | Merge pull request #4113 from MetaMask/i4107-send-tokens-without-symbols-deci...kumavis2018-04-282-26/+14
| |\ \ \ \
| | * | | | Convert decimals to string in getSymbolAndDecimals; return null for symbol or...Dan2018-04-282-18/+8
| | * | | | Wraps calls to symbol() and decimals() in try catchDan2018-04-281-11/+9
| | | |_|/ | | |/| |
| * / | | Allow transactions with 0-gwei gas price (#4073)Paul Bouchon2018-04-273-12/+11
| |/ / /
* | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-151-0/+5
* | | | Import defaults in send_/Dan2018-05-1510-17/+18
* | | | Fix Button component path in page-container footer.Dan2018-05-151-1/+1
* | | | Add index.js files to send_ subdirectoriesDan2018-05-1513-0/+13
* | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-1434-400/+937
* | | | Tests for send.duck.jsDan2018-05-142-13/+13
* | | | Rename ducks/send.js to ducks/send.duck.jsDan2018-05-1413-13/+13
* | | | Add missing unit tests in send_/: now 100% function test coverage in send_/Dan2018-05-144-112/+298
* | | | Lint fixesDan2018-05-1410-31/+6
* | | | Unit tests for account-list-item, amount-max-button and send-amount-row compo...Dan2018-05-143-0/+381
* | | | Unit tests for from-dropdown; split out send-dropdown-list from from-dropdownDan2018-05-124-39/+260
* | | | SendRowErrorMessage component test.Dan2018-05-111-0/+28
* | | | Unit tests for send from, gas, to and wrapper row components.Dan2018-05-114-0/+403
* | | | Fix test descriptions and remove unnecessary proptypes.Dan2018-05-105-14/+10
* | | | Adds test for send, send-content, send-footer and send-header components.Dan2018-05-076-16/+516
* | | | Unit tests for containers, utils and selectors in send_/Dan2018-05-0540-68/+2501
* | | | Merge branch 'i3725-refactor-send-component-' of github.com:MetaMask/metamask...Dan2018-05-0112-16/+137
|\ \ \ \
| * \ \ \ Merge branch 'i3725-refactor-send-component-' into i3725-refactor-send-compon...Dan2018-05-0186-434/+4696
| |\ \ \ \
| * | | | | Refactor page-container component structureAlexander Tseung2018-04-1112-66/+136
* | | | | | Delete dead send code.Dan2018-05-019-492/+2
| |/ / / / |/| | | |
* | | | | Remove 'goHome' from send_Dan2018-05-012-4/+1
* | | | | Move getMaxModeOn selector to amount-max-button container.Dan2018-05-013-6/+10
* | | | | Use constants for send screen errors messages.Dan2018-05-014-9/+29
* | | | | Fix send-v2__form class in send-content.componentDan2018-05-011-1/+1
* | | | | Fix amount max button.Dan2018-05-015-7/+7
* | | | | Fix close button on send screenDan2018-04-302-4/+5
* | | | | Further refactors; includes refactor of send-v2.js and associated containerDan2018-04-3019-129/+407
* | | | | Fixes to get tests passing.Dan2018-04-274-8/+8
* | | | | Lint fixes and alphabetization for i3725-refactor-send-componentDan2018-04-2732-333/+315
* | | | | Core of the refactor completeDan2018-04-2731-92/+748
* | | | | Merge branch 'master' into i3725-refactor-send-componentDan2018-04-2529-104/+197
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #3968 from MetaMask/gh-3653Dan Finlay2018-04-245-8/+8
| |\ \ \ \
| | * | | | Clean up network configAlexander Tseung2018-04-245-8/+8
| | | |_|/ | | |/| |
| * | | | Merge pull request #4028 from MetaMask/i4016-customrpcDan Finlay2018-04-241-6/+8
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix custom RPC not redirecting to Settings pageAlexander Tseung2018-04-191-6/+8
| | | |/ | | |/|
| * / | Show correct MetaMask version number in the Info pageAlexander Tseung2018-04-191-1/+9
| |/ /
| * | Merge pull request #3977 from MetaMask/i-3913-big-numberDan Finlay2018-04-192-10/+39
| |\ \
| | * | Fix spinner layoutAlexander Tseung2018-04-182-9/+16
| | * | Fix BigNumber exception in confirm-send-etherAlexander Tseung2018-04-181-3/+25
| * | | Merge pull request #3998 from MetaMask/i3988-checksummed-addressDan Finlay2018-04-198-22/+29
| |\ \ \ | | |/ / | |/| |
| | * | Show checksummed addresses throughout the UIbitpshr2018-04-188-22/+29
| * | | Merge branch 'master' into i3580-InternationalizeCurrencyDan Finlay2018-04-1811-41/+27
| |\| |
| | * | Fix confirmation popup not always openingAlexander Tseung2018-04-172-7/+9
| | * | Merge branch 'master' into i3981-contract-ratesDan Finlay2018-04-175-0/+5
| | |\ \
| | | * | Require loglevel singleton in each module that uses itbitpshr2018-04-145-0/+5
| | * | | Maintain token prices using a background servicebitpshr2018-04-161-1/+0
| | * | | Fetch token prices based on contract addressbitpshr2018-04-164-34/+14
| | |/ /
| * | | Lint fix.Dan2018-04-102-2/+2
| * | | Merge branch 'master' into i3580-InternationalizeCurrencyDan2018-04-1028-75/+2844
| |\| |
| * | | Internationalize converted value in confirm screensDan2018-04-102-4/+36
| * | | Internationalize converted value in currency-input.jsDan2018-04-101-10/+25
| * | | Improve display of crypto currencies when selected as the 'Current Conversion'Dan2018-04-101-4/+13
| * | | LintedDan Finlay2018-04-041-1/+1
| * | | Internationalize currencyDan Finlay2018-04-041-1/+6
* | | | second commitDan2018-04-1118-50/+461
* | | | Merge branch 'master' into i3725-refactor-send-componentDan2018-04-1027-72/+2840
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Fix integration testsAlexander Tseung2018-04-072-2/+6
| * | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-061-1/+2
| |\ \
| * | | Fix editing transactionAlexander Tseung2018-04-061-2/+1
| * | | Revert "commit"Alexander Tseung2018-04-061-1/+2
| * | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-061-0/+1
| |\| |
| * | | commitAlexander Tseung2018-04-061-2/+1
| * | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-052-3/+4
| |\| |
| * | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-041-9/+12
| |\ \ \ | | | |/ | | |/|
| * | | Fix transaction confirmationsAlexander Tseung2018-04-041-14/+16
| * | | Fix merge conflicts. Modify send workflowAlexander Tseung2018-04-039-43/+257
| |\| |
| * | | Fix lint errorsAlexander Tseung2018-04-033-4/+0
| * | | Refactor onboarding flowAlexander Tseung2018-04-024-15/+15
| * | | Fix conf-tx renderAlexander Tseung2018-03-311-1/+4
| * | | Fix merge conflictsAlexander Tseung2018-03-3161-386/+673
| |\ \ \
| * | | | Fix merge conflicts. Refactor renderPrimary into Home componentAlexander Tseung2018-03-316-361/+448
| * | | | Fix i18n merge conflictsAlexander Tseung2018-03-3062-456/+485
| |\ \ \ \
| * | | | | Fix merge conflicts. Refactor onboarding flow.Alexander Tseung2018-03-299-17/+36
| * | | | | Fix merge conflictsAlexander Tseung2018-03-2783-2744/+2070
| |\ \ \ \ \
| * | | | | | Fix react-router related exceptionsAlexander Tseung2018-02-101-1/+1
| * | | | | | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int...Alexander Tseung2018-02-092-36/+28
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int...Alexander Tseung2018-02-094-19/+34
| |\ \ \ \ \ \ \
| * | | | | | | | Fix lint errorsAlexander Tseung2018-02-022-7/+1
| * | | | | | | | Fix merge conflicts from uat-nextAlexander Tseung2018-02-018-26/+78
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add create new account routes, fix conflicts from uat updatesAlexander Tseung2018-02-0112-115/+299
| * | | | | | | | | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254Alexander Tseung2018-01-3031-548/+731
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add route for signature requestAlexander Tseung2017-12-152-253/+321
| * | | | | | | | | | Add initialized checks for first time flow routesAlexander Tseung2017-12-154-71/+48
| * | | | | | | | | | Fix lint errorsAlexander Tseung2017-12-152-2/+1
| * | | | | | | | | | Add routes for mascaraAlexander Tseung2017-12-156-42/+83
| * | | | | | | | | | Add react-router to allow use of the browser back buttonAlexander Tseung2017-12-1522-177/+1989
* | | | | | | | | | | first commitDan2018-04-0790-0/+766
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | hot-fix new-ui - default to an object if identities is undefinedfrankiebee2018-04-051-1/+2
* | | | | | | | | | Don't prevent user from setting an eth address in to field if there is no ens...Dan2018-04-051-2/+2
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screenskumavis2018-04-032-16/+89
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adds simulation failure error messages to confirm screen.Dan2018-04-032-0/+30
| * | | | | | | | | UpdateSendErrors only called when balance defined, recalled if balance updates.Dan2018-04-032-16/+59
* | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screenskumavis2018-04-037-23/+166
|\| | | | | | | | |
| * | | | | | | | | identicon - set blockies height and width to identicon diameterkumavis2018-03-311-3/+2
| * | | | | | | | | Merge pull request #3774 from danjm/i3686-txparamundefined-sigrequestsintxlistkumavis2018-03-312-9/+17
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into i3686-txparamundefined-sigrequestsintxlistDan2018-03-3053-288/+538
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Ensure correct address used when rendering transfer transactions.Dan2018-03-291-1/+2
| | * | | | | | | | | | Fix display of unapprovedMessages in txList (old and new ui); includes fix of...Dan2018-03-282-9/+16
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #3762 from danjm/i3471-checkbalanceonconfirmscreenkumavis2018-03-314-11/+147
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| | * | | | | | | | | Fix lint and testsDan2018-03-302-4/+4
| | * | | | | | | | | Merge branch 'master' into i3471-checkbalanceonconfirmscreenDan2018-03-3053-287/+537
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | * | | | | | | | | Show insufficient funds on confirm screen on first render.Dan2018-03-302-1/+21
| | * | | | | | | | | Confirm send token detects if balance is sufficient for gas.Dan2018-03-281-0/+3
| | * | | | | | | | | Merge branch 'master' into i3471-checkbalanceonconfirmscreenkumavis2018-03-2854-346/+337
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | * | | | | | | | | Confirm send token detects if balance is sufficient for gas.Dan2018-03-282-7/+56
| | * | | | | | | | | Checking for sufficient balance in confirm ether screen; includes error messa...Dan2018-03-282-5/+69
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
* | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screenskumavis2018-03-313-5/+5
|\| | | | | | | | |
| * | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artif...kumavis2018-03-3053-287/+537
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | ui - identicon - use relative link for ether logokumavis2018-03-291-1/+1
| * | | | | | | | | ui - use relative location for imageskumavis2018-03-292-3/+3
| * | | | | | | | | ui - fix relative url for deposit-ether-modalkumavis2018-03-291-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | network - use providerType for localhostkumavis2018-03-311-4/+4
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Removes t from props via metamask-connect and instead places it on context vi...Dan2018-03-2953-287/+537
|/ / / / / / /
* | | | | | | Remove comments and console.logsDan2018-03-272-2/+2
* | | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-2710-48/+32
|\| | | | | |
| * | | | | | Merge pull request #3721 from alextsg/cb-944Dan Finlay2018-03-278-15/+19
| |\ \ \ \ \ \
| | * | | | | | Update button stylesAlexander Tseung2018-03-268-15/+19
| * | | | | | | Use ens-input component in send-v2 to allow sending to ens names.Dan2018-03-262-32/+13
| |/ / / / / /
* | | | | | | Correct reprice title and subtitle key names.Dan2018-03-221-2/+2
* | | | | | | Fix sender-to-recipient export and non-existent translation key.Dan2018-03-222-5/+3
* | | | | | | Correct connect reference in confirm-send-ether, confirm-deploy-contract, net...Dan2018-03-223-3/+3
* | | | | | | Lint fixesDan2018-03-2210-13/+14
* | | | | | | Fix references to undefined 'this.props'Dan2018-03-221-13/+13
* | | | | | | Missed modifications of t() in merge resolution.Dan2018-03-223-4/+1
* | | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-228-192/+269
|\| | | | | |
| * | | | | | ui - tx conf - only show special token tx conf screen for token sendkumavis2018-03-221-4/+8
| * | | | | | Merge branch 'i3554-fix-editing-dapp-token-txs' of https://github.com/danjm/m...kumavis2018-03-222-4/+11
| |\ \ \ \ \ \
| | * | | | | | Identify token transactions by method names token data, and not just whether ...Dan2018-03-202-4/+11
| * | | | | | | Merge pull request #3624 from alextsg/cb-941kumavis2018-03-214-182/+244
| |\ \ \ \ \ \ \
| | * | | | | | | Update confirm transaction screenAlexander Tseung2018-03-214-182/+244
| * | | | | | | | Gas inputs can be changed by up and down arrows (#3598)Dan J Miller2018-03-212-0/+3
* | | | | | | | | i18n redux solution doesn't require importing t() and passing state to each t...Dan2018-03-2245-283/+253
* | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra...kumavis2018-03-217-47/+289
|\| | | | | | | |
| * | | | | | | | Add i18n to tx statusThomas2018-03-211-1/+26
| * | | | | | | | Merge branch 'master' into i3571-CompleteI18nTemplatesThomas2018-03-217-45/+260
| |\| | | | | | |
| | * | | | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-202-2/+6
| | |\ \ \ \ \ \ \
| | | * | | | | | | Don't block user from setting gas if estimating gas returns errors. (#3627)Dan J Miller2018-03-202-2/+6
| | | |/ / / / / /
| | * | | | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-2027-2155/+588
| | |\| | | | | |
| | * | | | | | | Merge branch 'retry-tx-refractor' of https://github.com/MetaMask/metamask-ext...frankiebee2018-03-163-22/+49
| | |\ \ \ \ \ \ \
| | | * | | | | | | Set retry gasPrice to forceGasMin on confirm screen in cases where gas is not...Dan2018-03-152-4/+34
| | | * | | | | | | Force gas min has correct precision and is set when editing gas if max.Dan2018-03-153-7/+8
| | | * | | | | | | Ensure changes from customize gas modal opened from confirm screen are captur...Dan2018-03-152-12/+8
| | | * | | | | | | Revert 'Set txMeta.time to reflect time of tx approval.'Dan2018-03-151-3/+3
| | * | | | | | | | Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-161-4/+6
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-151-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-1447-349/+386
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix more lint errors.Dan2018-03-143-11/+2
| | * | | | | | | | | | Remove unnecessary addition of nonce to state.Dan2018-03-141-3/+0
| | * | | | | | | | | | Make token confirmations compatible.Dan2018-03-142-14/+88
| | * | | | | | | | | | Fix tx-list-item submitted check.Dan2018-03-141-1/+1
| | * | | | | | | | | | Use correct name for submittedTime field in tx-list.jsDan2018-03-141-1/+1
| | * | | | | | | | | | Use correct var name in new-ui showRetryButtonDan2018-03-141-1/+1
| | * | | | | | | | | | Undefined check in showRetryButtonDan2018-03-141-3/+4
| | * | | | | | | | | | Styling for dropped.Dan2018-03-141-0/+1
| | * | | | | | | | | | Use new submittedTime field to correctly show retry button in old and new ui.Dan2018-03-143-9/+9
| | * | | | | | | | | | Set txMeta.time to reflect time of tx approval.Dan2018-03-131-3/+3
| | * | | | | | | | | | Improve phrasing of copy.Dan2018-03-132-2/+2
| | * | | | | | | | | | Fix gas calculation and nonce / forceGasMin state setting errors; retry butto...Dan2018-03-133-25/+39
| | * | | | | | | | | | Lint fixes.Dan2018-03-091-2/+0
| | * | | | | | | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-095-25/+28
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Adds inline opening of gas customization to confirm-send-ether screen.Dan2018-03-092-10/+42
| | * | | | | | | | | | | Retry transaction logic added to tx-list-item, confirm-send-ether, customize-...Dan2018-03-094-15/+83
| | * | | | | | | | | | | Add html and css for responsive retry button.Dan2018-03-091-0/+9
| * | | | | | | | | | | | Started on Tx list i18nThomas2018-03-211-1/+1
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Lint fixes.Dan2018-03-208-5/+14
* | | | | | | | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-201-6/+14
|\| | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #3594 from danjm/i3344-improve-currency-inputThomas Huang2018-03-201-6/+14
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Currency input defaults to empty stringDan2018-03-171-6/+14
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Fixed t() calls where localeMessages is missing; and fix incorrect connect re...Dan2018-03-2015-20/+23
* | | | | | | | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-2026-2145/+572
|\| | | | | | | | | | |
| * | | | | | | | | | | Remove unused files from ui folder. (#3577)anticlimactic2018-03-1921-1626/+0
| * | | | | | | | | | | Fix styling on confirm-send-ether and confirm-send-token (#3600)Alexander Tseung2018-03-173-225/+231
| * | | | | | | | | | | Update Confirm Contract screen (#3597)Alexander Tseung2018-03-173-294/+340
| |/ / / / / / / / / /
| * | | | / / / / / / Update Deposit Eth icon (#3569)Alexander Tseung2018-03-161-4/+6
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Handle i18n with redux.Dan2018-03-1656-303/+303
* | | | | | | | | | i18n - load locales manuallykumavis2018-03-1529-45/+57
|/ / / / / / / / /
* | | / / / / / / Fix translations whose substitutions params were not in arrays.Dan2018-03-141-1/+1
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'master' into i18nThomas Huang2018-03-141-5/+5
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #3495 from alextsg/cb-290kumavis2018-03-141-5/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Increase tap areas for menu buttons on mobileAlexander Tseung2018-03-101-5/+5
* | | | | | | | | | Add missing opening parens to pag-container__subtitleThomas2018-03-141-1/+1
* | | | | | | | | | Merge branch 'master' into i18nThomas Huang2018-03-142-54/+65
|\| | | | | | | | |
| * | | | | | | | | Update deposit ether styling (#3510)Alexander Tseung2018-03-132-53/+68
| |/ / / / / / / /
* | | | | | | | | Merge branch 'master' into i18nThomas Huang2018-03-122-6/+6
|\| | | | | | | |
| * | | | | | | | Add empty object default value for tokenData (#3493)Alexander Tseung2018-03-091-2/+2
| | |/ / / / / / | |/| | | | | |
| * | | | | | | Update network colours for better accessibility. (#3469)Dan J Miller2018-03-081-4/+4
* | | | | | | | Correct caps of Send button on main screen.Dan2018-03-081-1/+1
* | | | | | | | Merge branch 'master' into i18nDan Finlay2018-03-071-16/+0
|\| | | | | | |
| * | | | | | | Merge branch 'master' into ImportAccountMessageV2kumavis2018-03-073-4/+23
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into ImportAccountMessageV2Dan Finlay2018-03-071-5/+4
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'master' into ImportAccountMessageV2Thomas Huang2018-03-036-18/+32
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Remove committed out merge codeThomas2018-02-281-16/+0
| * | | | | | | | | Change Loose label to ImportedThomas2018-02-281-1/+1
* | | | | | | | | | Correct merge conflict resolution errors.Dan2018-03-071-7/+0
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 21:46:46 +0800