Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #5129 from MetaMask/add-sidebar-component | Dan J Miller | 2018-09-05 | 14 | -76/+258 | |
|\ \ \ \ | | | | | | | | | | | Add sidebar component | |||||
| * | | | | Adds sidebar component and refactors slide in wallet view sidebar to use it. | Dan Miller | 2018-08-29 | 14 | -76/+258 | |
| | | | | | ||||||
* | | | | | 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. | |||||
| * | | | | 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 | 4 | -7/+20 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | Fix infinite spinner on failed transactions | |||||
| * | | | | Fix infinite spinner on failed transactions | Alexander Tseung | 2018-08-29 | 4 | -7/+20 | |
| | | | | | ||||||
* | | | | | fix conflicts | Esteban MIno | 2018-08-29 | 99 | -2166/+2404 | |
|\| | | | | ||||||
| * | | | | Merge pull request #5121 from MetaMask/i5099-approve | Alexander Tseung | 2018-08-28 | 1 | -29/+87 | |
| |\ \ \ \ | | | | | | | | | | | | | Prevent token symbol from showing as null in the confirm screen | |||||
| | * | | | | Use eth-contract-metadata data if the token symbol or decimals fail on retrieval | Alexander Tseung | 2018-08-23 | 1 | -29/+87 | |
| | | | | | | ||||||
| * | | | | | 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 | 22 | -96/+81 | |
| | | | | | | ||||||
| * | | | | | Change "Outgoing" to "Sent Ether" or "Sent Token" | Alexander Tseung | 2018-08-24 | 2 | -4/+4 | |
| | | | | | | ||||||
| * | | | | | Add CurrencyDisplay and TokenCurrencyDisplay components | Alexander Tseung | 2018-08-24 | 14 | -74/+425 | |
| | | | | | | ||||||
| * | | | | | Update retry transaction logic to use network nonce | Alexander Tseung | 2018-08-24 | 3 | -12/+46 | |
| | | | | | | ||||||
| * | | | | | Fix e2e tests | Alexander Tseung | 2018-08-24 | 6 | -33/+30 | |
| | | | | | | ||||||
| * | | | | | Fix integration tests | Alexander Tseung | 2018-08-24 | 7 | -5/+24 | |
| | | | | | | ||||||
| * | | | | | Fix e2e tests | Alexander Tseung | 2018-08-24 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Fix shapeshift transactions. Delete unused files | Alexander Tseung | 2018-08-24 | 9 | -689/+34 | |
| | | | | | | ||||||
| * | | | | | Show token amounts in TransactionListItem for token transfers | Alexander Tseung | 2018-08-24 | 10 | -79/+75 | |
| | | | | | | ||||||
| * | | | | | Add retry button to TransactionListItem | Alexander Tseung | 2018-08-24 | 11 | -50/+175 | |
| | | | | | | ||||||
| * | | | | | Code cleanup | Alexander Tseung | 2018-08-24 | 2 | -30/+14 | |
| | | | | | | ||||||
| * | | | | | Use css grid for TransactionListItem for responsive layout | Alexander Tseung | 2018-08-24 | 8 | -66/+88 | |
| | | | | | | ||||||
| * | | | | | Add tOrKey function to I18nProvider | Alexander Tseung | 2018-08-24 | 1 | -2/+9 | |
| | | | | | | ||||||
| * | | | | | Refactor transactions list views. Add redesign components | Alexander Tseung | 2018-08-24 | 39 | -380/+926 | |
| | | | | | | ||||||
| * | | | | | Delete unused files | Alexander Tseung | 2018-08-24 | 3 | -189/+0 | |
| | | | | | | ||||||
| * | | | | | Add withMethodData HOC, add higher-order-component folder | Alexander Tseung | 2018-08-24 | 10 | -25/+75 | |
| | | | | | | ||||||
| * | | | | | 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 | 10 | -620/+116 | |
| | |/ / / | |/| | | | ||||||
| * | | | | 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 | 5 | -37/+99 | |
| |\ \ \ | | | | | | | | | | | Use eth_getCode to sort transaction action type | |||||
| | * | | | Use eth_getCode to sort transaction action type | Alexander Tseung | 2018-08-23 | 5 | -37/+99 | |
| | | | | | ||||||
| * | | | | 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 | |
| |\ \ \ | | | | | | | | | | | Fix export privkey modal password bugs | |||||
| | * | | | 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 | |||||
| | * | | | 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 | 8 | -15/+15 | |
| | | | ||||||
* | | | 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 | 41 | -155/+956 | |
|\| | | ||||||
| * | | Update logo wordmark | Alexander Tseung | 2018-08-19 | 6 | -56/+28 | |
| | | | ||||||
| * | | fix ledger affiliate link | brunobar79 | 2018-08-17 | 1 | -1/+1 | |
| | | | ||||||
| * | | ui ready | brunobar79 | 2018-08-17 | 3 | -9/+37 | |
| | | | ||||||
| * | | connect screen ready | brunobar79 | 2018-08-17 | 2 | -27/+124 | |
| | | | ||||||
| * | | Merge branch 'develop' into ledger-support | Bruno Barbieri | 2018-08-15 | 4 | -6/+6 | |
| |\ \ | ||||||
| | * \ | Merge pull request #5060 from MetaMask/bignumber-string | Dan Finlay | 2018-08-15 | 3 | -4/+4 | |
| | |\ \ | | | | | | | | | | | Cast arguments for new Bignumbers() to string. | |||||
| | | * | | Cast arguments for new Bignumbers() to string. | Dan Miller | 2018-08-15 | 3 | -4/+4 | |
| | | | | | ||||||
| | * | | | Add exportAsFile optional type argument | Whymarrh Whitby | 2018-08-14 | 1 | -2/+2 | |
| | |/ / | ||||||
| * | | | remove console logs | brunobar79 | 2018-08-15 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | more ui | brunobar79 | 2018-08-15 | 1 | -1/+2 | |
| | | | | ||||||
| * | | | fix | brunobar79 | 2018-08-15 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | ui fixes | brunobar79 | 2018-08-15 | 4 | -23/+38 | |
| | | | | ||||||
| * | | | fix tx tests | brunobar79 | 2018-08-14 | 1 | -1/+2 | |
| | | | | ||||||
| * | | | legacy and new hd path working | brunobar79 | 2018-08-14 | 3 | -24/+45 | |
| | | | | ||||||
| * | | | good progress adding paths | brunobar79 | 2018-08-14 | 5 | -22/+121 | |
| | | | | ||||||
| * | | | message signing works | brunobar79 | 2018-08-12 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | 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 | 4 | -27/+43 | |
| |/ / | ||||||
| * | | Merge pull request #4897 from MetaMask/qr-code-scan | Bruno Barbieri | 2018-08-11 | 18 | -6/+510 | |
| |\ \ | | |/ | |/| | QR Code Scanner | |||||
| | * | add comment | brunobar79 | 2018-08-09 | 1 | -0/+5 | |
| | | | ||||||
| | * | fix merge conflicts | brunobar79 | 2018-08-09 | 1 | -2/+8 | |
| | |\ | ||||||
| | * | | 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 | 2 | -12/+20 | |
| | | | | ||||||
| | * | | fix merge conflicts | brunobar79 | 2018-08-08 | 8 | -17/+28 | |
| | |\ \ | ||||||
| | * | | | restore qr | brunobar79 | 2018-08-04 | 1 | -0/+2 | |
| | | | | | ||||||
| | * | | | 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 | 2 | -23/+25 | |
| | | | | | ||||||
| | * | | | design complete | brunobar79 | 2018-08-04 | 6 | -43/+140 | |
| | | | | | ||||||
| | * | | | fix | brunobar79 | 2018-08-01 | 1 | -1/+6 | |
| | | | | | ||||||
| | * | | | lint | brunobar79 | 2018-08-01 | 1 | -15/+14 | |
| | | | | | ||||||
| | * | | | lint | brunobar79 | 2018-08-01 | 1 | -2/+0 | |
| | | | | | ||||||
| | * | | | added crossbrowser support and error handling | brunobar79 | 2018-08-01 | 7 | -49/+150 | |
| | | | | | ||||||
| | * | | | 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 | 10 | -234/+164 | |
| | | | | | ||||||
| | * | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-31 | 4 | -6/+30 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | qr-code-scan | |||||
| | * | | | | 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 | |
| | | | | | | ||||||
| | * | | | | clean up | brunobar79 | 2018-07-27 | 1 | -1/+0 | |
| | | | | | | ||||||
| | * | | | | fix merge conflicts | brunobar79 | 2018-07-27 | 12 | -17/+426 | |
| | |\ \ \ \ | ||||||
| | * | | | | | 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 | 2 | -2/+6 | |
| | | | | | | | ||||||
| | * | | | | | decent UI | brunobar79 | 2018-07-25 | 1 | -21/+43 | |
| | | | | | | | ||||||
| | * | | | | | working without injection | brunobar79 | 2018-07-25 | 9 | -21/+229 | |
| | | | | | | | ||||||
| | * | | | | | added qr code scanner icon in send transaction | brunobar79 | 2018-07-24 | 7 | -5/+25 | |
| | | | | | | | ||||||
| | * | | | | | camera working back and forth | brunobar79 | 2018-07-24 | 4 | -1/+36 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #5000 from MetaMask/contract-method-conf-sim-failure | Dan J Miller | 2018-08-09 | 2 | -2/+2 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Show error while allowing confirmation of tx where simulation fails | |||||
| | * | | | | | | Show error while allowing confirmation of transaction where simulation fails | Dan Miller | 2018-08-09 | 2 | -2/+2 | |
| | | |_|_|_|/ | | |/| | | | | ||||||
| * | | | | | | 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 | 4 | -6/+46 | |
| |/ / / / / | ||||||
| * | | | / | Use token decimals when calculating confirm screen amount for token approvals. | Dan Miller | 2018-08-08 | 1 | -2/+8 | |
| | |_|_|/ | |/| | | | ||||||
| * | | | | Fixing translations in first-time init menu (#4969) | Justin Kat | 2018-08-08 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | 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 | 4 | -16/+23 | |
| | | | | | ||||||
* | | | | | 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 | 7 | -42/+63 | |
| | | | | | ||||||
* | | | | | refactor unused code | Esteban MIno | 2018-08-08 | 4 | -15/+8 | |
| | | | | | ||||||
* | | | | | Merge branch 'develop' into WatchTokenFeature | Esteban Miño | 2018-08-08 | 7 | -16/+27 | |
|\| | | | | ||||||
| * | | | | Merge branch 'develop' into TokensPerAccountBasis | Esteban MIno | 2018-08-08 | 10 | -21/+55 | |
| |\ \ \ \ | ||||||
| | * \ \ \ | Merge pull request #4948 from MetaMask/i4638-update-font | Alexander Tseung | 2018-08-04 | 3 | -5/+0 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | Update Font in Account Selector | |||||
| | | * | | | | Update Font in Account Selector | Alexander Tseung | 2018-08-04 | 3 | -5/+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 | |
| | | |_|/ | | |/| | | ||||||
| * | | | | Merge branch 'develop' into TokensPerAccountBasis | Esteban Miño | 2018-07-28 | 8 | -1/+322 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| * | | | | add & delete tokens per network | Esteban MIno | 2018-07-27 | 1 | -1/+2 | |
| | | | | | ||||||
* | | | | | watch token on old ui | Esteban MIno | 2018-08-08 | 2 | -0/+18 | |
| | | | | | ||||||
* | | | | | clean confirm add token component | Esteban MIno | 2018-08-07 | 2 | -6/+2 | |
| | | | | | ||||||
* | | | | | new confirm add suggested token component | Esteban MIno | 2018-08-07 | 7 | -12/+161 | |
| | | | | | ||||||
* | | | | | fix duplicated action | Esteban MIno | 2018-08-07 | 1 | -6/+0 | |
| | | | | | ||||||
* | | | | | eth_watchToken working | Esteban MIno | 2018-08-04 | 4 | -3/+34 | |
| | | | | | ||||||
* | | | | | 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 | 297 | -3225/+7876 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | ||||||
| * | | | | Round large exponential numbers | Alexander Tseung | 2018-07-28 | 3 | -6/+23 | |
| | | | | | ||||||
| * | | | | Fix overflow for long total strings in confirm string | Alexander Tseung | 2018-07-26 | 1 | -0/+7 | |
| | |/ / | |/| | | ||||||
| * | | | Merge pull request #4885 from MetaMask/RetryOnEarliestPendingTx | Dan J Miller | 2018-07-26 | 1 | -1/+10 | |
| |\ \ \ | | | | | | | | | | | Only show retry button on the earliest pending tx | |||||
| | * | | | earliest tx by submittedTime | Esteban MIno | 2018-07-26 | 1 | -5/+8 | |
| | | | | | ||||||
| | * | | | only show retry button on earliest pending tx | Esteban MIno | 2018-07-26 | 1 | -1/+7 | |
| | |/ / | ||||||
| * | | | lint fix | Sara Reynolds | 2018-07-26 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Update prop names | Sara Reynolds | 2018-07-26 | 1 | -7/+7 | |
| | | | | ||||||
| * | | | Add tests for Confirm Detail Row | Sara Reynolds | 2018-07-26 | 1 | -0/+64 | |
| | | | | ||||||
| * | | | Merge pull request #4845 from MetaMask/button-group | Dan J Miller | 2018-07-25 | 6 | -0/+248 | |
| |\ \ \ | | |/ / | |/| | | Add ButtonGroup component | |||||
| | * | | Adds tests for button group component. | Dan Miller | 2018-07-24 | 1 | -0/+97 | |
| | | | | ||||||
| | * | | Add ButtonGroup component | Alexander Tseung | 2018-07-24 | 5 | -0/+151 | |
| | | | | ||||||
| * | | | Add close window support to signature requests. Move logic to actions | Alexander Tseung | 2018-07-24 | 5 | -31/+108 | |
| | | | | ||||||
| * | | | UI confirm screen closes confirmation window on submit or cancel of a tx | Dan Miller | 2018-07-24 | 1 | -4/+15 | |
| | |/ | |/| | ||||||
| * | | Merge pull request #4851 from MetaMask/fix-trezor-alert | Dan Finlay | 2018-07-24 | 1 | -4/+11 | |
| |\ \ | | | | | | | | | Fix trezor "Hardware wallet connected" alert | |||||
| | * | | show alert ONLY when device is connected | brunobar79 | 2018-07-23 | 1 | -4/+11 | |
| | | | | ||||||
| * | | | Merge pull request #4848 from MetaMask/fix-alert-flash | Dan Finlay | 2018-07-24 | 1 | -6/+46 | |
| |\ \ \ | | | | | | | | | | | Fix Banner flash on load | |||||
| | * | | | refactor Alert component to work properly | brunobar79 | 2018-07-22 | 1 | -6/+46 | |
| | |/ / | ||||||
| * | | | fix type | 板橋 清信 | 2018-07-23 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | fix token amount | 板橋 清信 | 2018-07-23 | 1 | -3/+2 | |
| |/ / | ||||||
| * | | Add fallback options for displaying recipient name in the Confirm screen | Alexander Tseung | 2018-07-21 | 3 | -10/+24 | |
| | | | ||||||
| * | | Merge pull request #4625 from MetaMask/initial-trezor-support | Bruno Barbieri | 2018-07-20 | 20 | -23/+1338 | |
| |\ \ | | |/ | |/| | Initial trezor support | |||||
| | * | last css fixes | brunobar79 | 2018-07-19 | 3 | -10/+42 | |
| | | | ||||||
| | * | added new global alert | brunobar79 | 2018-07-19 | 6 | -8/+126 | |
| | | | ||||||
| | * | fix support link | brunobar79 | 2018-07-19 | 1 | -1/+1 | |
| | | | ||||||
| | * | fix unsupported browser view | brunobar79 | 2018-07-19 | 2 | -2/+6 | |
| | | | ||||||
| | * | lint | brunobar79 | 2018-07-19 | 1 | -1/+1 | |
| | | | ||||||
| | * | scroll smooth | brunobar79 | 2018-07-19 | 2 | -3/+12 | |
| | | | ||||||
| | * | design done | brunobar79 | 2018-07-19 | 3 | -44/+178 | |
| | | | ||||||
| | * | fix browser not supported screen | brunobar79 | 2018-07-18 | 1 | -1/+1 | |
| | | | ||||||
| | * | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-18 | 3 | -31/+42 | |
| | |\ | | | | | | | | | | | | | initial-trezor-support | |||||
| | * | | updated account list based on new designs | brunobar79 | 2018-07-18 | 4 | -25/+85 | |
| | | | | ||||||
| | * | | Merge branch 'develop' into initial-trezor-support | brunobar79 | 2018-07-17 | 129 | -115/+251 | |
| | |\ \ | ||||||
| | * \ \ | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-14 | 5 | -54/+42 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | initial-trezor-support | |||||
| | * | | | | fix account selection | brunobar79 | 2018-07-14 | 2 | -3/+11 | |
| | | | | | | ||||||
| | * | | | | added affiliate link to trezor | brunobar79 | 2018-07-14 | 2 | -0/+22 | |
| | | | | | | ||||||
| | * | | | | detect ability to open popup instead of browser | brunobar79 | 2018-07-13 | 2 | -6/+13 | |
| | | | | | | ||||||
| | * | | | | fix account balance bug | brunobar79 | 2018-07-13 | 2 | -10/+16 | |
| | | | | | | ||||||
| | * | | | | remove account modal updated | brunobar79 | 2018-07-13 | 2 | -15/+55 | |
| | | | | | | ||||||
| | * | | | | catching up with develop | brunobar79 | 2018-07-13 | 3 | -13/+48 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-13 | 104 | -591/+4351 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | initial-trezor-support | |||||
| | * | | | | | added tooltip | brunobar79 | 2018-07-12 | 3 | -5/+16 | |
| | | | | | | | ||||||
| | * | | | | | forget device and autiload account features added | brunobar79 | 2018-07-12 | 4 | -1/+95 | |
| | | | | | | | ||||||
| | * | | | | | clean up | brunobar79 | 2018-07-11 | 3 | -6/+6 | |
| | | | | | | | ||||||
| | * | | | | | account removal is working | brunobar79 | 2018-07-11 | 4 | -14/+40 | |
| | | | | | | | ||||||
| | * | | | | | finish warning modal UI | brunobar79 | 2018-07-11 | 8 | -3/+111 | |
| | | | | | | | ||||||
| | * | | | | | added ui to remove accounts | brunobar79 | 2018-07-10 | 2 | -4/+47 | |
| | | | | | | | ||||||
| | * | | | | | fix account duplication | brunobar79 | 2018-07-10 | 1 | -6/+0 | |
| | | | | | | | ||||||
| | * | | | | | fix all the account related bugs | brunobar79 | 2018-07-10 | 2 | -13/+27 | |
| | | | | | | | ||||||
| | * | | | | | copy updated | brunobar79 | 2018-07-07 | 2 | -2/+5 | |
| | | | | | | | ||||||
| | * | | | | | update connect harwdware screen | brunobar79 | 2018-07-07 | 2 | -9/+25 | |
| | | | | | | | ||||||
| | * | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-07 | 30 | -195/+542 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | initial-trezor-support | |||||
| | * | | | | | | UI refactor | brunobar79 | 2018-07-06 | 3 | -97/+106 | |
| | | | | | | | | ||||||
| | * | | | | | | Refactor UI | brunobar79 | 2018-07-06 | 4 | -266/+328 | |
| | | | | | | | | ||||||
| | * | | | | | | move strings to localization file | brunobar79 | 2018-07-06 | 1 | -11/+12 | |
| | | | | | | | | ||||||
| | * | | | | | | added message for non-chrome browsers | brunobar79 | 2018-07-06 | 2 | -1/+39 | |
| | | | | | | | | ||||||
| | * | | | | | | lint fix | brunobar79 | 2018-07-04 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | fix merge conflicts | brunobar79 | 2018-07-04 | 7 | -7/+63 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | fix merge conflicts | brunobar79 | 2018-07-04 | 20 | -22/+22 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | move hardcoded strings to localization file | brunobar79 | 2018-07-03 | 1 | -17/+7 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | always open connect hardware in full screen mode | brunobar79 | 2018-07-03 | 1 | -1/+9 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | fix merge conflicts | brunobar79 | 2018-07-02 | 54 | -203/+569 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | fix merge conflicts | Bruno | 2018-06-13 | 2 | -2/+2 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | move TrezorKeyring to its own package | Bruno | 2018-06-13 | 1 | -3/+3 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | balances working | Bruno | 2018-06-11 | 1 | -2/+18 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | initial trezor support | Bruno | 2018-06-10 | 7 | -6/+413 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge pull request #4822 from whymarrh/show-more-address | Whymarrh Whitby | 2018-07-19 | 2 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Show first four characters of account after 0x | |||||
| | * | | | | | | | | | | | Show first four characters of account after 0x in wallet | Whymarrh Whitby | 2018-07-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Show first four characters of account after 0x in tx list | Whymarrh Whitby | 2018-07-18 | 1 | -2/+2 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Don't set txData to an empty string | Whymarrh Whitby | 2018-07-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Inline single-use vars in send-footer.utils | Whymarrh Whitby | 2018-07-18 | 1 | -3/+1 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Send data along with other tx params | Whymarrh Whitby | 2018-07-18 | 7 | -16/+66 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Hook up send component w/ UPDATE_SEND_HEX_DATA action | Whymarrh Whitby | 2018-07-18 | 3 | -5/+28 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Add updateSendHexData action | Whymarrh Whitby | 2018-07-18 | 2 | -0/+17 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Add hex data row to send screen | Whymarrh Whitby | 2018-07-18 | 5 | -2/+43 | |
| |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Use Number constructor for number conversion. Use existing ↵ | Alexander Tseung | 2018-07-18 | 2 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | noConversionRateAvailable message | |||||
| * | | | | | | | | | | | Merge develop | Alexander Tseung | 2018-07-18 | 3 | -1746/+0 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fix tests | Alexander Tseung | 2018-07-18 | 2 | -1/+5 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Add fallback when no function found, fix network colors, add fiat values for ↵ | Alexander Tseung | 2018-07-18 | 16 | -104/+313 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tokens with contract exchange rates | |||||
| * | | | | | | | | | | | Remove unused confirm transaction files | Alexander Tseung | 2018-07-18 | 4 | -299/+23 | |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #4815 from MetaMask/i4783-retry | Alexander Tseung | 2018-07-18 | 2 | -20/+14 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Increase clickable area and padding of Retry Transaction bar | |||||
| | * | | | | | | | | | | Increase clickable area and padding of Retry Transaction bar | Alexander Tseung | 2018-07-17 | 2 | -20/+14 | |
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | ||||||
| * | | | | | | | | | | lint fix | Sara Reynolds | 2018-07-17 | 1 | -6/+4 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Fix edge cases and add translation compatibility | Sara Reynolds | 2018-07-17 | 1 | -6/+12 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Update onlyRenderConversions function to method and account for edge cases | Sara Reynolds | 2018-07-17 | 1 | -26/+24 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Fixes conversion status for tokens without conversion rates | Sara Reynolds | 2018-07-17 | 1 | -14/+29 | |
| |/ / / / / / / / / | ||||||
| * | | | | | | | | | Fix send import paths in confirm tx components | Whymarrh Whitby | 2018-07-16 | 2 | -3/+3 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Fix send import path in customize gas modal | Whymarrh Whitby | 2018-07-16 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Fix send import path in ToAutoComplete | Whymarrh Whitby | 2018-07-16 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Fix lint warnings in the send/ directory. | Dan | 2018-07-16 | 4 | -32/+28 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Remove send_ directory, revert to just having send | Dan | 2018-07-16 | 124 | -20/+142 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert accidentally changed constants. Require defaults in ens-input, gas-fee-display and confirm screens. | |||||
| * | | | | | | | | | Merge pull request #4715 from BitGuildPlatform/to-autocomplete | Dan J Miller | 2018-07-14 | 3 | -121/+142 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | fixes #4664 | |||||
| | * | | | | | | | | | fix classname | TrejGun | 2018-07-05 | 1 | -1/+4 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Merge branch 'develop' into to-autocomplete | Анна | 2018-07-05 | 29 | -41/+90 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | fixes #4664 | trejgun | 2018-07-03 | 3 | -121/+139 | |
| | | |_|_|/ / / / / / | | |/| | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #4702 from BitGuildPlatform/contextTypes | Dan J Miller | 2018-07-14 | 14 | -60/+57 | |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | convert contextType to static prop for refactored components | |||||
| | * | | | | | | | | | Merge branch 'develop' into contextTypes | TrejGun | 2018-07-05 | 29 | -41/+90 | |
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js | |||||
| | * | | | | | | | | | convert contextType to static prop for refactored components | trejgun | 2018-07-05 | 14 | -60/+57 | |
| | | |/ / / / / / / | | |/| | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #4766 from whymarrh/null-translations | Whymarrh Whitby | 2018-07-13 | 4 | -41/+18 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Rework i18n-helper getMessage function | |||||
| | * | | | | | | | | | Remove unneeded MetaMaskConnect connect wrapper | Whymarrh Whitby | 2018-07-12 | 2 | -28/+1 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Fallback to English and then the key for I18nProvider#t | Whymarrh Whitby | 2018-07-12 | 2 | -11/+16 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Inline locale variable in fetchLocale fn | Whymarrh Whitby | 2018-07-12 | 1 | -2/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Add tooltip to new tab icon in tx-view | Whymarrh Whitby | 2018-07-12 | 1 | -4/+8 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Add tooltip to menu icon in tx-view | Whymarrh Whitby | 2018-07-12 | 1 | -9/+16 | |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #4691 from MetaMask/i4404-confirm-refactor | Alexander Tseung | 2018-07-12 | 102 | -553/+4311 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | Refactor and redesign confirm transaction views | |||||
| | * | | | | | | | | Fix font sizes, colors. Include data tab for send-eth transaction ↵ | Alexander Tseung | 2018-07-12 | 4 | -4/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | confirmations that have data | |||||
| | * | | | | | | | | Fix multiple signature requests showing an infinite spinner | Alexander Tseung | 2018-07-11 | 1 | -2/+11 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Add unit tests for confirmTransaction duck and util | Alexander Tseung | 2018-07-10 | 2 | -0/+812 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Fix existing unit tests | Alexander Tseung | 2018-07-08 | 1 | -4/+7 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Various fixes from PR comments | Alexander Tseung | 2018-07-07 | 14 | -154/+216 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Use eth-method-registry to get method data | Alexander Tseung | 2018-07-07 | 8 | -34/+112 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Display newest transaction | Alexander Tseung | 2018-07-07 | 3 | -5/+5 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Refactor data flow, signature request routing | Alexander Tseung | 2018-07-07 | 9 | -117/+185 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Refactor and redesign confirm transaction views | Alexander Tseung | 2018-07-07 | 97 | -545/+3255 | |
| | | |_|_|_|_|_|/ | | |/| | | | | | | ||||||
| * / | | | | | | | Prevent users from submitting password multiple times on the unlock screen | Alexander Tseung | 2018-07-11 | 3 | -38/+40 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Merge pull request #4648 from MetaMask/update-import-from-seed-screen | Dan J Miller | 2018-07-06 | 3 | -152/+172 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Update import from seed screen on new ui. | |||||
| | * | | | | | | | Delete old restore vault file. | Dan | 2018-07-06 | 3 | -341/+163 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Update import from seed screen on new ui. | Dan | 2018-07-05 | 3 | -1/+199 | |
| | | | | | | | | |