aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app
Commit message (Expand)AuthorAgeFilesLines
* merging upstream branchVimal2018-11-12155-1008/+3721
|\
| * 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
* | | | Adding CoinSwitch exchangeVimal2018-10-221-1/+22
|/ / /
* | | 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
| * | | Add tOrKey function to I18nProviderAlexander Tseung2018-08-241-2/+9
| * | | Refactor transactions list views. Add redesign componentsAlexander Tseung2018-08-2439-380/+926
| * | | Delete unused filesAlexander Tseung2018-08-243-189/+0
| * | | Add withMethodData HOC, add higher-order-component folderAlexander Tseung2018-08-2410-25/+75
| * | | Add TransactionStatus componentAlexander Tseung2018-08-243-0/+67
| * | | Add MenuBar componentAlexander Tseung2018-08-244-0/+97
| * | | 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-2410-620/+116
| | |/ | |/|
| * | updated docs, small improvement of recent RPC renderingEvgeniy Filatov2018-08-231-2/+3
| * | backported RPC improvements to olduiEvgeniy Filatov2018-08-231-2/+1
| * | implemented improvements to RPC historyEvgeniy Filatov2018-08-231-4/+6
| |/
| * Merge pull request #5089 from MetaMask/i5085-ethcodeAlexander Tseung2018-08-235-37/+99
| |\
| | * Use eth_getCode to sort transaction action typeAlexander Tseung2018-08-235-37/+99
| * | Fix code readability, use PureComponent over ComponentAlexander Tseung2018-08-233-33/+23
| * | Add tabs support for PageContainerAlexander Tseung2018-08-235-83/+132
| |/
| * Merge pull request #5102 from whymarrh/fix-account-export-pw-bugWhymarrh Whitby2018-08-232-5/+20
| |\
| | * Clear warnings when exportAccount succeedsWhymarrh Whitby2018-08-231-4/+19
| | * Handle case where keyring is missing in AccountDetailsModalWhymarrh Whitby2018-08-231-1/+1
| * | Merge pull request #5066 from whymarrh/fix-key-exportWhymarrh Whitby2018-08-232-10/+19
| |\ \
| | * | Don't re-render the export modal when the selected identity changesWhymarrh Whitby2018-08-231-8/+17
| | * | Update AccountModalContainer to accept a selectedIdentity propWhymarrh Whitby2018-08-231-2/+2
| | |/
| * / Add new variant for SenderToRecipient componentAlexander Tseung2018-08-235-96/+199
| |/
* | typo watchAsset imageUrl to imageEsteban MIno2018-08-248-15/+15
* | fix integration tests on balance component with new watchAssetEsteban MIno2018-08-221-3/+3
* | unit tests for watchAssetEsteban MIno2018-08-221-2/+0
* | refactor watchToken related functionsEsteban MIno2018-08-213-9/+9
* | Merge branch 'develop' into WatchTokenFeatureEsteban MIno2018-08-2140-155/+920
|\|
| * Update logo wordmarkAlexander Tseung2018-08-196-56/+28
| * fix ledger affiliate linkbrunobar792018-08-171-1/+1
| * ui readybrunobar792018-08-173-9/+37
| * connect screen readybrunobar792018-08-172-27/+124
| * Merge branch 'develop' into ledger-supportBruno Barbieri2018-08-154-6/+6
| |\
| | * Merge pull request #5060 from MetaMask/bignumber-stringDan Finlay2018-08-153-4/+4
| | |\
| | | * Cast arguments for new Bignumbers() to string.Dan Miller2018-08-153-4/+4
| | * | Add exportAsFile optional type argumentWhymarrh Whitby2018-08-141-2/+2
| | |/
| * | remove console logsbrunobar792018-08-151-1/+1
| * | more uibrunobar792018-08-151-1/+2
| * | fixbrunobar792018-08-151-1/+1
| * | ui fixesbrunobar792018-08-154-23/+38
| * | fix tx testsbrunobar792018-08-141-1/+2
| * | legacy and new hd path workingbrunobar792018-08-143-24/+45
| * | good progress adding pathsbrunobar792018-08-145-22/+121
| * | message signing worksbrunobar792018-08-121-0/+1
| * | 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-114-27/+43
| |/
| * Merge pull request #4897 from MetaMask/qr-code-scanBruno Barbieri2018-08-1117-6/+474
| |\
| | * add commentbrunobar792018-08-091-0/+5
| | * fix merge conflictsbrunobar792018-08-091-2/+8
| | |\
| | * | add submit button typebrunobar792018-08-091-0/+1
| | * | lintbrunobar792018-08-081-1/+1
| | * | code review changesbrunobar792018-08-081-8/+17
| | * | fix merge conflictsbrunobar792018-08-088-17/+28
| | |\ \
| | * | | restore qrbrunobar792018-08-041-0/+2
| | * | | 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-045-21/+117
| | * | | fixbrunobar792018-08-011-1/+6
| | * | | lintbrunobar792018-08-011-2/+0
| | * | | added crossbrowser support and error handlingbrunobar792018-08-016-49/+112
| | * | | 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
| | |\ \ \
| | * | | | 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
| | |\ \ \ \
| | * | | | | 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 #5000 from MetaMask/contract-method-conf-sim-failureDan J Miller2018-08-092-2/+2
| |\ \ \ \ \ \
| | * | | | | | Show error while allowing confirmation of transaction where simulation failsDan Miller2018-08-092-2/+2
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Fix lint error in tx-listWhymarrh Whitby2018-08-091-1/+1
| * | | | | | Get nonce for showing retry button using ethQuery transaction count.Dan Miller2018-08-094-6/+46
| |/ / / / /
| * | | | / Use token decimals when calculating confirm screen amount for token approvals.Dan Miller2018-08-081-2/+8
| | |_|_|/ | |/| | |
| * | | | Fixing translations in first-time init menu (#4969)Justin Kat2018-08-081-1/+1
* | | | | delete according image when token added with watchToken deletedEsteban MIno2018-08-173-9/+9
* | | | | correct behavior when notification is closed when popupEsteban MIno2018-08-174-16/+23
* | | | | WIPEsteban MIno2018-08-173-3/+10
* | | | | show watch asset image from hide token modalEsteban MIno2018-08-162-12/+14
* | | | | add suggested tokens objects in metamask stateEsteban MIno2018-08-162-5/+4
* | | | | add support for images base64 and urls on new uiEsteban MIno2018-08-157-42/+63
* | | | | refactor unused codeEsteban MIno2018-08-084-15/+8
* | | | | Merge branch 'develop' into WatchTokenFeatureEsteban Miño2018-08-087-16/+27
|\| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 20:44:02 +0800