aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components
Commit message (Collapse)AuthorAgeFilesLines
* fix ledger affiliate linkbrunobar792018-08-171-1/+1
|
* ui readybrunobar792018-08-172-6/+22
|
* connect screen readybrunobar792018-08-171-25/+63
|
* more uibrunobar792018-08-151-1/+2
|
* fixbrunobar792018-08-151-1/+1
|
* ui fixesbrunobar792018-08-153-20/+35
|
* 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
|
* rename keyringbrunobar792018-08-111-0/+1
|
* 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
|
* Merge pull request #4897 from MetaMask/qr-code-scanBruno Barbieri2018-08-1114-4/+410
|\ | | | | QR Code Scanner
| * add submit button typebrunobar792018-08-091-0/+1
| |
| * lintbrunobar792018-08-081-1/+1
| |
| * code review changesbrunobar792018-08-081-8/+17
| |
| * fix merge conflictsbrunobar792018-08-085-14/+25
| |\
| * | lintbrunobar792018-08-041-1/+1
| | |
| * | fixed issue with inputbrunobar792018-08-043-2/+6
| | |
| * | clear qr code data before scanningbrunobar792018-08-041-0/+3
| | |
| * | design completebrunobar792018-08-044-18/+108
| | |
| * | fixbrunobar792018-08-011-1/+6
| | |
| * | lintbrunobar792018-08-011-2/+0
| | |
| * | added crossbrowser support and error handlingbrunobar792018-08-015-48/+87
| | |
| * | send to fullscreen if no permission from popupbrunobar792018-07-312-11/+32
| | |
| * | kill camera stream when unmoutingbrunobar792018-07-311-1/+4
| | |
| * | copybrunobar792018-07-311-1/+1
| | |
| * | clean up cssbrunobar792018-07-313-30/+58
| | |
| * | use existing modalsbrunobar792018-07-317-190/+163
| | |
| * | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵brunobar792018-07-312-2/+12
| |\ \ | | | | | | | | | | | | qr-code-scan
| * | | fix unit testsbrunobar792018-07-271-0/+2
| | | |
| * | | fix dependenciesbrunobar792018-07-271-1/+1
| | | |
| * | | fix linting errorsbrunobar792018-07-272-2/+2
| | | |
| * | | fix merge conflictsbrunobar792018-07-279-7/+328
| |\ \ \
| * | | | added webrtc-adapter for browser compatbrunobar792018-07-271-0/+1
| | | | |
| * | | | fully working without tweaking ext. permissionbrunobar792018-07-274-3/+4
| | | | |
| * | | | working without permission issuesbrunobar792018-07-271-36/+44
| | | | |
| * | | | fix spinner and qr iconbrunobar792018-07-251-2/+5
| | | | |
| * | | | decent UIbrunobar792018-07-251-21/+43
| | | | |
| * | | | working without injectionbrunobar792018-07-255-5/+176
| | | | |
| * | | | added qr code scanner icon in send transactionbrunobar792018-07-246-5/+15
| | | | |
| * | | | camera working back and forthbrunobar792018-07-243-1/+15
| | | | |
* | | | | Merge pull request #5000 from MetaMask/contract-method-conf-sim-failureDan J Miller2018-08-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Show error while allowing confirmation of tx where simulation fails
| * | | | | Show error while allowing confirmation of transaction where simulation failsDan Miller2018-08-091-1/+1
| | |_|_|/ | |/| | |
* | | | | Fix lint error in tx-listWhymarrh Whitby2018-08-091-1/+1
| | | | |
* | | | | Get nonce for showing retry button using ethQuery transaction count.Dan Miller2018-08-092-6/+20
|/ / / /
* | | | Merge pull request #4948 from MetaMask/i4638-update-fontAlexander Tseung2018-08-042-4/+0
|\ \ \ \ | | | | | | | | | | Update Font in Account Selector
| * | | | Update Font in Account SelectorAlexander Tseung2018-08-042-4/+0
| | | | |
* | | | | Disable Confirm button on subsequent clicks to prevent confirming multiple timesAlexander Tseung2018-08-042-6/+21
|/ / / /
* | | / Show the retry button on latest tx of earliest nonce.Dan Miller2018-08-011-4/+4
| |_|/ |/| |
* | | Round large exponential numbersAlexander Tseung2018-07-281-2/+5
| | |
* | | Fix overflow for long total strings in confirm stringAlexander Tseung2018-07-261-0/+7
| |/ |/|
* | Merge pull request #4885 from MetaMask/RetryOnEarliestPendingTxDan J Miller2018-07-261-1/+10
|\ \ | | | | | | Only show retry button on the earliest pending tx
| * | earliest tx by submittedTimeEsteban MIno2018-07-261-5/+8
| | |
| * | only show retry button on earliest pending txEsteban MIno2018-07-261-1/+7
| | |
* | | lint fixSara Reynolds2018-07-261-2/+2
| | |
* | | Update prop namesSara Reynolds2018-07-261-7/+7
| | |
* | | Add tests for Confirm Detail RowSara Reynolds2018-07-261-0/+64
| | |
* | | Merge pull request #4845 from MetaMask/button-groupDan J Miller2018-07-256-0/+248
|\ \ \ | |/ / |/| | Add ButtonGroup component
| * | Adds tests for button group component.Dan Miller2018-07-241-0/+97
| | |
| * | Add ButtonGroup componentAlexander Tseung2018-07-245-0/+151
| | |
* | | 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
| |/ |/|
* | Merge pull request #4851 from MetaMask/fix-trezor-alertDan Finlay2018-07-241-4/+11
|\ \ | | | | | | Fix trezor "Hardware wallet connected" alert
| * | show alert ONLY when device is connectedbrunobar792018-07-231-4/+11
| | |
* | | refactor Alert component to work properlybrunobar792018-07-221-6/+46
|/ /
* | Add fallback options for displaying recipient name in the Confirm screenAlexander Tseung2018-07-212-10/+15
| |
* | Merge pull request #4625 from MetaMask/initial-trezor-supportBruno Barbieri2018-07-2012-6/+819
|\ \ | |/ |/| Initial trezor support
| * last css fixesbrunobar792018-07-192-4/+23
| |
| * added new global alertbrunobar792018-07-191-0/+22
| |
| * 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-192-24/+87
| |
| * fix browser not supported screenbrunobar792018-07-181-1/+1
| |
| * Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵brunobar792018-07-182-25/+38
| |\ | | | | | | | | | initial-trezor-support
| * | updated account list based on new designsbrunobar792018-07-183-14/+28
| | |
| * | Merge branch 'develop' into initial-trezor-supportbrunobar792018-07-17127-113/+249
| |\ \
| * \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵brunobar792018-07-142-14/+25
| |\ \ \ | | | | | | | | | | | | | | | initial-trezor-support
| * | | | 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-132-10/+16
| | | | |
| * | | | remove account modal updatedbrunobar792018-07-132-15/+55
| | | | |
| * | | | catching up with developbrunobar792018-07-133-13/+48
| | | | |
| * | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵brunobar792018-07-1385-337/+2919
| |\ \ \ \ | | | | | | | | | | | | | | | | | | initial-trezor-support
| * | | | | added tooltipbrunobar792018-07-122-2/+13
| | | | | |
| * | | | | forget device and autiload account features addedbrunobar792018-07-122-1/+40
| | | | | |
| * | | | | clean upbrunobar792018-07-112-4/+4
| | | | | |
| * | | | | account removal is workingbrunobar792018-07-113-14/+19
| | | | | |
| * | | | | finish warning modal UIbrunobar792018-07-116-2/+108
| | | | | |
| * | | | | added ui to remove accountsbrunobar792018-07-101-4/+30
| | | | | |
| * | | | | 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 ↵brunobar792018-07-0721-170/+490
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | initial-trezor-support
| * | | | | | 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-045-6/+40
| |\ \ \ \ \ \
| * \ \ \ \ \ \ fix merge conflictsbrunobar792018-07-0418-20/+20
| |\ \ \ \ \ \ \
| * | | | | | | | move hardcoded strings to localization filebrunobar792018-07-031-17/+7
| | | | | | | | |
| * | | | | | | | always open connect hardware in full screen modebrunobar792018-07-031-1/+9
| | | | | | | | |
| * | | | | | | | fix merge conflictsbrunobar792018-07-0241-180/+450
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ fix merge conflictsBruno2018-06-132-2/+2
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | move TrezorKeyring to its own packageBruno2018-06-131-3/+3
| | | | | | | | | | |
| * | | | | | | | | | balances workingBruno2018-06-111-2/+18
| | | | | | | | | | |
| * | | | | | | | | | initial trezor supportBruno2018-06-104-1/+269
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #4822 from whymarrh/show-more-addressWhymarrh Whitby2018-07-192-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Show first four characters of account after 0x
| * | | | | | | | | | | Show first four characters of account after 0x in walletWhymarrh Whitby2018-07-181-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Show first four characters of account after 0x in tx listWhymarrh Whitby2018-07-181-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Don't set txData to an empty stringWhymarrh Whitby2018-07-181-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Inline single-use vars in send-footer.utilsWhymarrh Whitby2018-07-181-3/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Send data along with other tx paramsWhymarrh Whitby2018-07-187-16/+66
| | | | | | | | | | | |
* | | | | | | | | | | | Hook up send component w/ UPDATE_SEND_HEX_DATA actionWhymarrh Whitby2018-07-183-5/+28
| | | | | | | | | | | |
* | | | | | | | | | | | Add hex data row to send screenWhymarrh Whitby2018-07-184-0/+41
|/ / / / / / / / / / /
* | | | | | | | | | | Use Number constructor for number conversion. Use existing ↵Alexander Tseung2018-07-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | noConversionRateAvailable message
* | | | | | | | | | | Merge developAlexander Tseung2018-07-183-1746/+0
| | | | | | | | | | |
* | | | | | | | | | | Fix testsAlexander Tseung2018-07-182-1/+5
| | | | | | | | | | |
* | | | | | | | | | | Add fallback when no function found, fix network colors, add fiat values for ↵Alexander Tseung2018-07-1813-104/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tokens with contract exchange rates
* | | | | | | | | | | Remove unused confirm transaction filesAlexander Tseung2018-07-183-186/+0
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Merge pull request #4815 from MetaMask/i4783-retryAlexander Tseung2018-07-181-14/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Increase clickable area and padding of Retry Transaction bar
| * | | | | | | | | | Increase clickable area and padding of Retry Transaction barAlexander Tseung2018-07-171-14/+10
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | lint fixSara Reynolds2018-07-171-6/+4
| | | | | | | | | |
* | | | | | | | | | Fix edge cases and add translation compatibilitySara Reynolds2018-07-171-6/+12
| | | | | | | | | |
* | | | | | | | | | Update onlyRenderConversions function to method and account for edge casesSara Reynolds2018-07-171-26/+24
| | | | | | | | | |
* | | | | | | | | | Fixes conversion status for tokens without conversion ratesSara Reynolds2018-07-171-14/+29
|/ / / / / / / / /
* | | | | | | | | Fix send import paths in confirm tx componentsWhymarrh Whitby2018-07-162-3/+3
| | | | | | | | |
* | | | | | | | | Fix send import path in customize gas modalWhymarrh Whitby2018-07-161-1/+1
| | | | | | | | |
* | | | | | | | | Fix send import path in ToAutoCompleteWhymarrh Whitby2018-07-161-1/+1
| | | | | | | | |
* | | | | | | | | Fix lint warnings in the send/ directory.Dan2018-07-164-32/+28
| | | | | | | | |
* | | | | | | | | Remove send_ directory, revert to just having sendDan2018-07-16122-18/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert accidentally changed constants. Require defaults in ens-input, gas-fee-display and confirm screens.
* | | | | | | | | Merge pull request #4715 from BitGuildPlatform/to-autocompleteDan J Miller2018-07-143-121/+142
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | fixes #4664
| * | | | | | | | | fix classnameTrejGun2018-07-051-1/+4
| | | | | | | | | |
| * | | | | | | | | Merge branch 'develop' into to-autocompleteАнна2018-07-0524-28/+65
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | fixes #4664trejgun2018-07-033-121/+139
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #4702 from BitGuildPlatform/contextTypesDan J Miller2018-07-1414-60/+57
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | convert contextType to static prop for refactored components
| * | | | | | | | | Merge branch 'develop' into contextTypesTrejGun2018-07-0524-28/+65
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
| * | | | | | | | | convert contextType to static prop for refactored componentstrejgun2018-07-0514-60/+57
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #4766 from whymarrh/null-translationsWhymarrh Whitby2018-07-131-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Rework i18n-helper getMessage function
| * | | | | | | | | Remove unneeded MetaMaskConnect connect wrapperWhymarrh Whitby2018-07-121-1/+1
| | | | | | | | | |
* | | | | | | | | | Add tooltip to new tab icon in tx-viewWhymarrh Whitby2018-07-121-4/+8
| | | | | | | | | |
* | | | | | | | | | Add tooltip to menu icon in tx-viewWhymarrh Whitby2018-07-121-9/+16
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge pull request #4691 from MetaMask/i4404-confirm-refactorAlexander Tseung2018-07-1284-301/+2883
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Refactor and redesign confirm transaction views
| * | | | | | | | Fix font sizes, colors. Include data tab for send-eth transaction ↵Alexander Tseung2018-07-124-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | confirmations that have data
| * | | | | | | | Fix multiple signature requests showing an infinite spinnerAlexander Tseung2018-07-111-2/+11
| | | | | | | | |
| * | | | | | | | Fix existing unit testsAlexander Tseung2018-07-081-4/+7
| | | | | | | | |
| * | | | | | | | Various fixes from PR commentsAlexander Tseung2018-07-0711-149/+206
| | | | | | | | |
| * | | | | | | | Use eth-method-registry to get method dataAlexander Tseung2018-07-076-34/+38
| | | | | | | | |
| * | | | | | | | Display newest transactionAlexander Tseung2018-07-072-4/+4
| | | | | | | | |
| * | | | | | | | Refactor data flow, signature request routingAlexander Tseung2018-07-076-79/+145
| | | | | | | | |
| * | | | | | | | Refactor and redesign confirm transaction viewsAlexander Tseung2018-07-0782-295/+2722
| | |_|_|_|_|_|/ | |/| | | | | |
* / | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Update import from seed screen on new ui.
| * | | | | | | 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 #4694 from MetaMask/i4660-improve-send-token-error-uiDan J Miller2018-07-0616-17/+303
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Improve send token error ux.
| * | | | | | | | Improve send token error ux.Dan2018-07-0516-17/+303
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #4733 from whymarrh/fix-setstate-warningsWhymarrh Whitby2018-07-062-0/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix setState warnings in components using TokenTracker
| * | | | | | | | Don't update token balances after tracker is stoppedWhymarrh Whitby2018-07-052-0/+7
| | | | | | | | |
| * | | | | | | | Remove TokenTracker listeners when unmounting componentWhymarrh Whitby2018-07-052-0/+4
| | |_|_|/ / / / | |/| | | | | |
* / | | | | | | Prevent calling setState in TxListItem after unmountWhymarrh Whitby2018-07-051-0/+9
|/ / / / / / /
* / / / / / / fixes 4666Sara Reynolds2018-07-041-2/+5
|/ / / / / /
* | | | | | Merge pull request #4716 from MetaMask/i4663-clearErrorMessagesDan J Miller2018-07-042-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | fixes #4663 - Clear Error Messages when Importing Accounts are Successful
| * | | | | fixes 4663Sara Reynolds2018-07-042-0/+2
| | |_|_|/ | |/| | |
* | | | | Merge pull request #4633 from MetaMask/i4580-import-account-errorsAlexander Tseung2018-07-042-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Show all errors on account creation screen.
| * | | | | 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
| | | | | |
* | | | | | Merge pull request #4699 from TrejGun/removeLeadingZeroesDan J Miller2018-07-043-4/+36
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | move removeLeadingZeroes to utils, add test
| * | | | | move removeLeadingZeroes to utils, add testtrejgun2018-07-023-4/+36
| | | | | |
* | | | | | eslint --fix .brunobar792018-07-0318-20/+20
| |_|/ / / |/| | | |
* | | | | Merge pull request #4687 from snreynolds/i4623-getConvertedCurrencyDan J Miller2018-06-308-24/+9
|\ \ \ \ \ | | | | | | | | | | | | fixes #4623
| * | | | | fixes #4623Sara Reynolds2018-06-308-24/+9
| | |/ / / | |/| | |
* | | | | Merge pull request #4640 from weijiekoh/developDan J Miller2018-06-301-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Fix for #4639: display values of EIP712 typed boolean fields in the signing prompt
| * | | | | removed stray console.logKoh Wei Jie2018-06-221-1/+0
| | | | | |
| * | | | | fixed blank boolean field for typed signing for new UIKoh Wei Jie2018-06-221-0/+4
| | | | | |
* | | | | | Merge pull request #4647 from MetaMask/fix-overflow-currency-displayDan J Miller2018-06-302-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix issues with scrollbar in currency display.
| * | | | | | Improve attribute syntax in send-amount-row.component.jsDan J Miller2018-06-301-1/+1
| | | | | | |
| * | | | | | Remove input arrows for send screen amount row on firefox.Dan2018-06-292-0/+3
| | | | | | |
| * | | | | | Fix issues with scrollbar in currency display.Dan2018-06-291-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #4690 from MetaMask/i4662-token-gas-estimate-uxDan Finlay2018-06-293-0/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Set base estimate for token sends to be updated once recipient address specified
| * | | | | | Set based estimate for token sends to be updated once recipient address ↵Dan2018-06-293-0/+11
| |/ / / / / | | | | | | | | | | | | | | | | | | specified.
* | | | | | Merge pull request #4634 from MetaMask/i4503-touch-up-shpshft-button-styleThomas Huang2018-06-291-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix style of shapeshift screen in deposit modal.
| * | | | | Fix style of shapeshift screen in deposit modal.Dan2018-06-221-1/+1
| |/ / / /
* | | | | Merge pull request #4678 from MetaMask/e2e-beta-tests-upgradeDan J Miller2018-06-291-4/+8
|\ \ \ \ \ | | | | | | | | | | | | E2e beta tests upgrade
| * | | | | Fix send token tests in beta ui e2e tests.Dan2018-06-271-4/+8
| | | | | |
| * | | | | Only show the customize gas modal if the estimateGas call is not currently ↵Dan2018-06-271-5/+43
| | | | | | | | | | | | | | | | | | | | | | | | in flight.
* | | | | | Merge pull request #4674 from MetaMask/removeOnlyTestsThomas Huang2018-06-291-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove .only on test
| * | | | | | Remove .only on testtmashuang2018-06-271-1/+1
| |/ / / / /
* | | | | | Merge pull request #4677 from MetaMask/customize-gas-loading-waitDan J Miller2018-06-281-5/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | Only show the customize gas modal if the estimateGas call is not currently in flight.
| * | | | | | Only show the customize gas modal if the estimateGas call is not currently ↵Dan2018-06-191-5/+43
| | |_|/ / / | |/| | | | | | | | | | | | | | | | in flight.
* | | | | | Merge pull request #4574 from MetaMask/i4409-i4410-ens-input-enhancementsDan J Miller2018-06-285-41/+66
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | [new-ui] Improve ENS input errors and update ens validation on network change
| * | | | | Remove commented out code in ens-input.Dan2018-06-221-1/+0
| | | | | |
| * | | | | Merge branch 'develop' into i4409-i4410-ens-input-enhancementsDan2018-06-2014-47/+183
| |\| | | |
| * | | | | ENS input in send form shows distinct errors for invalid addresses and ↵Dan2018-06-155-22/+38
| | | | | | | | | | | | | | | | | | | | | | | | non-existent addresses.
| * | | | | ENS name revalidates on network change.Dan2018-06-131-23/+33
| | |_|_|/ | |/| | |
* | | | | Merge pull request #4627 from TrejGun/gas-fee-displayDan J Miller2018-06-278-57/+121
|\ \ \ \ \ | |_|_|/ / |/| | | | refactor gas-fee-display component
| * | | | fix default importtrejgun2018-06-232-2/+2
| | | | |
| * | | | linttrejgun2018-06-212-3/+13
| | | | |
| * | | | refactor gas-fee-display componenttrejgun2018-06-218-57/+111
| | | | | | | | | | | | | | | | | | | | #4622
* | | | | Scroll large amounts in the send componentWhymarrh Whitby2018-06-211-1/+1
| | | | |
* | | | | Handle large token balances in tx list heroWhymarrh Whitby2018-06-212-1/+2
| |_|/ / |/| | |
* | | | Merge pull request #4584 from MetaMask/fix-send-tokenkumavis2018-06-1910-19/+129
|\ \ \ \ | | | | | | | | | | Add hex-prefix to gas estimate result
| * | | | On send screen amount change, updateGas call now includes current to address.Dan2018-06-196-4/+37
| | | | |
| * | | | Send screen returns simple gas cost if no to address specified when not ↵Dan2018-06-192-3/+8
| | | | | | | | | | | | | | | | | | | | sending token.
| * | | | Remove leading zeroes from send screen amount row input.Dan2018-06-191-1/+5
| | | | |
| * | | | Fix currency-display.js rendering of token amounts.Dan2018-06-191-0/+1
| | | | |
| * | | | Revert to updating amount on blur of input change; update gas on blur of ↵Dan2018-06-192-5/+11
| | | | | | | | | | | | | | | | | | | | amount input change; validate onchange.
| * | | | Fix unit testsAlexander Tseung2018-06-161-3/+8
| | | | |
| * | | | Estimate gas limit when the token amount changes. Fix amount inputAlexander Tseung2018-06-164-16/+18
| | | | |
| * | | | Update send.utils.js estimateGas tests.Dan2018-06-152-5/+20
| | | | |
| * | | | Add a buffer to new ui gas estimatesDan2018-06-151-2/+41
| | | | |
| * | | | Add hex-prefix to gas estimate resultAlexander Tseung2018-06-152-4/+4
| |/ / /
* / / / View address of an added token (#4591)Csaba S2018-06-191-17/+36
|/ / / | | | | | | | | | | | | | | | * adding menu actions for tokens * apply common style
* | | Merge pull request #4566 from MetaMask/notice-phishingDan Finlay2018-06-152-10/+10
|\ \ \ | | | | | | | | Push new notice on recent phishing incidents
| * | | notices - replace getLatestNotice with getNextNoticekumavis2018-06-142-10/+10
| |/ /
* / / add help link to eth_sign warningBobby Dresser2018-06-121-1/+8
|/ /
* / Access correct property from state in confirm screen components gatherTxMeta()Dan2018-06-082-2/+2
|/
* Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-078-30/+70
|\
| * Merge pull request #4418 from MetaMask/handle-import-account-failure-in-uikumavis2018-06-072-13/+36
| |\ | | | | | | Handle errors for null selected address after Importing account (json or private key)
| | * Merge branch 'develop' into handle-import-account-failure-in-uiDan2018-06-0510-26/+127
| | |\
| | * \ Merge branch 'develop' into handle-import-account-failure-in-uiDan2018-06-0331-192/+324
| | |\ \
| | * | | 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 ↵Dan2018-05-312-10/+35
| | | | | | | | | | | | | | | | | | | | account if no selectedAddress comes after import.
| * | | | i18n - ja improvements03-262018-06-074-9/+23
| | | | |
| * | | | Render the accounts in keyring orderWhymarrh Whitby2018-06-061-3/+4
| | | | |
| * | | | Remove selectedIdentity prop from wallet viewWhymarrh Whitby2018-06-061-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The selectedIdentity property is computed based on the selectedAddress which means that using both the selectedAddress and the selectedIdentity is redundant. In the case of the Array#find call on the set of keyrings, we wouldn't have a situation where one is included and the other isn't. This changeset removes the selectedIdentity from the wallet view because it isn't needed.
| * | | | Ensure selectedAddress exists when render walletWhymarrh Whitby2018-06-061-0/+4
| | |_|/ | |/| |
* | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-0512-28/+129
|\| | |
| * | | Update hide-token-confirmation-modal.js to use new modalState schema (#4482)Dan J Miller2018-06-053-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | * Update hide-token-confirmation-modal.js to use new modalState schema (added in 41e38fe55). * Fix modalState props
| * | | Merge pull request #4428 from MetaMask/fix-tokenlist-balance-overflowDan J Miller2018-06-051-2/+2
| |\ \ \ | | | | | | | | | | Token name is not hidden in wallet if balance is exceptionally long.
| | * | | Token name is not hidden in wallet if balance is exceptionally long.Dan2018-06-011-2/+2
| | |/ /
| * | / Indicate the current selected account on the popup account view (#4445)Alexander Tseung2018-06-056-21/+122
| | |/ | |/|
| * | update helpscout links to zenhubBobby Dresser2018-06-012-2/+2
| | |
* | | Simplify recipient code check in send.utils estimateGasDan2018-06-051-4/+5
| | |
* | | Default currency-display valueToRender to empty string when not readOnly ↵Dan2018-06-021-2/+2
| | | | | | | | | | | | ('0' if readOnly).
* | | Fix calculation of data property for gas estimation on token transfers.Dan2018-06-026-45/+41
| | |
* | | Merge branch 'i3725-refactor-send-component-' into ↵Dan2018-06-0144-353/+610
|\ \ \ | | | | | | | | | | | | i3914-fix-newui-send-gas-estimation
| * | | Remove .onlyDan2018-06-011-1/+1
| | | |
| * | | Merge branch 'i3725-refactor-send-component-' of ↵Dan2018-06-015-153/+70
| |\ \ \ | | | | | | | | | | | | | | | github.com:MetaMask/metamask-extension into i3725-refactor-send-component-
| | * \ \ Merge pull request #4386 from ↵Dan J Miller2018-06-015-153/+70
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | MetaMask/i4077-replace-currency-input-with-numeric-input Replace currency-input.js with NumericInput
| | | * | | 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
| | | | | |