aboutsummaryrefslogtreecommitdiffstats
path: root/ui
Commit message (Expand)AuthorAgeFilesLines
* clear qr code data before scanningbrunobar792018-08-042-23/+25
* design completebrunobar792018-08-046-43/+140
* fixbrunobar792018-08-011-1/+6
* lintbrunobar792018-08-011-15/+14
* lintbrunobar792018-08-011-2/+0
* added crossbrowser support and error handlingbrunobar792018-08-017-49/+150
* 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-3110-234/+164
* Merge branch 'develop' of github.com:MetaMask/metamask-extension into qr-code...brunobar792018-07-314-6/+30
|\
| * Round large exponential numbersAlexander Tseung2018-07-283-6/+23
| * Fix overflow for long total strings in confirm stringAlexander Tseung2018-07-261-0/+7
* | fix unit testsbrunobar792018-07-271-0/+2
* | fix dependenciesbrunobar792018-07-271-1/+1
* | fix linting errorsbrunobar792018-07-272-2/+2
* | clean upbrunobar792018-07-271-1/+0
* | fix merge conflictsbrunobar792018-07-2712-17/+426
|\|
| * Merge pull request #4885 from MetaMask/RetryOnEarliestPendingTxDan J Miller2018-07-261-1/+10
| |\
| | * 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
| |\ \ | | |/ | |/|
| | * 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-245-31/+108
| * | UI confirm screen closes confirmation window on submit or cancel of a txDan Miller2018-07-241-4/+15
* | | 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-252-2/+6
* | | decent UIbrunobar792018-07-251-21/+43
* | | working without injectionbrunobar792018-07-259-21/+229
* | | added qr code scanner icon in send transactionbrunobar792018-07-247-5/+25
* | | camera working back and forthbrunobar792018-07-244-1/+36
|/ /
* | Merge pull request #4851 from MetaMask/fix-trezor-alertDan Finlay2018-07-241-4/+11
|\ \
| * | show alert ONLY when device is connectedbrunobar792018-07-231-4/+11
* | | Merge pull request #4848 from MetaMask/fix-alert-flashDan Finlay2018-07-241-6/+46
|\ \ \
| * | | refactor Alert component to work properlybrunobar792018-07-221-6/+46
| |/ /
* | | fix type板橋 清信2018-07-231-1/+1
* | | fix token amount板橋 清信2018-07-231-3/+2
|/ /
* | Add fallback options for displaying recipient name in the Confirm screenAlexander Tseung2018-07-213-10/+24
* | Merge pull request #4625 from MetaMask/initial-trezor-supportBruno Barbieri2018-07-2020-23/+1338
|\ \ | |/ |/|
| * last css fixesbrunobar792018-07-193-10/+42
| * added new global alertbrunobar792018-07-196-8/+126
| * fix support linkbrunobar792018-07-191-1/+1
| * fix unsupported browser viewbrunobar792018-07-192-2/+6
| * lintbrunobar792018-07-191-1/+1
| * scroll smoothbrunobar792018-07-192-3/+12
| * design donebrunobar792018-07-193-44/+178
| * fix browser not supported screenbrunobar792018-07-181-1/+1
| * Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial...brunobar792018-07-183-31/+42
| |\
| * | updated account list based on new designsbrunobar792018-07-184-25/+85
| * | Merge branch 'develop' into initial-trezor-supportbrunobar792018-07-17129-115/+251
| |\ \
| * \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial...brunobar792018-07-145-54/+42
| |\ \ \
| * | | | fix account selectionbrunobar792018-07-142-3/+11
| * | | | added affiliate link to trezorbrunobar792018-07-142-0/+22
| * | | | 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 initial...brunobar792018-07-13104-591/+4351
| |\ \ \ \
| * | | | | added tooltipbrunobar792018-07-123-5/+16
| * | | | | forget device and autiload account features addedbrunobar792018-07-124-1/+95
| * | | | | clean upbrunobar792018-07-113-6/+6
| * | | | | account removal is workingbrunobar792018-07-114-14/+40
| * | | | | finish warning modal UIbrunobar792018-07-118-3/+111
| * | | | | added ui to remove accountsbrunobar792018-07-102-4/+47
| * | | | | fix account duplicationbrunobar792018-07-101-6/+0
| * | | | | fix all the account related bugsbrunobar792018-07-102-13/+27
| * | | | | copy updatedbrunobar792018-07-072-2/+5
| * | | | | update connect harwdware screenbrunobar792018-07-072-9/+25
| * | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial...brunobar792018-07-0730-195/+542
| |\ \ \ \ \
| * | | | | | 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-062-1/+39
| * | | | | | lint fixbrunobar792018-07-041-1/+1
| * | | | | | fix merge conflictsbrunobar792018-07-047-7/+63
| |\ \ \ \ \ \
| * \ \ \ \ \ \ fix merge conflictsbrunobar792018-07-0420-22/+22
| |\ \ \ \ \ \ \
| * | | | | | | | 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-0254-203/+569
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ 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-107-6/+413
* | | | | | | | | | | Merge pull request #4822 from whymarrh/show-more-addressWhymarrh Whitby2018-07-192-3/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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 updateSendHexData actionWhymarrh Whitby2018-07-182-0/+17
* | | | | | | | | | | | Add hex data row to send screenWhymarrh Whitby2018-07-185-2/+43
|/ / / / / / / / / / /
* | | | | | | | | | | Use Number constructor for number conversion. Use existing noConversionRateAv...Alexander Tseung2018-07-182-4/+4
* | | | | | | | | | | 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-1816-104/+313
* | | | | | | | | | | Remove unused confirm transaction filesAlexander Tseung2018-07-184-299/+23
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Merge pull request #4815 from MetaMask/i4783-retryAlexander Tseung2018-07-182-20/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Increase clickable area and padding of Retry Transaction barAlexander Tseung2018-07-172-20/+14
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | 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-16124-20/+142
* | | | | | | | | Merge pull request #4715 from BitGuildPlatform/to-autocompleteDan J Miller2018-07-143-121/+142
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix classnameTrejGun2018-07-051-1/+4
| * | | | | | | | | Merge branch 'develop' into to-autocompleteАнна2018-07-0529-41/+90
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | fixes #4664trejgun2018-07-033-121/+139
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #4702 from BitGuildPlatform/contextTypesDan J Miller2018-07-1414-60/+57
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Merge branch 'develop' into contextTypesTrejGun2018-07-0529-41/+90
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | convert contextType to static prop for refactored componentstrejgun2018-07-0514-60/+57
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #4766 from whymarrh/null-translationsWhymarrh Whitby2018-07-134-41/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove unneeded MetaMaskConnect connect wrapperWhymarrh Whitby2018-07-122-28/+1
| * | | | | | | | | Fallback to English and then the key for I18nProvider#tWhymarrh Whitby2018-07-122-11/+16
| * | | | | | | | | Inline locale variable in fetchLocale fnWhymarrh Whitby2018-07-121-2/+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-12102-553/+4311
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix font sizes, colors. Include data tab for send-eth transaction confirmatio...Alexander Tseung2018-07-124-4/+20
| * | | | | | | | Fix multiple signature requests showing an infinite spinnerAlexander Tseung2018-07-111-2/+11
| * | | | | | | | Add unit tests for confirmTransaction duck and utilAlexander Tseung2018-07-102-0/+812
| * | | | | | | | Fix existing unit testsAlexander Tseung2018-07-081-4/+7
| * | | | | | | | Various fixes from PR commentsAlexander Tseung2018-07-0714-154/+216
| * | | | | | | | Use eth-method-registry to get method dataAlexander Tseung2018-07-078-34/+112
| * | | | | | | | Display newest transactionAlexander Tseung2018-07-073-5/+5
| * | | | | | | | Refactor data flow, signature request routingAlexander Tseung2018-07-079-117/+185
| * | | | | | | | Refactor and redesign confirm transaction viewsAlexander Tseung2018-07-0797-545/+3255
| | |_|_|_|_|_|/ | |/| | | | | |
* / | | | | | | Prevent users from submitting password multiple times on the unlock screenAlexander Tseung2018-07-113-38/+40
|/ / / / / / /
* | | | | | | Merge pull request #4648 from MetaMask/update-import-from-seed-screenDan J Miller2018-07-063-152/+172
|\ \ \ \ \ \ \
| * | | | | | | Delete old restore vault file.Dan2018-07-063-341/+163
| * | | | | | | Update import from seed screen on new ui.Dan2018-07-053-1/+199
* | | | | | | | Merge pull request #4694 from MetaMask/i4660-improve-send-token-error-uiDan J Miller2018-07-0618-17/+320
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve send token error ux.Dan2018-07-0518-17/+320
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #4733 from whymarrh/fix-setstate-warningsWhymarrh Whitby2018-07-063-0/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't update token balances after tracker is stoppedWhymarrh Whitby2018-07-053-0/+10
| * | | | | | | | Remove TokenTracker listeners when unmounting componentWhymarrh Whitby2018-07-052-0/+4
* | | | | | | | | Merge pull request #4734 from whymarrh/txlistitem-setstate-warningWhymarrh Whitby2018-07-061-0/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Prevent calling setState in TxListItem after unmountWhymarrh Whitby2018-07-051-0/+9
| |/ / / / / / / /
* | | | | | | | | Merge pull request #4617 from TrejGun/fix-new-lineDan J Miller2018-07-061-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix white spaces in signaturetrejgun2018-06-201-0/+1
* | | | | | | | | | Merge pull request #4686 from MetaMask/tweak-token-list-amount-styleDan J Miller2018-07-051-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Ensures token list amount is in its own row.Dan2018-07-051-0/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #4685 from MetaMask/estimate-gasprice-background-newuiDan J Miller2018-07-051-14/+20
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Improve error and promise resolution handling in action.js updateGasData().Dan2018-07-051-13/+14
| * | | | | | | | Remove unnecessary anonymous function call in actions.js gas estimation.Dan2018-07-041-7/+6
| * | | | | | | | Use background gas price estimation method in new ui.Dan2018-06-291-8/+14
* | | | | | | | | fixes 4666Sara Reynolds2018-07-041-2/+5
* | | | | | | | | :qwSara Reynolds2018-07-041-10/+0
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #4716 from MetaMask/i4663-clearErrorMessagesDan J Miller2018-07-042-0/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | fixes 4663Sara Reynolds2018-07-042-0/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #4654 from TrejGun/bignumberDan J Miller2018-07-042-1/+23
|\ \ \ \ \ \ \
| * | | | | | | linttrejgun2018-06-291-1/+1
| * | | | | | | change numberstrejgun2018-06-241-7/+6
| * | | | | | | remove .onlytrejgun2018-06-241-1/+1
| * | | | | | | fixes #4307 BigNumber casting issuetrejgun2018-06-242-1/+24
| | |_|/ / / / | |/| | | | |
* | | | | | | 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
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #4699 from TrejGun/removeLeadingZeroesDan J Miller2018-07-043-4/+36
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | move removeLeadingZeroes to utils, add testtrejgun2018-07-023-4/+36
* | | | | | | eslint --fix .brunobar792018-07-0320-22/+22
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #4687 from snreynolds/i4623-getConvertedCurrencyDan J Miller2018-06-308-24/+9
|\ \ \ \ \ \
| * | | | | | fixes #4623Sara Reynolds2018-06-308-24/+9
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #4640 from weijiekoh/developDan J Miller2018-06-301-0/+3
|\ \ \ \ \ \
| * | | | | | 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-303-2/+12
|\ \ \ \ \ \ \
| * | | | | | | 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-293-0/+11
| * | | | | | | Fix issues with scrollbar in currency display.Dan2018-06-292-2/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #4690 from MetaMask/i4662-token-gas-estimate-uxDan Finlay2018-06-293-0/+11
|\ \ \ \ \ \ \
| * | | | | | | Set based estimate for token sends to be updated once recipient address speci...Dan2018-06-293-0/+11
| |/ / / / / /
* | | | | | | Merge pull request #4634 from MetaMask/i4503-touch-up-shpshft-button-styleThomas Huang2018-06-292-7/+26
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix style of shapeshift screen in deposit modal.Dan2018-06-222-7/+26
| |/ / / / /
* | | | | | Merge pull request #4678 from MetaMask/e2e-beta-tests-upgradeDan J Miller2018-06-291-4/+8
|\ \ \ \ \ \
| * | | | | | 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 in...Dan2018-06-274-6/+79
* | | | | | | Merge pull request #4674 from MetaMask/removeOnlyTestsThomas Huang2018-06-291-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove .only on testtmashuang2018-06-271-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #4677 from MetaMask/customize-gas-loading-waitDan J Miller2018-06-284-6/+79
|\ \ \ \ \ \ \
| * | | | | | | Only show the customize gas modal if the estimateGas call is not currently in...Dan2018-06-194-6/+79
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #4574 from MetaMask/i4409-i4410-ens-input-enhancementsDan J Miller2018-06-286-41/+71
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Remove commented out code in ens-input.Dan2018-06-221-1/+0
| * | | | | | Merge branch 'develop' into i4409-i4410-ens-input-enhancementsDan2018-06-2019-56/+205
| |\| | | | |
| * | | | | | ENS input in send form shows distinct errors for invalid addresses and non-ex...Dan2018-06-156-22/+43
| * | | | | | 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
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | fix default importtrejgun2018-06-232-2/+2
| * | | | | linttrejgun2018-06-212-3/+13
| * | | | | refactor gas-fee-display componenttrejgun2018-06-218-57/+111
| | |_|/ / | |/| | |
* | | | | Scroll large amounts in the send componentWhymarrh Whitby2018-06-212-4/+6
* | | | | Handle large token balances in tx list heroWhymarrh Whitby2018-06-214-5/+21
| |_|/ / |/| | |
* | | | Merge pull request #4584 from MetaMask/fix-send-tokenkumavis2018-06-1911-19/+140
|\ \ \ \
| * | | | 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 sendi...Dan2018-06-192-3/+8
| * | | | 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 amou...Dan2018-06-192-5/+11
| * | | | 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-152-2/+52
| * | | | Add hex-prefix to gas estimate resultAlexander Tseung2018-06-152-4/+4
| |/ / /
* / / / View address of an added token (#4591)Csaba S2018-06-192-22/+37
|/ / /
* | | Merge pull request #4566 from MetaMask/notice-phishingDan Finlay2018-06-154-14/+14
|\ \ \
| * | | notices - replace getLatestNotice with getNextNoticekumavis2018-06-144-14/+14
| |/ /
* / / add help link to eth_sign warningBobby Dresser2018-06-122-1/+14
|/ /
* / 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-0713-63/+90
|\
| * Merge pull request #4418 from MetaMask/handle-import-account-failure-in-uikumavis2018-06-074-19/+47
| |\
| | * Merge branch 'develop' into handle-import-account-failure-in-uiDan2018-06-0513-28/+143
| | |\
| | * \ Merge branch 'develop' into handle-import-account-failure-in-uiDan2018-06-0334-227/+366
| | |\ \
| | * | | 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-314-16/+46
| * | | | i18n - ja improvements03-262018-06-076-16/+34
| * | | | Render the accounts in keyring orderWhymarrh Whitby2018-06-061-3/+4
| * | | | Remove unused identities reducer from UIWhymarrh Whitby2018-06-062-22/+0
| * | | | Remove selectedIdentity prop from wallet viewWhymarrh Whitby2018-06-061-5/+3
| * | | | Ensure selectedAddress exists when render walletWhymarrh Whitby2018-06-061-0/+4
| | |_|/ | |/| |
* | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-0515-30/+145
|\| | |
| * | | Update hide-token-confirmation-modal.js to use new modalState schema (#4482)Dan J Miller2018-06-053-3/+3
| * | | Merge pull request #4428 from MetaMask/fix-tokenlist-balance-overflowDan J Miller2018-06-052-4/+13
| |\ \ \
| | * | | Fix ellipsesAlexander Tseung2018-06-011-5/+6
| | * | | Token name is not hidden in wallet if balance is exceptionally long.Dan2018-06-012-3/+11
| | |/ /
| * | / Indicate the current selected account on the popup account view (#4445)Alexander Tseung2018-06-058-21/+127
| | |/ | |/|
| * | 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 ('0'...Dan2018-06-021-2/+2
* | | Fix calculation of data property for gas estimation on token transfers.Dan2018-06-027-47/+41
* | | Merge branch 'i3725-refactor-send-component-' into i3914-fix-newui-send-gas-e...Dan2018-06-0152-421/+758
|\ \ \
| * | | Remove .onlyDan2018-06-011-1/+1
| * | | Merge branch 'i3725-refactor-send-component-' of github.com:MetaMask/metamask...Dan2018-06-016-153/+92
| |\ \ \
| | * \ \ Merge pull request #4386 from MetaMask/i4077-replace-currency-input-with-nume...Dan J Miller2018-06-016-153/+92
| | |\ \ \
| | | * | | 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-294-38/+85
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 11:28:10 +0800