aboutsummaryrefslogtreecommitdiffstats
path: root/ui
Commit message (Expand)AuthorAgeFilesLines
* add mainnetChen Wei2019-09-223-1/+45
* update privacy & terms linkChen Wei2019-09-165-6/+7
* use rpcUrl from network config when estimating gasChen Wei2019-09-092-3/+13
* force update gasChen Wei2019-07-082-6/+20
* replace some wordingsChen Wei2019-07-043-18/+17
* it seems safer to have workaround in UI layer instead of changing the constan...Chen Wei2019-07-036-24/+10
* Revert "part of replacing 'ETH'"Chen Wei2019-07-0313-18/+38
* part of replacing 'ETH'Chen Wei2019-07-0213-38/+18
* revert replacing "ETH" with "TAN"Chen Wei2019-07-0212-74/+60
* configuration, translation updatingChen Wei2019-07-0215-78/+96
* part of the style refinementChen Wei2019-07-022-18/+34
* dapp handler injected as "tangerine"Chen Wei2019-07-021-1/+1
* estimated gas should come from RPCChen Wei2019-07-014-122/+100
* 1. correct name display in network dropdown 2. enable 373 derived pathChen Wei2019-07-015-26/+68
* be able to switch between eth and tanChen Wei2019-06-281-73/+79
* Fixes display of confirm screen token decimals by not relying on confirmTrans...Dan Miller2019-06-286-14/+117
* Add simulation failure to tx confirmation when transaction simulationFailsThomas2019-06-261-0/+4
* 4byte fallback (#6551)Whymarrh Whitby2019-06-1820-262/+368
* Add delete to custom RPC form (#6718, #6650)Dan J Miller2019-06-178-59/+208
* Fix styles on 'import account' page, update help link (#6700)Kirill Goncharov2019-06-172-2/+5
* Wrap smaller custom block explorer url text (#6714)Thomas Huang2019-06-173-3/+13
* MetaMorph - Spacing and Typeface on Extension Main view (#6584)Chi Kei Chan2019-06-1315-44/+97
* Feature: sync with mobile v2 (#6673)Esteban Miño2019-06-121-3/+26
* Revert "fixed #5524"Jenny Pollack2019-06-073-63/+10
* lint cleanupMathew Kamkar2019-05-251-2/+0
* Enable Ledger hardware wallet support on FirefoxMathew Kamkar2019-05-251-6/+0
* Ensures that transactions cannot be confirmed if gas limit is below 21000. (#...Dan J Miller2019-05-232-2/+24
* Remove unused fn arguments in AmountMaxButtonWhymarrh Whitby2019-05-211-1/+1
* MetaMetrics documentation (#6624)Dan J Miller2019-05-211-9/+44
* Improved UX for sweeping accounts (#6488)Etienne Dusseault2019-05-2119-52/+293
* Merge pull request #6606 from industral/issue-5524Thomas Huang2019-05-163-10/+63
|\
| * fixed #5524Alex Ivasyuv2019-05-153-10/+63
* | Fixes bugs in 6.5.1 (#6613)Bruno Barbieri2019-05-151-1/+1
|/
* Update auto-logout to recognize idle time in background (#6593)Whymarrh Whitby2019-05-142-12/+19
* Fix RPC URL message key casing (#6595)Whymarrh Whitby2019-05-101-1/+1
* New settings custom rpc form (#6490)Dan J Miller2019-05-1022-30/+944
* Check for unused function arguments (#6583)Whymarrh Whitby2019-05-0948-102/+84
* Auto logout after specific time (#6558)Chi Kei Chan2019-05-096-6/+176
* Remove KNOWN_ADDRESS_ERROR from error objects (#6578)Chi Kei Chan2019-05-092-7/+6
* Use metricsEvent in AmountMaxButton componentWhymarrh Whitby2019-05-082-5/+15
* Allow dragging seed phrase during Confirm Seed Phrase (#6557)Chi Kei Chan2019-05-076-127/+565
* Skip null and undefined keys when translating via context (#6543)Whymarrh Whitby2019-05-071-0/+10
* Add suffix to title text only when it exists (#6546)Whymarrh Whitby2019-05-061-1/+1
* Refactor ProviderApprovalController to use rpc and publicConfigStore (#6410)kumavis2019-05-044-21/+20
* Use tOrKey for actionKey in ConfirmTransactionBaseWhymarrh Whitby2019-05-011-1/+3
* Fix binding of this for I18nProvider#tOrKeyWhymarrh Whitby2019-05-011-1/+1
* Send metrics event from backend for on chain transaction failures (#6500)Dan J Miller2019-04-293-4/+17
* Add subheader to all settings subviews (#6502)Chi Kei Chan2019-04-292-5/+39
* Ensure home screen does not render if there are unapproved txs (#6501)Dan J Miller2019-04-272-8/+18
* Revert "Adds 4byte registry fallback to getMethodData() (#6435)"Thomas Huang2019-04-272-28/+4
* Always show private network when RPC is not whitelisted (#6495)Chi Kei Chan2019-04-261-4/+1
* Fix button colors on mobile (#6493)Chi Kei Chan2019-04-251-0/+3
* Set max-width on network dropdown and ellipsis long network name (#6494)Chi Kei Chan2019-04-252-2/+22
* Merge pull request #6481 from MetaMask/address-prop-types-errorsThomas Huang2019-04-183-3/+4
|\
| * Ensure future tokens add decimals as numbers while supporting numbers and str...Dan Miller2019-04-182-2/+2
| * getSeletedAsset to only return symbol strings, not token objectsDan Miller2019-04-181-1/+2
* | Make height consistent on all row in send-content (#6480)Chi Kei Chan2019-04-185-13/+28
* | Merge pull request #6477 from MetaMask/metrics-screen-button-typeThomas Huang2019-04-181-1/+1
|\ \ | |/ |/|
| * Update button type on metrics opt-in screen.Dan Miller2019-04-181-1/+1
* | Merge pull request #6475 from chikeichan/send-assetThomas Huang2019-04-181-1/+1
|\ \
| * | Fix PropTypes validation in send-asset-rowChi Kei Chan2019-04-181-1/+1
* | | Update confirm to use btn-primary (#6473)Chi Kei Chan2019-04-181-5/+6
|/ /
* / Add token selection to the send screen (#6445)Chi Kei Chan2019-04-18135-132/+436
|/
* Merge pull request #6468 from chikeichan/network-indicator-style-fixThomas Huang2019-04-182-11/+24
|\
| * Fix switcher height when Custom RPC is selected or when network is loadingChi Kei Chan2019-04-172-11/+24
* | feature: add Goerli support (#6459)Paul Bouchon2019-04-1813-7/+77
|/
* Merge pull request #6444 from MetaMask/localhost-network-dropdownThomas Huang2019-04-174-1/+9
|\
| * Add Localhost 8545 for network dropdown namesThomas Huang2019-04-114-1/+9
* | Adds 4byte registry fallback to getMethodData() (#6435)Dan J Miller2019-04-172-4/+28
* | Update buttons & colors to match design system (#6446)Chi Kei Chan2019-04-1749-395/+385
* | Remove unneeded array cloning in getSendToAccounts selectorWhymarrh Whitby2019-04-121-3/+1
* | repeated getSelectedAddress() func send.selectors.js removed (#6056)Sneh Koul2019-04-124-18/+9
|/
* Only pass english function names to functionType metricDan Miller2019-04-093-13/+13
* Distinguish between token and eth selected in home screen send button metrics...Dan Miller2019-04-081-1/+1
* Metrics tracking gas changed - slow, average, fast, custom - on edit screen.-Dan Miller2019-04-084-0/+24
* Track seed phrase validation errors with MetaMetricsDan Miller2019-04-051-0/+18
* Merge pull request #6397 from MetaMask/wyre-deposit-modalkumavis2019-04-041-4/+4
|\
| * Change coinbase to wyreThomas Huang2019-04-041-4/+4
* | Fix display of gas chart on Ethereum networks (#6389)Dan J Miller2019-04-044-3/+7
|/
* Remove NoticeController (#6382)Thomas Huang2019-04-029-434/+1
* Remove unused account-dropdowns components (#6363)v6.3.2Whymarrh Whitby2019-04-022-811/+0
* Merge pull request #6375 from MetaMask/Version-6.3.1v6.3.1Thomas Huang2019-03-302-1/+9
|\
| * Check token name constants against the lower case methodData name in conf tx ...Dan Miller2019-03-301-1/+1
| * Ensure correct confirm screen in case of smartcontract check failDan Miller2019-03-302-1/+9
* | About tab copy changes; Update route for Info & Help in account menu (#6356)Chi Kei Chan2019-03-302-4/+4
|/
* Revert to providing inline defaults in getHexGasTotal and increaseLastGasPric...Dan J Miller2019-03-291-4/+4
* Further e2e fixes in wake of #6364 and #6367 (#6374)Dan J Miller2019-03-292-24/+30
* Merge pull request #6328 from MetaMask/clearNoticeskumavis2019-03-291-12/+18
|\
| * lint fixkumavis2019-03-291-1/+1
| * actions - setCompletedOnboarding - make async with pifykumavis2019-03-291-24/+17
| * Merge branch 'develop' into clearNoticeskumavis2019-03-29974-38105/+38215
| |\
| * | Clear notices when setCompletedOnboarding is calledThomas Huang2019-03-211-4/+17
* | | Merge pull request #6372 from MetaMask/addAddressIfNewkumavis2019-03-292-2/+5
|\ \ \
| * | | send-footer.utils.js - addressIsNew - improve readabilitykumavis2019-03-291-1/+3
| * | | prevent add duplicates when address is not newJenny Pollack2019-03-292-2/+3
| | |/ | |/|
* | | Merge branch 'develop' of https://github.com/vimalsagar/metamask-extension in...kumavis2019-03-291-2/+23
|\ \ \ | |/ / |/| |
| * | depoit-ether-modal - make buyEth args more explicitkumavis2019-03-291-2/+2
| * | PR 5575 review comment fixesVimal2019-02-281-1/+1
| * | merging upstream branchVimal2018-11-12156-1009/+3722
| |\ \
| * | | Adding CoinSwitch exchangeVimal2018-10-221-1/+22
* | | | Defaults to the args list in increaseLastGasPrice and getHexGasTotalDan Miller2019-03-281-4/+4
* | | | getHexGasTotal and increaseLastGasPrice now gracefully handle null and undefi...Dan Miller2019-03-281-2/+2
* | | | Open retore-vault route from popup (#6353)Chi Kei Chan2019-03-271-1/+1
* | | | Don't include tx value in calculation of balance sufficiency for cancel butto...Dan J Miller2019-03-261-2/+2
* | | | Cancel error rebased (#6341)Dan J Miller2019-03-263-16/+69
* | | | Close transaction on close of notification window (#6340)Dan J Miller2019-03-263-33/+88
* | | | New settings page rebased (#6333)Dan J Miller2019-03-2615-567/+946
* | | | Replaces the coinbase link in the deposit modal with one for wyre (#6302)Dan J Miller2019-03-221-8/+8
* | | | Fix oversized loading overlay on gas customization modal. (#6326)Dan J Miller2019-03-221-0/+4
* | | | Fix gas fee in the submitted step of the transaction details activity log. (#...Dan J Miller2019-03-221-2/+11
* | | | Hide gas price chart and prevent api call when not on ethereum networks. (#6300)Dan J Miller2019-03-229-25/+73
* | | | Folder restructure (#6304)Chi Kei Chan2019-03-22962-37612/+37181
* | | | Enable mobile sync (#6332)Bruno Barbieri2019-03-222-8/+1
* | | | Fixing spelling of Ethereum in MetaMetrics copy (#6329)fixanoid2019-03-212-2/+2
| |_|/ |/| |
* | | Allow seed phrases with a trailing newlineWhymarrh Whitby2019-03-131-1/+1
* | | Merge pull request #6281 from MetaMask/fix-browser-back-on-reveal-seedThomas Huang2019-03-131-2/+2
|\ \ \
| * | | Fixes the use of the browser back button on the reveal seed screenDan Miller2019-03-121-2/+2
* | | | ui - add missing PropTypes (#6287)kumavis2019-03-122-0/+3
* | | | mascara - remove from project (#6283)kumavis2019-03-124-31/+23
* | | | Remove line rather than comment outThomas Huang2019-03-121-4/+0
* | | | No longer check network when validating checksum addressesThomas Huang2019-03-121-2/+5
|/ / /
* | | Handle undefined gas limits and prices in transaction-breakdown.component (#6...Dan J Miller2019-03-072-21/+38
* | | Add privacy policy link to modal metrics opt-in (#6250)Dan J Miller2019-03-071-1/+7
* | | Prevent advanced gas input arrows from setting value to < 0 (#6248)Dan J Miller2019-03-072-4/+24
* | | Only call onRecipient and onSender methods if defined in sender-to-recipient ...Dan J Miller2019-03-071-2/+6
* | | Fix missing this reference in addtoken button onclick method (#6245)Dan J Miller2019-03-061-1/+2
* | | Fixes the 'Percentages row tracks and gutters' decpracation warning. (#6244)Dan J Miller2019-03-061-1/+1
* | | Metametrics fixes (#6238)Dan J Miller2019-03-066-38/+43
* | | Wrap in spanThomas Huang2019-03-061-1/+1
* | | Fix MetaMetrics Environment Check (#6235)Dan J Miller2019-03-061-1/+1
* | | Metametrics (#6171)Dan J Miller2019-03-0581-134/+2014
* | | First time flow updates (#6192)Dan J Miller2019-02-2734-339/+554
* | | Show/Hide Fiat on Testnets based on User Preference (#6153)Chi Kei Chan2019-02-2733-99/+1127
* | | Feature Flag + Mobile Sync (#5955)Dan Finlay2019-02-268-3/+449
* | | Fix gas estimation when sending to contracts (#6195)Dan J Miller2019-02-266-8/+16
* | | Merge pull request #6184 from chikeichan/6132Dan J Miller2019-02-202-1/+26
|\ \ \
| * | | turn camcelCase method name to space separatedChi Kei Chan2019-02-192-1/+26
* | | | Merge pull request #6185 from chikeichan/5681Dan J Miller2019-02-201-5/+0
|\ \ \ \
| * | | | Remove password check when importing Account JSONChi Kei Chan2019-02-191-5/+0
| |/ / /
* / / / Change "Token Address" to "Token Contract Address" (#6182)Chi Kei Chan2019-02-201-1/+1
|/ / /
* | | Add Copy Tx ID button to transaction-list-item-details (#6146)Chi Kei Chan2019-02-173-2/+36
* | | Checksum address before slicing it for the confirm screen (#6133)Whymarrh Whitby2019-02-141-2/+6
* | | Fixed issue #5838 (#6001)Jonathan Smirnoff2019-02-1410-17/+37
* | | Add button to force edit token symbol when adding custom token (#6147)Chi Kei Chan2019-02-132-2/+38
* | | Merge pull request #6139 from whymarrh/fix-confirm-advanced-gasWhymarrh Whitby2019-02-121-1/+1
|\ \ \
| * | | Fix advanced gas controls on the confirm screenWhymarrh Whitby2019-02-121-1/+1
* | | | Trim whitespace from seed phrase during importWhymarrh Whitby2019-02-121-2/+4
|/ / /
* | | Add e2e tests adjusting gas before sendingWhymarrh Whitby2019-02-091-2/+6
* | | Fix inline advanced gas editingWhymarrh Whitby2019-02-096-64/+51
* | | implement class for sign footer button (#6120)Brandon Wissmann2019-02-081-0/+1
* | | Set custom gas data in state from inline advance gas controls on send screen ...Dan J Miller2019-02-072-2/+11
* | | Add Swap feature to CurrencyInput (#6091)Chi Kei Chan2019-02-067-45/+151
* | | Change gas labels to Slow/Average/Fast (#6090)Chi Kei Chan2019-02-062-60/+60
* | | Add togglable advanced gas controls on send and confirm screens (#6112)Dan J Miller2019-02-0619-36/+597
* | | Add announcement for users migrated to the new UIWhymarrh Whitby2019-02-0512-49/+117
* | | Default to the new UI for all usersWhymarrh Whitby2019-02-055-96/+11
* | | Remove commented references to Beta UIWhymarrh Whitby2019-02-051-18/+0
* | | Remove "Use old UI" settingWhymarrh Whitby2019-02-052-37/+1
* | | EIP-1102 updates (#6006)Paul Bouchon2019-01-314-10/+12
* | | Remove unused InitializeMenuScreen component (#6075)Whymarrh Whitby2019-01-311-224/+0
* | | Add visual indicator when displaying a cached balance (#5854)Dan J Miller2019-01-3014-31/+151
* | | I#5956 fix2 dont overwrite existing rpc settings (#6044)Frankie2019-01-304-7/+22
* | | Order shapeshift transactions by time within the transactions listAlexander Tseung2019-01-251-12/+32
* | | Prevent send to token warning (#6058)Esteban Miño2019-01-2420-11/+242
* | | Refactor first time flow, remove seed phrase from state (#5994)Alexander Tseung2019-01-2381-448/+2485
* | | Prevent send to token (#6051)Esteban Miño2019-01-238-3/+63
* | | 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-1035-337/+1133
* | | 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-0419-139/+305
* | | 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-043-41/+204
* | | 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-045-18/+282
* | | 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-2178-612/+2455
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ fix conflictsbrunobar792018-10-17195-1725/+4933
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 14:23:13 +0800