Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Adds redesign for the customize gas advanced tab. | Dan Miller | 2018-12-04 | 18 | -152/+322 |
* | Test updates and additions for button integration with send screen. | Dan Miller | 2018-12-04 | 15 | -58/+326 |
* | Integrate gas buttons with the send screen. | Dan Miller | 2018-12-04 | 10 | -36/+188 |
* | Connects remained of the gas customization component to redux. | Dan Miller | 2018-12-04 | 16 | -140/+416 |
* | Styling fixes for gas customization advanced tab content. | Dan Miller | 2018-12-04 | 4 | -3/+2 |
* | Improvements to propdefaults in button-group.component and basic-tab-content.... | Dan Miller | 2018-12-04 | 2 | -2/+3 |
* | Connect the gas-button-group component to redux and a live api. | Dan Miller | 2018-12-04 | 9 | -34/+62 |
* | Adds basic tab content to gas customizer, with styled button group (static, f... | Dan Miller | 2018-12-04 | 15 | -15/+614 |
* | Improve styling of advanced-tab-content gasInput row | Dan Miller | 2018-12-04 | 3 | -5/+11 |
* | Add tests for advanced-tab-component.js and subcomponents. | Dan Miller | 2018-12-04 | 4 | -18/+275 |
* | Remove gas slider from advance-tab-content.component | Dan Miller | 2018-12-04 | 3 | -19/+2 |
* | Split advanced-tab-content.component.js render() method into smaller pieces;... | Dan Miller | 2018-12-04 | 2 | -31/+51 |
* | Adds the content of the advanced tab - w/o chart or dynamic content - to gas ... | Dan Miller | 2018-12-04 | 15 | -12/+442 |
* | Use BEM for css in gas-modal-page-container | Dan Miller | 2018-12-04 | 3 | -26/+28 |
* | Use correct message key in gas-modal-page-container.component.js | Dan Miller | 2018-12-04 | 1 | -1/+1 |
* | Adds new gas customization modal container (without content) | Dan Miller | 2018-12-04 | 9 | -29/+352 |
* | Save recent network balances in local storage (#5843) | Dan J Miller | 2018-12-01 | 9 | -17/+31 |
* | Hide app-header when provider request pending (#5831) | Whymarrh Whitby | 2018-11-27 | 2 | -5/+19 |
* | Increase Token Symbol length to twelve | Thomas Huang | 2018-11-23 | 1 | -2/+2 |
* | Merge pull request #5797 from MetaMask/trezor-v6 | Bruno Barbieri | 2018-11-22 | 1 | -4/+3 |
|\ | |||||
| * | fix merge conflicts | brunobar79 | 2018-11-21 | 33 | -102/+133 |
| |\ | |||||
| * | | clean up | brunobar79 | 2018-11-15 | 1 | -1/+0 |
| * | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 | brunobar79 | 2018-11-15 | 2 | -1/+35 |
| |\ \ | |||||
| * \ \ | Merge branch 'develop' into trezor-v5 | brunobar79 | 2018-11-14 | 12 | -17/+211 |
| |\ \ \ | |||||
| * \ \ \ | fix merge conflicts | brunobar79 | 2018-11-07 | 93 | -402/+1113 |
| |\ \ \ \ | |||||
| * \ \ \ \ | fix merge conflicts | brunobar79 | 2018-10-21 | 69 | -539/+2336 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | fix conflicts | brunobar79 | 2018-10-17 | 167 | -1450/+4483 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 | brunobar79 | 2018-09-06 | 102 | -1824/+2473 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | fix comment | brunobar79 | 2018-08-21 | 1 | -2/+0 |
| * | | | | | | | | fix merge conflicts | brunobar79 | 2018-08-21 | 24 | -77/+723 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | add error messages | brunobar79 | 2018-08-11 | 1 | -2/+4 |
| * | | | | | | | | | hide export private key for trezor accounts | brunobar79 | 2018-08-10 | 1 | -2/+16 |
* | | | | | | | | | | Fix usage of setState in ConfirmTransactionBase#handleSubmit (#5799) | Whymarrh Whitby | 2018-11-22 | 1 | -16/+29 |
* | | | | | | | | | | Show byte count for hex data on confirm screen (#5798) | Whymarrh Whitby | 2018-11-22 | 1 | -1/+2 |
* | | | | | | | | | | Remove "Beta" from header logo | Whymarrh Whitby | 2018-11-21 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
* | | | | | | | | | Fix button styling for Create Account Connect (#5787) | Alexander Tseung | 2018-11-20 | 2 | -9/+9 |
* | | | | | | | | | Fix rounding issue when sending max tokens (#5695) | Alexander Tseung | 2018-11-20 | 29 | -91/+122 |
* | | | | | | | | | ESLint fixes (#5775) | Whymarrh Whitby | 2018-11-17 | 2 | -2/+2 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | Show APPROVED status for transactions that have been approved but not submitted | Alexander Tseung | 2018-11-14 | 2 | -1/+35 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Fixes #3425: Better support for batch transactions (#5437) | PaddyMc | 2018-11-14 | 10 | -13/+207 |
* | | | | | | | Increase number of ETH decimals displayed in the balance view from 3 to 4 (#5... | Alexander Tseung | 2018-11-10 | 2 | -4/+4 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Update the colour of the default image used on Connect Request (#5678) | Whymarrh Whitby | 2018-11-06 | 1 | -1/+2 |
* | | | | | | Update "Learn more" link on 1102 connect screen (#5677) | Whymarrh Whitby | 2018-11-06 | 1 | -1/+7 |
* | | | | | | Update Connect Request screen design (#5644) | Whymarrh Whitby | 2018-11-06 | 13 | -26/+302 |
* | | | | | | EIP-1102: add user privacy option | bitpshr | 2018-11-06 | 6 | -106/+37 |
* | | | | | | EIP-1102: Add option to force-enable provider | bitpshr | 2018-11-06 | 6 | -0/+103 |
* | | | | | | EIP-1102: updated implementation | bitpshr | 2018-11-06 | 12 | -0/+162 |
* | | | | | | fixed currency-display (#5619) | HackyMiner | 2018-10-30 | 2 | -3/+22 |
* | | | | | | Merge pull request #5567 from MetaMask/HowardBraham-develop | kumavis | 2018-10-30 | 2 | -2/+4 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'develop' of github.com:MetaMask/metamask-extension into HowardB... | kumavis | 2018-10-26 | 39 | -271/+324 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | ui - use variable to clarify result of emptiness check | kumavis | 2018-10-21 | 1 | -1/+3 |
| * | | | | | | | Merge branch 'develop' into develop | kumavis | 2018-10-21 | 85 | -590/+2547 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | ganache-core merged my PR, so I changed some comments to clarify that ganache... | Howard Braham | 2018-10-10 | 1 | -1/+1 |
| * | | | | | | | Bug Fix: #1789 and #4525 eth.getCode() with no contract | Howard Braham | 2018-10-10 | 2 | -2/+2 |
* | | | | | | | | Add support for RPC endpoints with custom chain IDs (#5134) | HackyMiner | 2018-10-26 | 39 | -119/+277 |
| |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | Fix blockies icons overriding contract map icons. Refactor Identicon componen... | Alexander Tseung | 2018-10-25 | 21 | -138/+257 |
* | | | | | | | Add Activity Log entry for onchain failures for a transaction. Change scrolli... | Alexander Tseung | 2018-10-23 | 13 | -111/+20 |
* | | | | | | | Fix account display width for large currency values | Alexander Tseung | 2018-10-21 | 8 | -22/+47 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Update Shapeshift logo url and adjust list item contents | Thomas | 2018-10-18 | 1 | -3/+2 |
* | | | | | | Extract Add Token button into its own component | Whymarrh Whitby | 2018-10-18 | 5 | -11/+82 |
* | | | | | | Adds toggle for primary currency (#5421) | Alexander Tseung | 2018-10-17 | 64 | -525/+2252 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Decrease click area for AmountMaxButton on send screen | Whymarrh Whitby | 2018-10-16 | 2 | -19/+24 |
* | | | | | add tooltip for view etherscan tx (#5518) | Michael J. Cohen | 2018-10-16 | 1 | -7/+10 |
* | | | | | Add txReceipt data to transaction details (#5513) | Alexander Tseung | 2018-10-16 | 4 | -5/+31 |
* | | | | | Update Zendesk links for new subdomain | Whymarrh Whitby | 2018-10-12 | 4 | -4/+4 |
* | | | | | Make all addresses EIP-55 compliant (#5379) | bakaoh | 2018-10-10 | 3 | -8/+14 |
* | | | | | tests - integration - Add Drizzle tests (#5467) | Bruno Barbieri | 2018-10-10 | 1 | -1/+1 |
* | | | | | Fixed lint errors | Santiago Gonzalez Toral | 2018-10-10 | 1 | -11/+11 |
* | | | | | Added account options on home screen | Santiago Gonzalez Toral | 2018-10-10 | 2 | -4/+124 |
* | | | | | Fix token values being undefined | Alexander Tseung | 2018-10-09 | 1 | -3/+3 |
|/ / / / | |||||
* | | | | Merge pull request #5442 from whymarrh/fix-page-container-footer | Whymarrh Whitby | 2018-10-06 | 3 | -64/+64 |
|\ \ \ \ | |||||
| * | | | | Fix markup for inline instances of `PageContainer`s | Whymarrh Whitby | 2018-10-06 | 3 | -64/+64 |
* | | | | | Fix action translations edge cases | Alexander Tseung | 2018-10-06 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Translate method names in the transaction list only when applicable | Alexander Tseung | 2018-10-05 | 2 | -17/+74 |
* | | | | Remove "Copy Contract Address" from token options | Whymarrh Whitby | 2018-10-04 | 1 | -9/+0 |
* | | | | Merge pull request #5329 from whymarrh/confirm-features | Whymarrh Whitby | 2018-10-02 | 11 | -25/+203 |
|\ \ \ \ | |||||
| * | | | | Only use current network txs when calculating "Reject All" | Whymarrh Whitby | 2018-10-02 | 1 | -1/+6 |
| * | | | | Switch page-container__footer-* for header and footer tags | Whymarrh Whitby | 2018-10-02 | 3 | -27/+27 |
| * | | | | Reword batch reject confirm as "Reject All" | Whymarrh Whitby | 2018-10-02 | 1 | -1/+1 |
| * | | | | Confirm rejecting multiple transactions with modal | Whymarrh Whitby | 2018-10-02 | 7 | -4/+100 |
| * | | | | s/Cancel/Reject/ on confirm screen for clarity | Whymarrh Whitby | 2018-10-02 | 1 | -1/+2 |
| * | | | | Add "Cancel All" button to confirm footer | Whymarrh Whitby | 2018-10-02 | 3 | -4/+37 |
| * | | | | Have PageContainerFooter take children node | Whymarrh Whitby | 2018-10-02 | 3 | -21/+64 |
* | | | | | Recipient not required on send screen when hex data present | Whymarrh Whitby | 2018-10-01 | 5 | -4/+17 |
* | | | | | Rework estimateGas logic | Whymarrh Whitby | 2018-10-01 | 1 | -10/+10 |
* | | | | | Update gas when hex data changes on send screen | Whymarrh Whitby | 2018-10-01 | 8 | -14/+54 |
* | | | | | Update send.utils.test to with better mocks | Whymarrh Whitby | 2018-10-01 | 1 | -5/+8 |
* | | | | | Allow sending transactions with hex data and no recipient | Whymarrh Whitby | 2018-10-01 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | support editable customRPC (#5267) | HackyMiner | 2018-09-29 | 2 | -0/+11 |
* | | | | Close transaction details modal when clicking speed up | Alexander Tseung | 2018-09-27 | 2 | -4/+10 |
* | | | | Merge pull request #5332 from MetaMask/ui-unit-tests | Thomas Huang | 2018-09-26 | 7 | -0/+488 |
|\ \ \ \ | |||||
| * | | | | Some Ui tests | tmashuang | 2018-09-25 | 7 | -0/+488 |
* | | | | | Merge pull request #5282 from MetaMask/tx-cancel-ui | Alexander Tseung | 2018-09-25 | 59 | -367/+1111 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix multiplyCurrencies. Add onClose prop for Modal component. Remove hideModa... | Alexander Tseung | 2018-09-21 | 9 | -57/+40 |
| * | | | | Add unit tests | Alexander Tseung | 2018-09-20 | 8 | -15/+299 |
| * | | | | Fix unit tests | Alexander Tseung | 2018-09-20 | 1 | -5/+4 |
| * | | | | Add transition effect to TransactionListItemDetails expander | Alexander Tseung | 2018-09-20 | 2 | -13/+29 |
| * | | | | Add TransactionDetails modal | Alexander Tseung | 2018-09-20 | 9 | -9/+122 |
| * | | | | Switch existing modals from using Notification to Modal. Remove Notification ... | Alexander Tseung | 2018-09-20 | 32 | -319/+480 |
| * | | | | Fix Transaction view styles | Alexander Tseung | 2018-09-20 | 3 | -3/+9 |
| * | | | | Add Modal component | Alexander Tseung | 2018-09-20 | 7 | -0/+186 |
| * | | | | Refactor ConfirmPageContainerError to ErrorMessage | Alexander Tseung | 2018-09-20 | 8 | -18/+14 |
* | | | | | Merge pull request #5241 from MetaMask/refactor-settings | Alexander Tseung | 2018-09-21 | 13 | -592/+800 |
|\ \ \ \ \ | |||||
| * | | | | | Fix translation casing | Alexander Tseung | 2018-09-21 | 1 | -4/+0 |
| * | | | | | Add Current Conversion Updated string to translations | Alexander Tseung | 2018-09-20 | 1 | -1/+1 |
| * | | | | | Refactor settings page to use JSX and follow component file folder structure | Alexander Tseung | 2018-09-20 | 13 | -592/+804 |
| |/ / / / | |||||
* | | | | | Move main-container wrapper div into its own class | Whymarrh Whitby | 2018-09-20 | 1 | -0/+1 |
* | | | | | Prevent loading screen from overlaying the app bar | Whymarrh Whitby | 2018-09-20 | 1 | -0/+2 |
|/ / / / | |||||
* | | | | Merge branch 'develop' into eip-712 | Paul Bouchon | 2018-09-18 | 6 | -14/+41 |
|\ \ \ \ | |||||
| * | | | | compute and display checksummed hash in selected-account component (#5255) | Chad Grimaldi | 2018-09-16 | 2 | -3/+20 |
| * | | | | Improvement: Increase click area for arrows (#5264) | Sean | 2018-09-16 | 1 | -5/+8 |
| * | | | | Fix speed up functionality | Alexander Tseung | 2018-09-15 | 2 | -5/+12 |
| * | | | | Bug Fix: #5183 history not defined | Sean Rabaut | 2018-09-14 | 1 | -1/+1 |
* | | | | | Update new method namespace from v2 to v3 | bitpshr | 2018-09-14 | 1 | -3/+3 |
* | | | | | Implement latest EIP-712 protocol | bitpshr | 2018-09-14 | 1 | -7/+23 |
|/ / / / | |||||
* | | | | Fix identicon address. Fix styling of New Contract recipient. Fix Activity Lo... | Alexander Tseung | 2018-09-13 | 7 | -12/+38 |
* | | | | Fix tests. Add className to Identicon ethLogos. | Alexander Tseung | 2018-09-13 | 1 | -0/+1 |
* | | | | Add transaction details to TransactionListItem component | Alexander Tseung | 2018-09-13 | 3 | -37/+46 |
* | | | | Add TransactionListItemDetails component | Alexander Tseung | 2018-09-13 | 5 | -0/+200 |
* | | | | Add TransactionBreakdown component | Alexander Tseung | 2018-09-13 | 8 | -0/+228 |
* | | | | Add tests for TransactionActivityLog. Make changes to rendering events | Alexander Tseung | 2018-09-13 | 8 | -42/+322 |
* | | | | Edit styling of cards variant of SenderToRecipient component | Alexander Tseung | 2018-09-13 | 1 | -1/+1 |
* | | | | Add HexToDecimal component | Alexander Tseung | 2018-09-13 | 4 | -161/+48 |
* | | | | Add tests for Card component | Alexander Tseung | 2018-09-13 | 2 | -1/+26 |
* | | | | Allow denominations in CurrencyDisplay component | Alexander Tseung | 2018-09-13 | 3 | -4/+55 |
* | | | | Add raised type buttons to Button component. Refactor all buttons within app ... | Alexander Tseung | 2018-09-13 | 16 | -90/+165 |
* | | | | Add ActivityLog component | Alexander Tseung | 2018-09-13 | 9 | -1/+261 |
* | | | | Show failed tx txMeta.err in tooltips | Whymarrh Whitby | 2018-09-09 | 1 | -1/+1 |
* | | | | Show failed tx RPC error messages in tooltips | Whymarrh Whitby | 2018-09-09 | 2 | -2/+15 |
* | | | | Don't render tooltips without titles | Whymarrh Whitby | 2018-09-09 | 1 | -0/+8 |
* | | | | Rewrite Tooltip component as ES6 | Whymarrh Whitby | 2018-09-09 | 3 | -30/+55 |
| |_|/ |/| | | |||||
* | | | Fix assertion of missing child component | Whymarrh Whitby | 2018-09-06 | 1 | -1/+1 |
* | | | Merge pull request #5188 from taobun/develop | Dan J Miller | 2018-09-05 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | fix check valid decimals code in new ui | bunoi | 2018-09-05 | 1 | -1/+1 |
* | | | | Merge pull request #5167 from MetaMask/fix-watcAsset-images | Dan Finlay | 2018-09-05 | 12 | -11/+37 |
|\ \ \ \ | |||||
| * | | | | balance components using selectors | Esteban MIno | 2018-08-31 | 2 | -5/+5 |
| * | | | | fix watched tokens images showing in tx list | Esteban MIno | 2018-08-31 | 3 | -4/+10 |
| * | | | | fix watched asset image rendering on confirm transaction header | Esteban MIno | 2018-08-30 | 2 | -1/+5 |
| * | | | | fix images for watched tokens | Esteban MIno | 2018-08-30 | 7 | -4/+20 |
| |/ / / | |||||
* | | | | Merge pull request #5129 from MetaMask/add-sidebar-component | Dan J Miller | 2018-09-05 | 10 | -6/+228 |
|\ \ \ \ | |||||
| * | | | | Adds sidebar component and refactors slide in wallet view sidebar to use it. | Dan Miller | 2018-08-29 | 10 | -6/+228 |
* | | | | | Merge pull request #5091 from MetaMask/i4945-feature-flag-hex-data | Dan J Miller | 2018-09-04 | 10 | -4/+71 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Adds feature flag toggle for the hex data row on the send screen. | Dan Miller | 2018-08-27 | 10 | -4/+71 |
* | | | | | Merge pull request #5155 from MetaMask/i5154-confirm-spinner | Alexander Tseung | 2018-08-29 | 3 | -7/+16 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Fix infinite spinner on failed transactions | Alexander Tseung | 2018-08-29 | 3 | -7/+16 |
* | | | | | fix conflicts | Esteban MIno | 2018-08-29 | 73 | -1779/+1922 |
|\| | | | | |||||
| * | | | | Fix tests | Alexander Tseung | 2018-08-24 | 1 | -2/+12 |
| * | | | | Fix naming, add eth.getCode check for actions, fix translations for statuses | Alexander Tseung | 2018-08-24 | 19 | -87/+67 |
| * | | | | Change "Outgoing" to "Sent Ether" or "Sent Token" | Alexander Tseung | 2018-08-24 | 1 | -2/+2 |
| * | | | | Add CurrencyDisplay and TokenCurrencyDisplay components | Alexander Tseung | 2018-08-24 | 13 | -74/+424 |
| * | | | | Update retry transaction logic to use network nonce | Alexander Tseung | 2018-08-24 | 2 | -3/+39 |
| * | | | | Fix e2e tests | Alexander Tseung | 2018-08-24 | 3 | -23/+16 |
| * | | | | Fix integration tests | Alexander Tseung | 2018-08-24 | 4 | -4/+10 |
| * | | | | Fix shapeshift transactions. Delete unused files | Alexander Tseung | 2018-08-24 | 7 | -669/+32 |
| * | | | | Show token amounts in TransactionListItem for token transfers | Alexander Tseung | 2018-08-24 | 4 | -9/+39 |
| * | | | | Add retry button to TransactionListItem | Alexander Tseung | 2018-08-24 | 9 | -49/+153 |
| * | | | | Code cleanup | Alexander Tseung | 2018-08-24 | 2 | -30/+14 |
| * | | | | Use css grid for TransactionListItem for responsive layout | Alexander Tseung | 2018-08-24 | 6 | -63/+85 |
| * | | | | Refactor transactions list views. Add redesign components | Alexander Tseung | 2018-08-24 | 26 | -197/+689 |
| * | | | | Delete unused files | Alexander Tseung | 2018-08-24 | 3 | -189/+0 |
| * | | | | Add withMethodData HOC, add higher-order-component folder | Alexander Tseung | 2018-08-24 | 6 | -22/+28 |
| * | | | | Add TransactionStatus component | Alexander Tseung | 2018-08-24 | 3 | -0/+67 |
| * | | | | Add MenuBar component | Alexander Tseung | 2018-08-24 | 4 | -0/+97 |
| * | | | | Add react-media package to prevent rendering wallet-view twice in the popup view | Alexander Tseung | 2018-08-24 | 1 | -1/+5 |
| * | | | | Refactor home screen and remove unused files | Alexander Tseung | 2018-08-24 | 6 | -507/+114 |
| |/ / / | |||||
| * | | | updated docs, small improvement of recent RPC rendering | Evgeniy Filatov | 2018-08-23 | 1 | -2/+3 |
| * | | | backported RPC improvements to oldui | Evgeniy Filatov | 2018-08-23 | 1 | -2/+1 |
| * | | | implemented improvements to RPC history | Evgeniy Filatov | 2018-08-23 | 1 | -4/+6 |
| * | | | Merge pull request #5089 from MetaMask/i5085-ethcode | Alexander Tseung | 2018-08-23 | 2 | -5/+14 |
| |\ \ \ | |||||
| | * | | | Use eth_getCode to sort transaction action type | Alexander Tseung | 2018-08-23 | 2 | -5/+14 |
| * | | | | Fix code readability, use PureComponent over Component | Alexander Tseung | 2018-08-23 | 3 | -33/+23 |
| * | | | | Add tabs support for PageContainer | Alexander Tseung | 2018-08-23 | 5 | -83/+132 |
| |/ / / | |||||
| * | | | Merge pull request #5102 from whymarrh/fix-account-export-pw-bug | Whymarrh Whitby | 2018-08-23 | 2 | -5/+20 |
| |\ \ \ | |||||
| | * | | | Clear warnings when exportAccount succeeds | Whymarrh Whitby | 2018-08-23 | 1 | -4/+19 |
| | * | | | Handle case where keyring is missing in AccountDetailsModal | Whymarrh Whitby | 2018-08-23 | 1 | -1/+1 |
| | | |/ | | |/| | |||||
| * | | | Merge pull request #5066 from whymarrh/fix-key-export | Whymarrh Whitby | 2018-08-23 | 2 | -10/+19 |
| |\ \ \ | |||||
| | * | | | Don't re-render the export modal when the selected identity changes | Whymarrh Whitby | 2018-08-23 | 1 | -8/+17 |
| | * | | | Update AccountModalContainer to accept a selectedIdentity prop | Whymarrh Whitby | 2018-08-23 | 1 | -2/+2 |
| | |/ / | |||||
| * / / | Add new variant for SenderToRecipient component | Alexander Tseung | 2018-08-23 | 5 | -96/+199 |
| |/ / | |||||
* | | | typo watchAsset imageUrl to image | Esteban MIno | 2018-08-24 | 7 | -13/+13 |
* | | | fix integration tests on balance component with new watchAsset | Esteban MIno | 2018-08-22 | 1 | -3/+3 |
* | | | unit tests for watchAsset | Esteban MIno | 2018-08-22 | 1 | -2/+0 |
* | | | refactor watchToken related functions | Esteban MIno | 2018-08-21 | 3 | -9/+9 |
* | | | Merge branch 'develop' into WatchTokenFeature | Esteban MIno | 2018-08-21 | 27 | -85/+759 |
|\| | | |||||
| * | | Update logo wordmark | Alexander Tseung | 2018-08-19 | 4 | -15/+103 |
| * | | fix ledger affiliate link | brunobar79 | 2018-08-17 | 1 | -1/+1 |
| * | | ui ready | brunobar79 | 2018-08-17 | 2 | -6/+22 |
| * | | connect screen ready | brunobar79 | 2018-08-17 | 1 | -25/+63 |
| * | | more ui | brunobar79 | 2018-08-15 | 1 | -1/+2 |
| * | | fix | brunobar79 | 2018-08-15 | 1 | -1/+1 |
| * | | ui fixes | brunobar79 | 2018-08-15 | 3 | -20/+35 |
| * | | fix tx tests | brunobar79 | 2018-08-14 | 1 | -1/+2 |
| * | | legacy and new hd path working | brunobar79 | 2018-08-14 | 2 | -23/+44 |
| * | | good progress adding paths | brunobar79 | 2018-08-14 | 2 | -13/+71 |
| * | | rename keyring | brunobar79 | 2018-08-11 | 1 | -0/+1 |
| * | | able to add accounts | brunobar79 | 2018-08-11 | 2 | -3/+3 |
| * | | iframe communication working | brunobar79 | 2018-08-11 | 1 | -1/+0 |
| * | | refactor to support multiple hw wallets | brunobar79 | 2018-08-11 | 3 | -23/+39 |
| * | | Merge pull request #4897 from MetaMask/qr-code-scan | Bruno Barbieri | 2018-08-11 | 14 | -4/+410 |
| |\ \ | | |/ | |/| | |||||
| | * | add submit button type | brunobar79 | 2018-08-09 | 1 | -0/+1 |
| | * | lint | brunobar79 | 2018-08-08 | 1 | -1/+1 |
| | * | code review changes | brunobar79 | 2018-08-08 | 1 | -8/+17 |
| | * | fix merge conflicts | brunobar79 | 2018-08-08 | 5 | -14/+25 |
| | |\ | |||||
| | * | | lint | brunobar79 | 2018-08-04 | 1 | -1/+1 |
| | * | | fixed issue with input | brunobar79 | 2018-08-04 | 3 | -2/+6 |
| | * | | clear qr code data before scanning | brunobar79 | 2018-08-04 | 1 | -0/+3 |
| | * | | design complete | brunobar79 | 2018-08-04 | 4 | -18/+108 |
| | * | | fix | brunobar79 | 2018-08-01 | 1 | -1/+6 |
| | * | | lint | brunobar79 | 2018-08-01 | 1 | -2/+0 |
| | * | | added crossbrowser support and error handling | brunobar79 | 2018-08-01 | 5 | -48/+87 |
| | * | | send to fullscreen if no permission from popup | brunobar79 | 2018-07-31 | 2 | -11/+32 |
| | * | | kill camera stream when unmouting | brunobar79 | 2018-07-31 | 1 | -1/+4 |
| | * | | copy | brunobar79 | 2018-07-31 | 1 | -1/+1 |
| | * | | clean up css | brunobar79 | 2018-07-31 | 3 | -30/+58 |
| | * | | use existing modals | brunobar79 | 2018-07-31 | 7 | -190/+163 |
| | * | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into qr-code... | brunobar79 | 2018-07-31 | 2 | -2/+12 |
| | |\ \ | |||||
| | * | | | fix unit tests | brunobar79 | 2018-07-27 | 1 | -0/+2 |
| | * | | | fix dependencies | brunobar79 | 2018-07-27 | 1 | -1/+1 |
| | * | | | fix linting errors | brunobar79 | 2018-07-27 | 2 | -2/+2 |
| | * | | | fix merge conflicts | brunobar79 | 2018-07-27 | 9 | -7/+328 |
| | |\ \ \ | |||||
| | * | | | | added webrtc-adapter for browser compat | brunobar79 | 2018-07-27 | 1 | -0/+1 |
| | * | | | | fully working without tweaking ext. permission | brunobar79 | 2018-07-27 | 4 | -3/+4 |
| | * | | | | working without permission issues | brunobar79 | 2018-07-27 | 1 | -36/+44 |
| | * | | | | fix spinner and qr icon | brunobar79 | 2018-07-25 | 1 | -2/+5 |
| | * | | | | decent UI | brunobar79 | 2018-07-25 | 1 | -21/+43 |
| | * | | | | working without injection | brunobar79 | 2018-07-25 | 5 | -5/+176 |
| | * | | | | added qr code scanner icon in send transaction | brunobar79 | 2018-07-24 | 6 | -5/+15 |
| | * | | | | camera working back and forth | brunobar79 | 2018-07-24 | 3 | -1/+15 |
| * | | | | | Merge pull request #5000 from MetaMask/contract-method-conf-sim-failure | Dan J Miller | 2018-08-09 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Show error while allowing confirmation of transaction where simulation fails | Dan Miller | 2018-08-09 | 1 | -1/+1 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Fix lint error in tx-list | Whymarrh Whitby | 2018-08-09 | 1 | -1/+1 |
| * | | | | | Get nonce for showing retry button using ethQuery transaction count. | Dan Miller | 2018-08-09 | 2 | -6/+20 |
| |/ / / / | |||||
* | | | | | delete according image when token added with watchToken deleted | Esteban MIno | 2018-08-17 | 3 | -9/+9 |
* | | | | | correct behavior when notification is closed when popup | Esteban MIno | 2018-08-17 | 3 | -7/+9 |
* | | | | | WIP | Esteban MIno | 2018-08-17 | 3 | -3/+10 |
* | | | | | show watch asset image from hide token modal | Esteban MIno | 2018-08-16 | 2 | -12/+14 |
* | | | | | add suggested tokens objects in metamask state | Esteban MIno | 2018-08-16 | 2 | -5/+4 |
* | | | | | add support for images base64 and urls on new ui | Esteban MIno | 2018-08-15 | 6 | -40/+61 |
* | | | | | refactor unused code | Esteban MIno | 2018-08-08 | 2 | -9/+3 |
* | | | | | Merge branch 'develop' into WatchTokenFeature | Esteban MiƱo | 2018-08-08 | 5 | -14/+25 |
|\| | | | | |||||
| * | | | | Merge pull request #4948 from MetaMask/i4638-update-font | Alexander Tseung | 2018-08-04 | 2 | -4/+0 |
| |\ \ \ \ | |||||
| | * | | | | Update Font in Account Selector | Alexander Tseung | 2018-08-04 | 2 | -4/+0 |
| * | | | | | Disable Confirm button on subsequent clicks to prevent confirming multiple times | Alexander Tseung | 2018-08-04 | 2 | -6/+21 |
| |/ / / / | |||||
| * | | / | Show the retry button on latest tx of earliest nonce. | Dan Miller | 2018-08-01 | 1 | -4/+4 |
| | |_|/ | |/| | | |||||
* | | | | clean confirm add token component | Esteban MIno | 2018-08-07 | 2 | -6/+2 |
* | | | | new confirm add suggested token component | Esteban MIno | 2018-08-07 | 4 | -2/+147 |
* | | | | eth_watchToken working | Esteban MIno | 2018-08-04 | 2 | -3/+9 |
* | | | | popup initializing with suggested tokens | Esteban MIno | 2018-08-04 | 1 | -6/+2 |
* | | | | rpc-engine not crashing when eth_watchToken | Esteban MIno | 2018-08-04 | 1 | -4/+0 |
* | | | | merge develop | Esteban MIno | 2018-08-04 | 255 | -2742/+5451 |
|\| | | |