aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app
Commit message (Expand)AuthorAgeFilesLines
* Use Parity on-chain registry only when is needed (#6052)Esteban MiƱo2019-01-235-6/+46
* Refactor BalanceComponent to jsx (#6048)Alexander Tseung2019-01-216-250/+121
* I#5956 fix 1 (#6026)Frankie2019-01-181-0/+3
* Fix grammar error in Current Conversion (#6029)Alexander Tseung2019-01-171-1/+1
* Disable account dropdown on signing screens (#6024)Alexander Tseung2019-01-175-85/+195
* Fix confirm screen for sending ether tx with hex data (#6008)Alexander Tseung2019-01-111-0/+6
* Fix ERC20 token value decoding (#5995)Hsuan Lee2019-01-041-1/+1
* Fix Component#componentDidUpdate usage (#5977)Bowen2019-01-041-3/+3
* Add scrolling button to account listAlexander Tseung2019-01-047-255/+394
* Prevent users from changing the From field in the send screen (#5922)Alexander Tseung2018-12-1419-440/+27
* Fix displayed time and date in the activity log. Remove vreme library, add lu...Alexander Tseung2018-12-143-10/+5
* Merge pull request #5893 from MetaMask/loading-network-screenDan J Miller2018-12-1413-36/+330
|\
| * Clean up for the loading-network-screenDan Miller2018-12-133-33/+24
| * Improve styling of loading retry / error screenDan Miller2018-12-131-0/+6
| * Adds network loading retry / error screen.Dan Miller2018-12-1310-2/+266
| * Add identifier of private network to the network loading screen message.Dan Miller2018-12-133-7/+20
| * Add spinner and dropdown arrow to network indicator on custom network loading.Dan Miller2018-12-132-27/+47
* | Fix speed up button not showing for transactions with the lowest nonce (#5925)Alexander Tseung2018-12-131-3/+3
|/
* Show transaction fee instead of total fee in top left of gas customization mo...Dan Miller2018-12-134-9/+9
* Fix width of gas customization model in notification viewDan Miller2018-12-132-3/+4
* Add missing translation to the gas customization component.Dan Miller2018-12-135-14/+17
* Ensures that advanced tab gas limit reflects tx gas limitDan Miller2018-12-125-11/+7
* Add submitDisabled prop to Modals. Disable submit button when creating a canc...Alexander Tseung2018-12-124-2/+44
* Improve ux for low gas price set (#5862)Dan J Miller2018-12-1111-66/+373
* fix formatting of 32-byte strings in personal_sign (#5878)Noah Zinsmeister2018-12-101-1/+1
* Group transactions by nonce (#5886)Alexander Tseung2018-12-1034-336/+1132
* Replace height: 100% rule with workaround for flexbox quirksWhymarrh Whitby2018-12-061-1/+2
* Fix styling of send screen in extension view when hex data on.Dan Miller2018-12-044-12/+17
* Final gas customization fixesDan Miller2018-12-0417-103/+197
* Clear custom gas data on hiding of gas customization modal.Dan Miller2018-12-041-4/+12
* Modify results of API data to better fit gas chart: remove outliers, pad dataDan Miller2018-12-045-44/+126
* Add loading spinners when waiting for APIs in the gas customization modalDan Miller2018-12-049-6/+61
* Uses more reliable api on main send screen; caches basic api results in modalDan Miller2018-12-0418-139/+300
* Improve responsiveness of customize speed up slider.Dan Miller2018-12-043-6/+76
* Make gas customization modal responsive.Dan Miller2018-12-047-1/+32
* Remove gas customization integration tests (in favour of e2e tests)Dan Miller2018-12-041-1/+2
* Fixes for components that break e2e gas customization tests, plus unit test u...Dan Miller2018-12-049-21/+102
* Update e2e tests for new gas customization modal.Dan Miller2018-12-041-1/+1
* Connect gas price chart to gas station api.Dan Miller2018-12-042-41/+184
* Adds speed up slide-in gas customization sidebarDan Miller2018-12-0419-58/+306
* Redesign of gas customization basic tab.Dan Miller2018-12-047-10/+131
* Clean up for mmui-i11-custom-gas-price-chart branchDan Miller2018-12-044-33/+25
* Improve data management and tests for gas-modal-page-container price estimates.Dan Miller2018-12-044-20/+67
* Update tests, plus some lint fixes, for gas-price-chartDan Miller2018-12-043-53/+204
* Clean up gas chart code.Dan Miller2018-12-043-362/+373
* Add control arrows to advanced gas tab inputs.Dan Miller2018-12-043-1/+63
* Complete integration of gas chart with redux.Dan Miller2018-12-049-14/+148
* Read only connection of gas price chart to reduxDan Miller2018-12-0413-28/+245
* Gas price chart improvements, redesign, bug fixes, and set up to receive exte...Dan Miller2018-12-045-88/+300
* Adds not yet functional gas price chart.Dan Miller2018-12-049-20/+286
* Lint and unit test fixes.Dan Miller2018-12-043-5/+4
* Clean up for advanced gas tab customization changes.Dan Miller2018-12-042-19/+13
* Adds redesign for the customize gas advanced tab.Dan Miller2018-12-0419-152/+332
* Test updates and additions for button integration with send screen.Dan Miller2018-12-0418-64/+462
* Integrate gas buttons with the send screen.Dan Miller2018-12-0413-41/+289
* Connects remained of the gas customization component to redux.Dan Miller2018-12-0422-194/+497
* Adds gas-duck.test.js tests.Dan Miller2018-12-041-0/+300
* Styling fixes for gas customization advanced tab content.Dan Miller2018-12-044-3/+2
* Improvements to propdefaults in button-group.component and basic-tab-content....Dan Miller2018-12-042-2/+3
* Connect the gas-button-group component to redux and a live api.Dan Miller2018-12-0415-111/+573
* Adds basic tab content to gas customizer, with styled button group (static, f...Dan Miller2018-12-0416-15/+615
* Improve styling of advanced-tab-content gasInput rowDan Miller2018-12-043-5/+11
* Add tests for advanced-tab-component.js and subcomponents.Dan Miller2018-12-044-18/+275
* Remove gas slider from advance-tab-content.componentDan Miller2018-12-043-19/+2
* Split advanced-tab-content.component.js render() method into smaller pieces;...Dan Miller2018-12-042-31/+51
* Adds the content of the advanced tab - w/o chart or dynamic content - to gas ...Dan Miller2018-12-0420-63/+532
* Use BEM for css in gas-modal-page-containerDan Miller2018-12-043-26/+28
* Use correct message key in gas-modal-page-container.component.jsDan Miller2018-12-041-1/+1
* Adds new gas customization modal container (without content)Dan Miller2018-12-0410-29/+353
* Save recent network balances in local storage (#5843)Dan J Miller2018-12-0112-28/+61
* Hide app-header when provider request pending (#5831)Whymarrh Whitby2018-11-272-5/+19
* Show disabled cursor in .network-disabled state (#5829)Whymarrh Whitby2018-11-271-1/+1
* Increase Token Symbol length to twelveThomas Huang2018-11-231-2/+2
* Merge pull request #5797 from MetaMask/trezor-v6Bruno Barbieri2018-11-222-4/+4
|\
| * fix merge conflictsbrunobar792018-11-2140-148/+148
| |\
| * | clean upbrunobar792018-11-151-1/+0
| * | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-11-152-1/+35
| |\ \
| * \ \ Merge branch 'develop' into trezor-v5brunobar792018-11-1414-21/+223
| |\ \ \
| * \ \ \ fix merge conflictsbrunobar792018-11-07110-444/+1224
| |\ \ \ \
| * \ \ \ \ fix merge conflictsbrunobar792018-10-2177-611/+2454
| |\ \ \ \ \
| * \ \ \ \ \ fix conflictsbrunobar792018-10-17194-1721/+4929
| |\ \ \ \ \ \
| * \ \ \ \ \ \ fix merge conflictsbrunobar792018-09-111-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5brunobar792018-09-06131-2288/+3055
| |\ \ \ \ \ \ \ \
| * | | | | | | | | fix commentbrunobar792018-08-211-2/+0
| * | | | | | | | | fix merge conflictsbrunobar792018-08-2135-144/+850
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | add error messagesbrunobar792018-08-111-2/+4
| * | | | | | | | | | hide export private key for trezor accountsbrunobar792018-08-101-2/+16
* | | | | | | | | | | 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
* | | | | | | | | | | Remove "Beta" from welcome messagesWhymarrh Whitby2018-11-211-1/+1
* | | | | | | | | | | Remove "Beta" from header logoWhymarrh Whitby2018-11-211-1/+1
* | | | | | | | | | | Default to the new UI for first time usersWhymarrh Whitby2018-11-212-18/+19
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Fix button styling for Create Account Connect (#5787)Alexander Tseung2018-11-203-47/+13
* | | | | | | | | | Fix rounding issue when sending max tokens (#5695)Alexander Tseung2018-11-2035-99/+133
* | | | | | | | | | ESLint fixes (#5775)Whymarrh Whitby2018-11-172-2/+2
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Show APPROVED status for transactions that have been approved but not submittedAlexander Tseung2018-11-142-1/+35
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Fixes #3425: Better support for batch transactions (#5437)PaddyMc2018-11-1411-14/+213
* | | | | | | | Increase number of ETH decimals displayed in the balance view from 3 to 4 (#5...Alexander Tseung2018-11-102-4/+4
* | | | | | | | Merge pull request #5481 from MetaMask/reducersThomas Huang2018-11-071-3/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | nextUnreadNotice undefined rather than nullThomas2018-11-011-1/+1
| * | | | | | | Readable tests, and set nextUnreadNotice to null when CLEAR_NOTICES is dispat...Thomas2018-10-311-0/+1
| * | | | | | | Merge branch 'develop' into reducersThomas2018-10-31141-1014/+3221
| |\ \ \ \ \ \ \
| * | | | | | | | Set maxMode and toNickname defaults for clear_sendThomas2018-10-101-3/+5
* | | | | | | | | Update the colour of the default image used on Connect Request (#5678)Whymarrh Whitby2018-11-061-1/+2
* | | | | | | | | Update "Learn more" link on 1102 connect screen (#5677)Whymarrh Whitby2018-11-061-1/+7
* | | | | | | | | Update Connect Request screen design (#5644)Whymarrh Whitby2018-11-0613-26/+302
* | | | | | | | | EIP-1102: add user privacy optionbitpshr2018-11-067-113/+37
* | | | | | | | | EIP-1102: Add option to force-enable providerbitpshr2018-11-067-0/+110
* | | | | | | | | EIP-1102: updated implementationbitpshr2018-11-0615-0/+196
| |/ / / / / / / |/| | | | | | |
* | | | | | | | fixed currency-display (#5619)HackyMiner2018-10-302-3/+22
* | | | | | | | Merge pull request #5560 from MetaMask/sentry-enhancements2kumavis2018-10-301-10/+16
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into sentry-...kumavis2018-10-3086-421/+658
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into sentry-...kumavis2018-10-211-3/+2
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | sentry - include app state in ui errorskumavis2018-10-201-10/+16
* | | | | | | | | | Merge pull request #5567 from MetaMask/HowardBraham-developkumavis2018-10-304-3/+8
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into HowardB...kumavis2018-10-2644-278/+340
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | ui - use variable to clarify result of emptiness checkkumavis2018-10-212-2/+6
| * | | | | | | | | | Merge branch 'develop' into developkumavis2018-10-2198-666/+2740
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | ganache-core merged my PR, so I changed some comments to clarify that ganache...Howard Braham2018-10-102-2/+2
| * | | | | | | | | | Bug Fix: #1789 and #4525 eth.getCode() with no contractHoward Braham2018-10-104-3/+4
* | | | | | | | | | | Add support for RPC endpoints with custom chain IDs (#5134)HackyMiner2018-10-2648-143/+317
* | | | | | | | | | | Fix raised button min-height (#5613)Alexander Tseung2018-10-261-0/+1
| |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Fix button styling for overflowing text (#5602)Alexander Tseung2018-10-251-2/+2
* | | | | | | | | | Fix blockies icons overriding contract map icons. Refactor Identicon componen...Alexander Tseung2018-10-2521-138/+257
* | | | | | | | | | Fix UnknownFunction showing as Confirm (#5590)Alexander Tseung2018-10-241-0/+11
* | | | | | | | | | Add Activity Log entry for onchain failures for a transaction. Change scrolli...Alexander Tseung2018-10-2314-112/+20
* | | | | | | | | | Fix signature request styling issues (#5574)Alexander Tseung2018-10-231-1/+1
* | | | | | | | | | Fix account display width for large currency valuesAlexander Tseung2018-10-219-25/+49
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Update Shapeshift logo url and adjust list item contentsThomas2018-10-181-3/+2
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Extract Add Token button into its own componentWhymarrh Whitby2018-10-186-23/+82
* | | | | | | | Adds toggle for primary currency (#5421)Alexander Tseung2018-10-1771-585/+2370
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Decrease click area for AmountMaxButton on send screenWhymarrh Whitby2018-10-162-19/+24
* | | | | | | add tooltip for view etherscan tx (#5518)Michael J. Cohen2018-10-161-7/+10
* | | | | | | Add txReceipt data to transaction details (#5513)Alexander Tseung2018-10-166-5/+84
* | | | | | | Update Zendesk links for new subdomainWhymarrh Whitby2018-10-124-4/+4
* | | | | | | test - add actions unit tests (#5369)Thomas Huang2018-10-101-4/+8
* | | | | | | Make all addresses EIP-55 compliant (#5379)bakaoh2018-10-103-8/+14
| |/ / / / / |/| | | | |
* | | | | | tests - integration - Add Drizzle tests (#5467)Bruno Barbieri2018-10-101-1/+1
* | | | | | Fixed lint errorsSantiago Gonzalez Toral2018-10-101-11/+11
* | | | | | Added account options on home screenSantiago Gonzalez Toral2018-10-104-4/+133
* | | | | | Fix token values being undefinedAlexander Tseung2018-10-092-3/+8
|/ / / / /
* | | | | Merge pull request #5442 from whymarrh/fix-page-container-footerWhymarrh Whitby2018-10-063-64/+64
|\ \ \ \ \
| * | | | | Fix markup for inline instances of `PageContainer`sWhymarrh Whitby2018-10-063-64/+64
* | | | | | Fix action translations edge casesAlexander Tseung2018-10-064-2/+14
|/ / / / /
* | | | | Merge pull request #5428 from alextsg/i5372-queue-orderDan Finlay2018-10-061-1/+1
|\ \ \ \ \
| * | | | | Reverse pending transactions orderAlexander Tseung2018-10-051-1/+1
* | | | | | Translate method names in the transaction list only when applicableAlexander Tseung2018-10-056-20/+108
|/ / / / /
* | | | | Remove "Copy Contract Address" from token optionsWhymarrh Whitby2018-10-041-9/+0
* | | | | Merge pull request #5329 from whymarrh/confirm-featuresWhymarrh Whitby2018-10-0212-25/+245
|\ \ \ \ \
| * | | | | Only use current network txs when calculating "Reject All"Whymarrh Whitby2018-10-021-1/+6
| * | | | | Switch page-container__footer-* for header and footer tagsWhymarrh Whitby2018-10-023-27/+27
| * | | | | Reword batch reject confirm as "Reject All"Whymarrh Whitby2018-10-021-1/+1
| * | | | | Confirm rejecting multiple transactions with modalWhymarrh Whitby2018-10-027-4/+100
| * | | | | s/Cancel/Reject/ on confirm screen for clarityWhymarrh Whitby2018-10-021-1/+2
| * | | | | Add "Cancel All" button to confirm footerWhymarrh Whitby2018-10-024-4/+79
| * | | | | Have PageContainerFooter take children nodeWhymarrh Whitby2018-10-023-21/+64
* | | | | | Recipient not required on send screen when hex data presentWhymarrh Whitby2018-10-015-4/+17
* | | | | | Rework estimateGas logicWhymarrh Whitby2018-10-011-10/+10
* | | | | | Update gas when hex data changes on send screenWhymarrh Whitby2018-10-019-14/+56
* | | | | | Update send.utils.test to with better mocksWhymarrh Whitby2018-10-011-5/+8
* | | | | | Allow sending transactions with hex data and no recipientWhymarrh Whitby2018-10-011-2/+2
|/ / / / /
* | | | | Improvement: Reposition customize gas error (#5265)Sean2018-10-011-2/+4
* | | | | support editable customRPC (#5267)HackyMiner2018-09-294-0/+34
* | | | | Close transaction details modal when clicking speed upAlexander Tseung2018-09-272-4/+10
* | | | | Merge pull request #5332 from MetaMask/ui-unit-testsThomas Huang2018-09-267-0/+488
|\ \ \ \ \
| * | | | | Some Ui teststmashuang2018-09-257-0/+488
* | | | | | Merge pull request #5282 from MetaMask/tx-cancel-uiAlexander Tseung2018-09-2566-369/+1196
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix multiplyCurrencies. Add onClose prop for Modal component. Remove hideModa...Alexander Tseung2018-09-219-57/+40
| * | | | | Add unit testsAlexander Tseung2018-09-209-15/+342
| * | | | | Fix unit testsAlexander Tseung2018-09-201-5/+4
| * | | | | Add transition effect to TransactionListItemDetails expanderAlexander Tseung2018-09-202-13/+29
| * | | | | Add TransactionDetails modalAlexander Tseung2018-09-209-9/+122
| * | | | | Switch existing modals from using Notification to Modal. Remove Notification ...Alexander Tseung2018-09-2036-321/+500
| * | | | | Add withModalProps HOCAlexander Tseung2018-09-202-0/+22
| * | | | | Fix Transaction view stylesAlexander Tseung2018-09-203-3/+9
| * | | | | Add Modal componentAlexander Tseung2018-09-207-0/+186
| * | | | | Refactor ConfirmPageContainerError to ErrorMessageAlexander Tseung2018-09-208-18/+14
* | | | | | Merge pull request #5241 from MetaMask/refactor-settingsAlexander Tseung2018-09-2116-809/+801
|\ \ \ \ \ \
| * | | | | | 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-2016-809/+805
| |/ / / / /
* | | | | | Move main-container wrapper div into its own classWhymarrh Whitby2018-09-204-2/+13
* | | | | | Prevent loading screen from overlaying the app barWhymarrh Whitby2018-09-203-7/+11
* | | | | | Make the LoadingScreen component 100% as tall as its containerWhymarrh Whitby2018-09-201-10/+1
* | | | | | Remove unused loading-overlay--full-screen CSS stylesWhymarrh Whitby2018-09-201-7/+0
|/ / / / /
* | | | | Fix exception thrown on getTokenDataAlexander Tseung2018-09-192-2/+24
* | | | | Merge branch 'develop' into eip-712Paul Bouchon2018-09-187-18/+54
|\ \ \ \ \
| * | | | | compute and display checksummed hash in selected-account component (#5255)Chad Grimaldi2018-09-162-3/+20
| * | | | | Improvement: Increase click area for arrows (#5264)Sean2018-09-162-6/+18
| * | | | | Fix speed up functionalityAlexander Tseung2018-09-152-5/+12
| * | | | | Merge pull request #5261 from lastblocklabs/style-fix-5242Whymarrh Whitby2018-09-151-3/+3
| |\ \ \ \ \
| | * | | | | follow up style fix to #5242chadmg2018-09-141-3/+3
| * | | | | | Bug Fix: #5183 history not definedSean Rabaut2018-09-141-1/+1
| |/ / / / /
* | | | | | Update new method namespace from v2 to v3bitpshr2018-09-141-3/+3
* | | | | | Implement latest EIP-712 protocolbitpshr2018-09-142-7/+42
|/ / / / /
* | | | | Merge pull request #5182 from MetaMask/tx-activityAlexander Tseung2018-09-1362-314/+1400
|\ \ \ \ \
| * | | | | Fix identicon address. Fix styling of New Contract recipient. Fix Activity Lo...Alexander Tseung2018-09-138-13/+39
| * | | | | Fix tests. Add className to Identicon ethLogos.Alexander Tseung2018-09-131-0/+1
| * | | | | Add WEI to getEthConversionFromWeiHexAlexander Tseung2018-09-131-1/+1
| * | | | | Add transaction details to TransactionListItem componentAlexander Tseung2018-09-133-37/+46
| * | | | | Add TransactionListItemDetails componentAlexander Tseung2018-09-135-0/+200
| * | | | | Add TransactionBreakdown componentAlexander Tseung2018-09-139-0/+240
| * | | | | Add tests for TransactionActivityLog. Make changes to rendering eventsAlexander Tseung2018-09-139-42/+325
| * | | | | Edit styling of cards variant of SenderToRecipient componentAlexander Tseung2018-09-131-1/+1
| * | | | | Add HexToDecimal componentAlexander Tseung2018-09-134-161/+48
| * | | | | Add tests for Card componentAlexander Tseung2018-09-132-1/+26
| * | | | | Allow denominations in CurrencyDisplay componentAlexander Tseung2018-09-136-16/+85
| * | | | | Add raised type buttons to Button component. Refactor all buttons within app ...Alexander Tseung2018-09-1318-94/+180
| * | | | | Add ActivityLog componentAlexander Tseung2018-09-139-1/+261
* | | | | | increase z-index of send-to input to allow for right-click (#5242)Chad Grimaldi2018-09-131-0/+4
|/ / / / /
* | | | | Merge pull request #5216 from MetaMask/tx-cancelFrankie2018-09-111-0/+25
|\ \ \ \ \
| * | | | | Add createCancelTransaction methodAlexander Tseung2018-09-111-0/+25
| | |_|_|/ | |/| | |
* | | | | Merge pull request #5223 from whymarrh/tx-error-tooltipsFrankie2018-09-115-31/+77
|\ \ \ \ \
| * | | | | Show failed tx txMeta.err in tooltipsWhymarrh Whitby2018-09-091-1/+1
| * | | | | Show failed tx RPC error messages in tooltipsWhymarrh Whitby2018-09-092-2/+15
| * | | | | Don't render tooltips without titlesWhymarrh Whitby2018-09-091-0/+8
| * | | | | Rewrite Tooltip component as ES6Whymarrh Whitby2018-09-093-30/+55
| |/ / / /
* / / / / Clear old seed words when importing new seed wordsWhymarrh Whitby2018-09-111-2/+8
|/ / / /
* | | / Use correct loading message when connecting to Kovan (#5189)Eugene Marinelli2018-09-061-1/+1
| |_|/ |/| |
* | | Fix assertion of missing child componentWhymarrh Whitby2018-09-061-1/+1
* | | 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-0513-11/+51
|\ \ \ \
| * | | | balance components using selectorsEsteban MIno2018-08-312-5/+5
| * | | | fix integration test for asset images selectorsEsteban MIno2018-08-311-2/+2
| * | | | fix watched tokens images showing in tx listEsteban MIno2018-08-314-4/+16
| * | | | fix watched asset image rendering on confirm transaction headerEsteban MIno2018-08-302-1/+5
| * | | | fix images for watched tokensEsteban MIno2018-08-308-4/+28
| |/ / /
* | | | Merge pull request #5129 from MetaMask/add-sidebar-componentDan J Miller2018-09-0514-76/+258
|\ \ \ \
| * | | | Adds sidebar component and refactors slide in wallet view sidebar to use it.Dan Miller2018-08-2914-76/+258
* | | | | Merge pull request #5091 from MetaMask/i4945-feature-flag-hex-dataDan J Miller2018-09-0410-4/+71
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Adds feature flag toggle for the hex data row on the send screen.Dan Miller2018-08-2710-4/+71
* | | | | Merge pull request #5155 from MetaMask/i5154-confirm-spinnerAlexander Tseung2018-08-294-7/+20
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix infinite spinner on failed transactionsAlexander Tseung2018-08-294-7/+20
* | | | | fix conflictsEsteban MIno2018-08-2999-2166/+2404
|\| | | |
| * | | | Merge pull request #5121 from MetaMask/i5099-approveAlexander Tseung2018-08-281-29/+87
| |\ \ \ \
| | * | | | Use eth-contract-metadata data if the token symbol or decimals fail on retrievalAlexander Tseung2018-08-231-29/+87
| * | | | | Fix testsAlexander Tseung2018-08-241-2/+12
| * | | | | Fix naming, add eth.getCode check for actions, fix translations for statusesAlexander Tseung2018-08-2422-96/+81
| * | | | | Change "Outgoing" to "Sent Ether" or "Sent Token"Alexander Tseung2018-08-242-4/+4
| * | | | | Add CurrencyDisplay and TokenCurrencyDisplay componentsAlexander Tseung2018-08-2414-74/+425
| * | | | | Update retry transaction logic to use network nonceAlexander Tseung2018-08-243-12/+46
| * | | | | Fix e2e testsAlexander Tseung2018-08-246-33/+30
| * | | | | Fix integration testsAlexander Tseung2018-08-247-5/+24
| * | | | | Fix e2e testsAlexander Tseung2018-08-241-1/+1
| * | | | | Fix shapeshift transactions. Delete unused filesAlexander Tseung2018-08-249-689/+34
| * | | | | Show token amounts in TransactionListItem for token transfersAlexander Tseung2018-08-2410-79/+75
| * | | | | Add retry button to TransactionListItemAlexander Tseung2018-08-2411-50/+175
| * | | | | Code cleanupAlexander Tseung2018-08-242-30/+14
| * | | | | Use css grid for TransactionListItem for responsive layoutAlexander Tseung2018-08-248-66/+88