aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components
Commit message (Collapse)AuthorAgeFilesLines
* update helpscout links to zenhubBobby Dresser2018-06-012-2/+2
|
* Add new alert modalsAlexander Tseung2018-06-0115-155/+271
|
* Change btn-secondary styles to btn-default. Make btn-secondary red warning ↵Alexander Tseung2018-06-0114-37/+53
| | | | style buttons
* 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
|
* Merge pull request #4308 from MetaMask/i4232-addtokenkumavis2018-05-2334-481/+1106
|\ | | | | Update designs for Add Token screen
| * 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 screen
| * 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 ↵kumavis2018-05-1721-10/+681
|\ \ | | | | | | | | | network-controller-remove-setNetworkEndpoints
| * | Add error message when passwords don't match in first time flow. Change ↵Alexander Tseung2018-05-141-0/+5
| |/ | | | | | | input field styling in first time flow
| * 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 spinner
| | * 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
| | | | | | | | * Silently catch import failures since errors exist in Redux state * Add comment about no-op catch statement
* | Merge pull request #4059 from MetaMask/i-4033-seed-wordskumavis2018-05-015-147/+215
|\ \ | | | | | | Use new design for Reveal Seed screen. Persist seed words only in the first time flow.
| * | 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
| |\ \ | | | | | | | | | | | | i-4033-seed-words
| * | | Use new design for reveal seed screen. Persist seed words only in first time ↵Alexander Tseung2018-04-234-145/+213
| | | | | | | | | | | | | | | | flow
* | | | Fix ShapeShift purchases on new UIbitpshr2018-04-291-6/+7
| | | |
* | | | Merge pull request #4113 from ↵kumavis2018-04-282-26/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | MetaMask/i4107-send-tokens-without-symbols-decimal-methods Wraps calls to symbol() and decimals() in try catch (Fixes #4107)
| * | | | Convert decimals to string in getSymbolAndDecimals; return null for symbol ↵Dan2018-04-282-18/+8
| | | | | | | | | | | | | | | | | | | | or decimals.
| * | | | 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
|/ / / | | | | | | | | | | | | | | | * Allow transactions with 0-gwei gas price * Add tests to verify tx with 0 gas fee * Conditionally use CurrencyInput in CurrencyDisplay
* | | Merge pull request #3968 from MetaMask/gh-3653Dan Finlay2018-04-245-8/+8
|\ \ \ | | | | | | | | Clean up network config
| * | | 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 page
| * | 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 BigNumber exception in confirm-send-ether
| * 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 checksum addresses on UI
| * 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
|\|
| * 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
| |\ | | | | | | | | | cb-254
| * | Fix editing transactionAlexander Tseung2018-04-061-2/+1
| | |
| * | Revert "commit"Alexander Tseung2018-04-061-1/+2
| | | | | | | | | | | | This reverts commit fa8500e09ad599837f6ad1b2dfc3530195a03b33.
| * | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵Alexander Tseung2018-04-061-0/+1
| |\| | | | | | | | | | cb-254
| * | commitAlexander Tseung2018-04-061-2/+1
| | |
| * | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵Alexander Tseung2018-04-052-3/+4
| |\| | | | | | | | | | cb-254
| | * 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 ↵Dan2018-04-051-2/+2
| | | | | | | | | | | | ens support.
| * | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵Alexander Tseung2018-04-041-9/+12
| |\| | | | | | | | | | cb-254
| * | 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 ↵Alexander Tseung2018-02-092-36/+28
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into cb-254
| * \ \ \ \ \ Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension ↵Alexander Tseung2018-02-094-19/+34
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into cb-254
| * | | | | | | 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
| | | | | | | | | |
* | | | | | | | | | 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
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3580
* | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix display of unapprovedMgs in txList; fix txParams undefined errors
| | * \ \ \ \ \ \ \ \ 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 ↵Dan2018-03-282-9/+16
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of undefined txParams.
| * | | | | | | | | | Merge pull request #3762 from danjm/i3471-checkbalanceonconfirmscreenkumavis2018-03-314-11/+147
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | Checking for sufficient balance in tx confirmation screen
| | * | | | | | | | | 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 ↵Dan2018-03-282-5/+69
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | messages for user.
* | | | | | | | | | 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 ↵kumavis2018-03-3053-287/+537
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | ci-artifacts
| * | | | | | | | | 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 ↵Dan2018-03-2953-287/+537
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | via a provider.
* | | | | | | 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 styles
| | * | | | | | 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, ↵Dan2018-03-223-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | network-display.
* | | | | | | 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 ↵kumavis2018-03-222-4/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/danjm/metamask-extension into danjm-i3554-fix-editing-dapp-token-txs
| | * | | | | | Identify token transactions by method names token data, and not just whether ↵Dan2018-03-202-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they've been add via metamask.
| * | | | | | | Merge pull request #3624 from alextsg/cb-941kumavis2018-03-214-182/+244
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update confirm transaction screen
| | * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Up and down arrows can control gas inputs. * input-number.js just uses number type.
* | | | | | | | | i18n redux solution doesn't require importing t() and passing state to each ↵Dan2018-03-2245-283/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t() call; t is just available on props.
* | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵kumavis2018-03-217-47/+289
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n-translator-redux
| * | | | | | | | 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 ↵frankiebee2018-03-163-22/+49
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/MetaMask/metamask-extension into retry-tx-refractor
| | | * | | | | | | Set retry gasPrice to forceGasMin on confirm screen in cases where gas is ↵Dan2018-03-152-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not edited.
| | | * | | | | | | 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 ↵Dan2018-03-152-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | captured for non-tx transactions.
| | | * | | | | | | 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 ↵Dan2018-03-133-25/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | button shows on correct tx.
| | * | | | | | | | | | 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, ↵Dan2018-03-094-15/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | customize-gas-modal, and dependents.
| | * | | | | | | | | | | 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 string
| | * | | | | | | | | | | Currency input defaults to empty stringDan2018-03-171-6/+14
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Fixed t() calls where localeMessages is missing; and fix incorrect connect ↵Dan2018-03-2015-20/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reference.
* | | | | | | | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-2026-2145/+572
|\| | | | | | | | | | |
| * | | | | | | | | | | Remove unused files from ui folder. (#3577)anticlimactic2018-03-1921-1626/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Removed unused UI files. Fixes #3434. * Reverted the deletion of "feature-toggle-utils.js". Reverted the deletion of the test files and modified the paths so they referred to the old-ui.
| * | | | | | | | | | | 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 mobile
| | * | | | | | | | 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
| | | | | | | | | |
* | | | | | | | | | Merge branch 'master' into i18nDan2018-03-0724-117/+277
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Shapeshift form handles market info unavailable errors.Dan2018-03-073-4/+23
| | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Fixes shapeshift coin selection dropdown. (#3416)Dan J Miller2018-03-061-5/+4
| | |/ / / / / / | |/| | | | | |
| * | | | | | | Fix network menu for custom URLs (#3366)Alexander Tseung2018-03-021-13/+27
| | | | | | | |
| * | | | | | | Fix exception thrown when styleOverride is not present (#3364)Alexander Tseung2018-03-021-1/+1
| | | | | | | |
| * | | | | | | Merge pull request #3340 from danjm/i3338-contract-published-terminologykumavis2018-03-012-2/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [NewUI] Replace 'Contract Published' label with 'Contract Deployment'
| | * | | | | | | Replace 'Contract Published' with 'Contract Deployment' for clearer ↵Dan2018-02-282-2/+2
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | indication of contract tx state.
| * / / / / / / Define event locally in onClickOutside method in account-dropdowns.jsDan2018-03-012-2/+2
| |/ / / / / /
| * | | | | | Try fixing notice screen synchronous state callDan Finlay2018-02-211-2/+1
| | | | | | |
| * | | | | | Merge pull request #3200 from alextsg/cb-703kumavis2018-02-176-6/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | [NewUI] Remove accessing PropTypes from main React package
| | * | | | | | Remove accessing PropTypes from main React packageAlexander Tseung2018-02-076-6/+6
| | | | | | | |
| * | | | | | | Merge pull request #3209 from danjm/MM-634-newui-reset-accountDan Finlay2018-02-143-6/+89
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [NewUI] Add reset account button to new UI.
| | * | | | | | | Add reset account button to new UI.Dan2018-02-093-6/+89
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Updates the styling of confirm send ether and token screens. (#3235)Dan J Miller2018-02-132-18/+14
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Fixes shapeshift txs so that they render in tx list. (#3208)Dan J Miller2018-02-092-36/+28
| |/ / / / /
| * | | | | Make blockies icon round to match identicons (#3205)Alexander Tseung2018-02-081-4/+4
| | | | | |
| * | | | | Fix alignment of ellipsis and address in wallet view. (#3198)Dan J Miller2018-02-071-1/+1
| |/ / / /
| * | | | Remove duplicate token balance on uat next. (#3195)Dan J Miller2018-02-071-2/+0
| | | | |
| * | | | Add functional integration testing to Add Token flow (#3189)Alexander Tseung2018-02-061-3/+4
| | | | |
| * | | | Wallet view supports screen sizes between 576px and 667px (#3193)Dan J Miller2018-02-061-12/+17
| | |_|/ | |/| |
| * | | [NewUI] Use tooltip for copy to clipboard helper text on main screen. (#3120)Dan J Miller2018-02-012-10/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use tooltip for display of helper text in wallet views copy to clipboard feature. * Use react-tippy in wallet-view.js; center arrow tooltip throughout tooltip text change. * Remove unnecessary tabIndex attribute from wallet view address element.
* | | | complete i18n across new UINick Doiron2018-01-3026-77/+80
| | | |
* | | | get t imported in all files currently using i18nNick Doiron2018-01-2529-0/+29
| | | |
* | | | separate out cross-browser i18n for extensionsNick Doiron2018-01-2517-0/+17
| | | |
* | | | better organization of locale file; i18n in more view filesNick Doiron2018-01-2420-114/+103
| | | |
* | | | first steps to i18nNick Doiron2018-01-2330-144/+132
|/ / /
* | | Merge branch 'uat' into newmasterChi Kei Chan2018-01-2077-1258/+8026
|\ \ \ | | |/ | |/|
| * | Fix transaction list font sizes, paddingAlexander Tseung2018-01-191-5/+1
| | |
| * | Merge pull request #3024 from alextsg/cb-529Kevin Serrano2018-01-191-2/+2
| |\ \ | | | | | | | | [NewUI] Update popout to fullscreen icon
| | * | Update popout to fullscreen iconAlexander Tseung2018-01-181-2/+2
| | | |
| * | | [NewUI] Send screen gas loading fixes (#3027)Dan J Miller2018-01-181-1/+2
| |/ / | | | | | | | | | | | | | | | * Allow entering amount, but disable validation of amount, opening of gas customizer or clicking of next, when gas loading in send. * Fix variable name.
| * | Fix tx-list, confirmation screen stylingAlexander Tseung2018-01-181-5/+4
| | |
| * | Merge pull request #3005 from alextsg/cb-385Chi Kei Chan2018-01-181-1/+3
| |\ \ | | | | | | | | [NewUI] Fix rendering QR code in full screen old UI, hide unnecessary back button
| | * | Fix rendering QR code in old UI, hide unnecessary back buttonAlexander Tseung2018-01-171-1/+3
| | | |
| * | | Readjust gas fees when switching networks on the send screenAlexander Tseung2018-01-171-0/+1
| |/ /
| * | Fix send screen value inputAlexander Tseung2018-01-161-3/+11
| | |
| * | Fix Hide Token modal styling, popup positioningAlexander Tseung2018-01-161-2/+2
| | |
| * | New add account page with create and import options.Dan2018-01-132-17/+9
| | |
| * | Merge branch 'uat' into cb-388Chi Kei Chan2018-01-138-296/+452
| |\ \
| | * | [NewUI-flat] New deposit ether modal UI. (#2642)Dan J Miller2018-01-137-295/+451
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * New deposit ether modal. * New deposit modal full screen on mobile, and other style fixes. * Hide shapeshift option from deposit modal for now. * Add shapeshift form to new deposit modal. * Store recipient address for shapeshift tx in background. * Use Simpledropdown to achieve desired styling in coin selector. * Lint fix * Fix typos and remove dead code. * Remove storage of shapeshift receiving address from background. * Fix typos
| | * | Fix logging out of old UI causing infinite spinner (#2914)Alexander Tseung2018-01-121-1/+1
| | | |
| * | | Change styling for network dropdownAlexander Tseung2018-01-121-31/+10
| | | |
| * | | Update styling for buttons, font weightsAlexander Tseung2018-01-126-14/+18
| | | |
| * | | Update main view stylingAlexander Tseung2018-01-113-13/+5
| |/ /
| * | Merge pull request #2799 from MetaMask/NewUI-flatAlexander Tseung2017-12-2317-141/+314
| |\ \ | | | | | | | | Update UAT to version 4.0.5
| | * \ Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20Chi Kei Chan2017-12-214-57/+11
| | |\ \
| | | * | Add constanst for token transfer function signature.Dan2017-12-211-0/+3
| | | | |
| | | * | Lint fixes.Dan2017-12-212-3/+1
| | | | |
| | | * | Adds updateTransaction to background and used it to update after editing in ↵Dan2017-12-213-67/+6
| | | | | | | | | | | | | | | | | | | | send-v2.
| | | * | Canceled, edited transactions show edited amount.Dan2017-12-212-2/+16
| | | | |
| | * | | Merge branch 'master' into NewUI-flatDan2017-12-212-37/+94
| | |\ \ \ | | | |/ / | | |/| |
| | * | | Hide fiat values on account details screen when eth/token value is 0.Dan2017-12-213-3/+8
| | | | |
| | * | | Hides the sidebar after the an account menu actions changes the screen ↵Dan2017-12-211-0/+6
| | | |/ | | |/| | | | | | | | | behind the sidebar.
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-07 19:34:48 +0800