aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/pages
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6184 from chikeichan/6132Dan J Miller2019-02-202-1/+26
|\
| * turn camcelCase method name to space separatedChi Kei Chan2019-02-192-1/+26
* | Merge pull request #6185 from chikeichan/5681Dan J Miller2019-02-201-5/+0
|\ \
| * | Remove password check when importing Account JSONChi Kei Chan2019-02-191-5/+0
| |/
* / Change "Token Address" to "Token Contract Address" (#6182)Chi Kei Chan2019-02-201-1/+1
|/
* Checksum address before slicing it for the confirm screen (#6133)Whymarrh Whitby2019-02-141-2/+6
* Add button to force edit token symbol when adding custom token (#6147)Chi Kei Chan2019-02-132-2/+38
* Merge pull request #6139 from whymarrh/fix-confirm-advanced-gasWhymarrh Whitby2019-02-121-1/+1
|\
| * Fix advanced gas controls on the confirm screenWhymarrh Whitby2019-02-121-1/+1
* | Trim whitespace from seed phrase during importWhymarrh Whitby2019-02-121-2/+4
|/
* Fix inline advanced gas editingWhymarrh Whitby2019-02-092-26/+11
* Add togglable advanced gas controls on send and confirm screens (#6112)Dan J Miller2019-02-064-5/+89
* Remove "Use old UI" settingWhymarrh Whitby2019-02-052-37/+1
* EIP-1102 updates (#6006)Paul Bouchon2019-01-312-2/+3
* I#5956 fix2 dont overwrite existing rpc settings (#6044)Frankie2019-01-302-3/+2
* Refactor first time flow, remove seed phrase from state (#5994)Alexander Tseung2019-01-2349-128/+2037
* I#5956 fix 1 (#6026)Frankie2019-01-181-0/+3
* Fix grammar error in Current Conversion (#6029)Alexander Tseung2019-01-171-1/+1
* Fix confirm screen for sending ether tx with hex data (#6008)Alexander Tseung2019-01-111-0/+6
* Group transactions by nonce (#5886)Alexander Tseung2018-12-101-1/+1
* Uses more reliable api on main send screen; caches basic api results in modalDan Miller2018-12-042-5/+5
* Read only connection of gas price chart to reduxDan Miller2018-12-042-5/+5
* Connects remained of the gas customization component to redux.Dan Miller2018-12-043-2/+19
* Adds new gas customization modal container (without content)Dan Miller2018-12-041-1/+1
* Save recent network balances in local storage (#5843)Dan J Miller2018-12-014-4/+9
* Increase Token Symbol length to twelveThomas Huang2018-11-231-2/+2
* Merge pull request #5797 from MetaMask/trezor-v6Bruno Barbieri2018-11-221-4/+3
|\
| * fix merge conflictsbrunobar792018-11-213-10/+10
| |\
| * \ Merge branch 'develop' into trezor-v5brunobar792018-11-143-11/+44
| |\ \
| * \ \ fix merge conflictsbrunobar792018-11-079-41/+233
| |\ \ \
| * \ \ \ fix merge conflictsbrunobar792018-10-216-42/+190
| |\ \ \ \
| * \ \ \ \ fix conflictsbrunobar792018-10-1726-694/+980
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-09-0618-348/+351
| |\ \ \ \ \ \
| * \ \ \ \ \ \ fix merge conflictsbrunobar792018-08-213-54/+194
| |\ \ \ \ \ \ \
| * | | | | | | | add error messagesbrunobar792018-08-111-2/+4
* | | | | | | | | Fix usage of setState in ConfirmTransactionBase#handleSubmit (#5799)Whymarrh Whitby2018-11-221-16/+29
* | | | | | | | | Show byte count for hex data on confirm screen (#5798)Whymarrh Whitby2018-11-221-1/+2
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Fix button styling for Create Account Connect (#5787)Alexander Tseung2018-11-202-9/+9
* | | | | | | | ESLint fixes (#5775)Whymarrh Whitby2018-11-171-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Fixes #3425: Better support for batch transactions (#5437)PaddyMc2018-11-143-11/+44
| |_|_|_|_|/ |/| | | | |
* | | | | | Update Connect Request screen design (#5644)Whymarrh Whitby2018-11-062-20/+15
* | | | | | EIP-1102: add user privacy optionbitpshr2018-11-062-36/+37
* | | | | | EIP-1102: Add option to force-enable providerbitpshr2018-11-062-0/+33
* | | | | | EIP-1102: updated implementationbitpshr2018-11-067-0/+91
* | | | | | Merge pull request #5567 from MetaMask/HowardBraham-developkumavis2018-10-301-1/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' into developkumavis2018-10-219-45/+193
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Bug Fix: #1789 and #4525 eth.getCode() with no contractHoward Braham2018-10-101-1/+1
* | | | | | | Add support for RPC endpoints with custom chain IDs (#5134)HackyMiner2018-10-263-38/+110
| |/ / / / / |/| | | | |
* | | | | | Adds toggle for primary currency (#5421)Alexander Tseung2018-10-176-42/+190
| |_|_|_|/ |/| | | |
* | | | | Update Zendesk links for new subdomainWhymarrh Whitby2018-10-122-2/+2
* | | | | tests - integration - Add Drizzle tests (#5467)Bruno Barbieri2018-10-101-1/+1
|/ / / /
* | | | Fix markup for inline instances of `PageContainer`sWhymarrh Whitby2018-10-063-64/+64
* | | | Only use current network txs when calculating "Reject All"Whymarrh Whitby2018-10-021-1/+6
* | | | Confirm rejecting multiple transactions with modalWhymarrh Whitby2018-10-022-4/+17
* | | | Add "Cancel All" button to confirm footerWhymarrh Whitby2018-10-022-3/+26
* | | | support editable customRPC (#5267)HackyMiner2018-09-291-0/+1
* | | | Merge pull request #5282 from MetaMask/tx-cancel-uiAlexander Tseung2018-09-252-4/+5
|\ \ \ \
| * | | | Switch existing modals from using Notification to Modal. Remove Notification ...Alexander Tseung2018-09-202-4/+5
* | | | | Merge pull request #5241 from MetaMask/refactor-settingsAlexander Tseung2018-09-2113-592/+800
|\ \ \ \ \
| * | | | | Fix translation casingAlexander Tseung2018-09-211-4/+0
| * | | | | Add Current Conversion Updated string to translationsAlexander Tseung2018-09-201-1/+1
| * | | | | Refactor settings page to use JSX and follow component file folder structureAlexander Tseung2018-09-2013-592/+804
| |/ / / /
* / / / / Move main-container wrapper div into its own classWhymarrh Whitby2018-09-201-0/+1
|/ / / /
* | | | Bug Fix: #5183 history not definedSean Rabaut2018-09-141-1/+1
* | | | Add raised type buttons to Button component. Refactor all buttons within app ...Alexander Tseung2018-09-137-54/+88
| |_|/ |/| |
* | | Merge pull request #5188 from taobun/developDan J Miller2018-09-051-1/+1
|\ \ \
| * | | fix check valid decimals code in new uibunoi2018-09-051-1/+1
* | | | Merge pull request #5167 from MetaMask/fix-watcAsset-imagesDan Finlay2018-09-052-1/+6
|\ \ \ \
| * | | | fix images for watched tokensEsteban MIno2018-08-302-1/+6
| |/ / /
* | | | Merge pull request #5091 from MetaMask/i4945-feature-flag-hex-dataDan J Miller2018-09-041-0/+29
|\ \ \ \ | |/ / / |/| | |
| * | | Adds feature flag toggle for the hex data row on the send screen.Dan Miller2018-08-271-0/+29
* | | | Merge pull request #5155 from MetaMask/i5154-confirm-spinnerAlexander Tseung2018-08-291-4/+7
|\ \ \ \
| * | | | Fix infinite spinner on failed transactionsAlexander Tseung2018-08-291-4/+7
* | | | | fix conflictsEsteban MIno2018-08-2913-351/+152
|\| | | |
| * | | | Fix naming, add eth.getCode check for actions, fix translations for statusesAlexander Tseung2018-08-241-2/+2
| * | | | Fix shapeshift transactions. Delete unused filesAlexander Tseung2018-08-241-2/+0
| * | | | Refactor transactions list views. Add redesign componentsAlexander Tseung2018-08-244-28/+10
| * | | | Add withMethodData HOC, add higher-order-component folderAlexander Tseung2018-08-244-36/+2
| * | | | Add react-media package to prevent rendering wallet-view twice in the popup viewAlexander Tseung2018-08-241-1/+5
| * | | | Refactor home screen and remove unused filesAlexander Tseung2018-08-244-239/+108
| |/ / /
| * | | Merge pull request #5089 from MetaMask/i5085-ethcodeAlexander Tseung2018-08-232-5/+14
| |\ \ \
| | * | | Use eth_getCode to sort transaction action typeAlexander Tseung2018-08-232-5/+14
| | | |/ | | |/|
| * / | Add tabs support for PageContainerAlexander Tseung2018-08-231-57/+25
| |/ /
* | | typo watchAsset imageUrl to imageEsteban MIno2018-08-242-3/+3
* | | Merge branch 'develop' into WatchTokenFeatureEsteban MIno2018-08-214-55/+198
|\| |
| * | fix ledger affiliate linkbrunobar792018-08-171-1/+1
| * | ui readybrunobar792018-08-171-3/+9
| * | connect screen readybrunobar792018-08-171-25/+63
| * | more uibrunobar792018-08-151-1/+2
| * | fixbrunobar792018-08-151-1/+1
| * | ui fixesbrunobar792018-08-152-18/+21
| * | fix tx testsbrunobar792018-08-141-1/+2
| * | legacy and new hd path workingbrunobar792018-08-142-23/+44
| * | good progress adding pathsbrunobar792018-08-142-13/+71
| * | able to add accountsbrunobar792018-08-112-3/+3
| * | iframe communication workingbrunobar792018-08-111-1/+0
| * | refactor to support multiple hw walletsbrunobar792018-08-113-23/+39
| |/
| * Show error while allowing confirmation of transaction where simulation failsDan Miller2018-08-091-1/+1
* | correct behavior when notification is closed when popupEsteban MIno2018-08-173-7/+9
* | WIPEsteban MIno2018-08-173-3/+10
* | add support for images base64 and urls on new uiEsteban MIno2018-08-152-7/+10
* | refactor unused codeEsteban MIno2018-08-082-9/+3
* | Merge branch 'develop' into WatchTokenFeatureEsteban Miño2018-08-081-3/+18
|\|
| * Disable Confirm button on subsequent clicks to prevent confirming multiple timesAlexander Tseung2018-08-041-3/+18
* | clean confirm add token componentEsteban MIno2018-08-072-6/+2
* | new confirm add suggested token componentEsteban MIno2018-08-074-2/+147
* | eth_watchToken workingEsteban MIno2018-08-042-3/+9
* | popup initializing with suggested tokensEsteban MIno2018-08-041-6/+2
* | rpc-engine not crashing when eth_watchTokenEsteban MIno2018-08-041-4/+0
* | merge developEsteban MIno2018-08-0436-288/+1996
|\|
| * Round large exponential numbersAlexander Tseung2018-07-281-2/+5
| * Add close window support to signature requests. Move logic to actionsAlexander Tseung2018-07-242-21/+10
| * UI confirm screen closes confirmation window on submit or cancel of a txDan Miller2018-07-241-4/+15
| * show alert ONLY when device is connectedbrunobar792018-07-231-4/+11
| * Add fallback options for displaying recipient name in the Confirm screenAlexander Tseung2018-07-211-1/+13
| * Merge pull request #4625 from MetaMask/initial-trezor-supportBruno Barbieri2018-07-205-1/+552
| |\
| | * last css fixesbrunobar792018-07-192-4/+23
| | * fix support linkbrunobar792018-07-191-1/+1
| | * fix unsupported browser viewbrunobar792018-07-191-1/+1
| | * lintbrunobar792018-07-191-1/+1
| | * scroll smoothbrunobar792018-07-191-3/+11
| | * design donebrunobar792018-07-191-23/+86
| | * fix browser not supported screenbrunobar792018-07-181-1/+1
| | * updated account list based on new designsbrunobar792018-07-183-14/+28
| | * Merge branch 'develop' into initial-trezor-supportbrunobar792018-07-172-3/+3
| | |\
| | * \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial...brunobar792018-07-141-1/+1
| | |\ \
| | * | | fix account selectionbrunobar792018-07-141-2/+6
| | * | | added affiliate link to trezorbrunobar792018-07-141-0/+6
| | * | | detect ability to open popup instead of browserbrunobar792018-07-132-6/+13
| | * | | fix account balance bugbrunobar792018-07-131-9/+15
| | * | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial...brunobar792018-07-1327-130/+1170
| | |\ \ \
| | * | | | forget device and autiload account features addedbrunobar792018-07-122-1/+40
| | * | | | fix account duplicationbrunobar792018-07-101-6/+0
| | * | | | fix all the account related bugsbrunobar792018-07-102-13/+27
| | * | | | copy updatedbrunobar792018-07-071-1/+4
| | * | | | update connect harwdware screenbrunobar792018-07-071-8/+20
| | * | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial...brunobar792018-07-071-151/+162
| | |\ \ \ \
| | * | | | | UI refactorbrunobar792018-07-063-97/+106
| | * | | | | Refactor UIbrunobar792018-07-064-266/+328
| | * | | | | move strings to localization filebrunobar792018-07-061-11/+12
| | * | | | | added message for non-chrome browsersbrunobar792018-07-061-1/+26
| | * | | | | lint fixbrunobar792018-07-041-1/+1
| | * | | | | fix merge conflictsbrunobar792018-07-042-2/+4
| | |\ \ \ \ \
| | * \ \ \ \ \ fix merge conflictsbrunobar792018-07-041-1/+1
| | |\ \ \ \ \ \
| | * | | | | | | move hardcoded strings to localization filebrunobar792018-07-031-17/+7
| | * | | | | | | fix merge conflictsbrunobar792018-07-022-10/+10
| | |\ \ \ \ \ \ \
| | * | | | | | | | move TrezorKeyring to its own packageBruno2018-06-131-3/+3
| | * | | | | | | | balances workingBruno2018-06-111-2/+18
| | * | | | | | | | initial trezor supportBruno2018-06-103-1/+260
| * | | | | | | | | Use Number constructor for number conversion. Use existing noConversionRateAv...Alexander Tseung2018-07-181-1/+1
| * | | | | | | | | Fix testsAlexander Tseung2018-07-182-1/+5
| * | | | | | | | | Add fallback when no function found, fix network colors, add fiat values for ...Alexander Tseung2018-07-1811-92/+183
| * | | | | | | | | Remove unused confirm transaction filesAlexander Tseung2018-07-182-21/+0
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Fix send import paths in confirm tx componentsWhymarrh Whitby2018-07-162-3/+3
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge pull request #4766 from whymarrh/null-translationsWhymarrh Whitby2018-07-131-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Remove unneeded MetaMaskConnect connect wrapperWhymarrh Whitby2018-07-121-1/+1
| * | | | | | | Merge pull request #4691 from MetaMask/i4404-confirm-refactorAlexander Tseung2018-07-1226-94/+1134
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix font sizes, colors. Include data tab for send-eth transaction confirmatio...Alexander Tseung2018-07-122-2/+18
| | * | | | | | Various fixes from PR commentsAlexander Tseung2018-07-076-119/+162
| | * | | | | | Use eth-method-registry to get method dataAlexander Tseung2018-07-075-22/+36
| | * | | | | | Display newest transactionAlexander Tseung2018-07-071-2/+3
| | * | | | | | Refactor data flow, signature request routingAlexander Tseung2018-07-076-79/+145
| | * | | | | | Refactor and redesign confirm transaction viewsAlexander Tseung2018-07-0726-94/+994
| | | |_|_|_|/ | | |/| | | |
| * / | | | | Prevent users from submitting password multiple times on the unlock screenAlexander Tseung2018-07-111-36/+36
| |/ / / / /
| * | | | | Merge pull request #4648 from MetaMask/update-import-from-seed-screenDan J Miller2018-07-061-151/+162
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Delete old restore vault file.Dan2018-07-062-340/+162
| | * | | | Update import from seed screen on new ui.Dan2018-07-051-0/+189
| * | | | | Merge pull request #4716 from MetaMask/i4663-clearErrorMessagesDan J Miller2018-07-042-0/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | fixes 4663Sara Reynolds2018-07-042-0/+2
| | | |_|/ | | |/| |
| * | | | Merge pull request #4633 from MetaMask/i4580-import-account-errorsAlexander Tseung2018-07-042-2/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Check that error is defined in import-account error catch.Dan2018-06-292-2/+2
| | * | | Show all errors on account creation screen.Dan2018-06-292-2/+2
| | | |/ | | |/|
| * / | eslint --fix .brunobar792018-07-031-1/+1
| |/ /
* | | LintedDan Finlay2018-06-191-0/+1
* | | Begin letting UI show suggested tokensDan Finlay2018-06-192-2/+13
|/ /
* / notices - replace getLatestNotice with getNextNoticekumavis2018-06-142-10/+10
|/
* Merge pull request #4418 from MetaMask/handle-import-account-failure-in-uikumavis2018-06-072-13/+36
|\
| * Merge branch 'develop' into handle-import-account-failure-in-uiDan2018-06-039-16/+16
| |\
| * | Fix then-catch + error handling in import-accountDan2018-05-312-4/+2
| * | Importing account by json and private key shows error and does not change acc...Dan2018-05-312-10/+35
* | | i18n - ja improvements03-262018-06-074-9/+23
| |/ |/|
* | update helpscout links to zenhubBobby Dresser2018-06-012-2/+2
* | Change btn-secondary styles to btn-default. Make btn-secondary red warning st...Alexander Tseung2018-06-017-16/+16
|/
* Fix error handling on incorrect password (#4401)Alexander Tseung2018-05-311-11/+9
* Fix add-token token list placeholder width (#4365)Alexander Tseung2018-05-301-0/+4
* newui - unlock - dont catch errors unrelated to tryUnlockMetamaskkumavis2018-05-291-2/+2
* Merge pull request #4308 from MetaMask/i4232-addtokenkumavis2018-05-2325-432/+933
|\
| * Fix testsAlexander Tseung2018-05-211-11/+6
| * Update designs for Add Token screenAlexander Tseung2018-05-2025-432/+938
* | Move setAccountLabel into PreferencesControllerWhymarrh Whitby2018-05-172-2/+2
|/
* 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-174-0/+267
|\
| * Add TextField component to storybookAlexander Tseung2018-05-122-2/+1
| * Add new unlock screen designAlexander Tseung2018-05-125-194/+268
* | 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-012-147/+116
|\
| * 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-231-145/+114
* | | Convert decimals to string in getSymbolAndDecimals; return null for symbol or...Dan2018-04-281-1/+1
* | | Clean up network configAlexander Tseung2018-04-242-2/+2
| |/ |/|
* | Show correct MetaMask version number in the Info pageAlexander Tseung2018-04-191-1/+9
|/
* Fix confirmation popup not always openingAlexander Tseung2018-04-171-2/+3
* Require loglevel singleton in each module that uses itbitpshr2018-04-142-0/+2
* Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-061-1/+2
* Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-061-0/+1
* 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-031-15/+14
* Fix lint errorsAlexander Tseung2018-04-033-4/+0
* Refactor onboarding flowAlexander Tseung2018-04-024-15/+15
* Fix merge conflictsAlexander Tseung2018-03-318-94/+135
* Fix merge conflicts. Refactor renderPrimary into Home componentAlexander Tseung2018-03-315-358/+434
* Fix i18n merge conflictsAlexander Tseung2018-03-308-115/+153
* Fix merge conflicts. Refactor onboarding flow.Alexander Tseung2018-03-299-17/+36
* Fix merge conflictsAlexander Tseung2018-03-278-286/+360
* Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int...Alexander Tseung2018-02-092-4/+15
* Fix merge conflicts from uat-nextAlexander Tseung2018-02-014-14/+20
* Add create new account routes, fix conflicts from uat updatesAlexander Tseung2018-02-0111-112/+284
* Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254Alexander Tseung2018-01-305-65/+85
* Add route for signature requestAlexander Tseung2017-12-151-0/+321
* Add initialized checks for first time flow routesAlexander Tseung2017-12-154-71/+48
* Add routes for mascaraAlexander Tseung2017-12-155-25/+78
* Add react-router to allow use of the browser back buttonAlexander Tseung2017-12-1513-0/+1897