1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-10-22 19:26:13 +02:00
Commit Graph

3107 Commits

Author SHA1 Message Date
Bruno Barbieri
7287133e15 Enable mobile sync (#6332)
* enable mobile sync

* remove mobile sync as a preference

* Fix typo
2019-03-21 12:43:10 -07:00
fixanoid
e1af6312ce Fixing spelling of Ethereum in MetaMetrics copy (#6329) 2019-03-21 12:27:26 -02:30
Thomas Huang
c43374a553 Clear notices when setCompletedOnboarding is called 2019-03-20 20:26:48 -05:00
Whymarrh Whitby
29a0b34786 Allow seed phrases with a trailing newline 2019-03-13 10:00:42 -02:30
Thomas Huang
7981b1bf23
Merge pull request #6281 from MetaMask/fix-browser-back-on-reveal-seed
Fixes the use of the browser back button on the reveal seed screen
2019-03-12 11:31:19 -05:00
kumavis
d288e59a9b ui - add missing PropTypes (#6287) 2019-03-12 12:09:55 -02:30
kumavis
48047f8194 mascara - remove from project (#6283) 2019-03-12 11:17:21 -02:30
Dan Miller
17911dddff Fixes the use of the browser back button on the reveal seed screen 2019-03-11 16:52:26 -02:30
Thomas Huang
ef7ac90bca Remove line rather than comment out 2019-03-11 13:36:36 -05:00
Thomas Huang
22c4fe0469 No longer check network when validating checksum addresses 2019-03-11 13:00:03 -05:00
Dan J Miller
b8f143f1c3
Handle undefined gas limits and prices in transaction-breakdown.component (#6246) 2019-03-06 14:44:53 -03:30
Dan J Miller
be2d2bad4b
Add privacy policy link to modal metrics opt-in (#6250) 2019-03-06 13:02:54 -03:30
Dan J Miller
f74cd1aa3f
Prevent advanced gas input arrows from setting value to < 0 (#6248) 2019-03-06 12:49:57 -03:30
Dan J Miller
d547e0b80b
Only call onRecipient and onSender methods if defined in sender-to-recipient (#6247) 2019-03-06 12:49:23 -03:30
Dan J Miller
7160cef4c7
Fix missing this reference in addtoken button onclick method (#6245) 2019-03-06 11:19:21 -03:30
Dan J Miller
df0c7be808
Fixes the 'Percentages row tracks and gutters' decpracation warning. (#6244) 2019-03-06 11:18:36 -03:30
Dan J Miller
f334f4da15
Metametrics fixes (#6238)
* Improve opt-in opt-out event tracking after going 'back' in onboarding.

* Fix 'Switched Networks' metrics event.

* Fix custom variables ids (can only use ids 1-5)

* Fix tracking of function type custom variable for metametrics in confirm-transaction-base

* Add missing metametrics events
2019-03-05 14:44:02 -03:30
Thomas Huang
434e1aa04a Wrap in span 2019-03-05 12:00:56 -06:00
Dan J Miller
5530728f7e
Fix MetaMetrics Environment Check (#6235) 2019-03-05 12:49:12 -03:30
Dan J Miller
c757366355
Metametrics (#6171)
* Add metametrics provider and util.

* Add backend api and state for participating in metametrics.

* Add frontend action for participating in metametrics.

* Add metametrics opt-in screen.

* Add metametrics events to first time flow.

* Add metametrics events for route changes

* Add metametrics events for send and confirm screens

* Add metametrics events to dropdowns, transactions, log in and out, settings, sig requests and main screen

* Ensures each log in is measured as a new visit by metametrics.

* Ensure metametrics is called with an empty string for dimensions params if specified

* Adds opt in metametrics modal after unlock for existing users

* Adds settings page toggle for opting in and out of MetaMetrics

* Switch metametrics dimensions to page level scope

* Lint, test and translation fixes for metametrics.

* Update design for metametrics opt-in screen

* Complete responsive styling of metametrics-opt-in modal

* Use new chart image on metrics opt in screens

* Incorporate the metametrics opt-in screen into the new onboarding flow

* Update e2e tests to accomodate metametrics changes

* Mock out metametrics network requests in integration tests

* Fix tx-list integration test to support metametrics provider.

* Send number of tokens and accounts data with every metametrics event.

* Update metametrics event descriptor schema and add new events.

* Fix import tos bug and send gas button bug due to metametrics changes.

* Various small fixes on the metametrics branch.

* Add origin custom variable type to metametrics.util

* Fix names of onboarding complete actions (metametrics).

* Fix names of Metrics Options actions (metametrics).

* Clean up code related to metametrics.

* Fix bad merge conflict resolution and improve promise handling in sendMetaMetrics event and confrim tx base

* Don't send a second metrics event if user has gone back during first time flow.

* Collect metametrics on going back from onboarding create/import.

* Add missing custom variable constants for metametrics

* Fix metametrics provider

* Make height of opt-in modal responsive.

* Adjust text content for opt-in modal.

* Update metametrics event names and clean up code in opt-in-modal

* Put phishing warning step next to last in onboarding flow

* Link terms of service on create and import screens of first time flow

* Add subtext to options on the onboarding select action screen.

* Fix styling of bullet points on end of onboarding screen.

* Combine phishing warning and congratulations screens.

* Fix placement of users if unlocking after an incomplete onboarding import flow.

* Fix capitalization in opt-in screen

* Fix last onboarding screen translations

* Add link to 'Learn More' on the last screen of onboarding

* Code clean up: metametrics branch

* Update e2e tests for phishing warning step removal

* e2e tests passing on metametrics branch

* Different tracking urls for metametrics on development and prod
2019-03-05 12:15:01 -03:30
Vimal
ab5fe4d659 PR 5575 review comment fixes 2019-02-28 19:50:48 +05:30
Dan J Miller
cb2698d20e First time flow updates (#6192)
* Action select step of onboarding flow added.

* Update navigation on create and import password screens.

* Adds terms of service checkbox to create and import account screens.

* Add security warning to jazzicon intro step

* Update and streamline unique image to confirm seed steps of first time flow.

* UI touch ups to welcome screen.

* UI touch up on select action page

* Fix first time import flow.

* Add end of flow screen to first time flow

* Replace unique image screen with updated fishing warning screen.

* Update e2e tests for onboarding flow changes.

* Add required translations to onboarding flow.

* Update design of select action screen to emphasize create new wallet option.

* Clean up onboarding flow code.

* Remove notice related code from first-time-flow directory.

* Use updater function argument in new-account.component
2019-02-27 11:16:41 -03:30
Chi Kei Chan
a2320c76fe Show/Hide Fiat on Testnets based on User Preference (#6153) 2019-02-26 15:00:41 -03:30
Dan Finlay
f507f2a927 Feature Flag + Mobile Sync (#5955) 2019-02-25 15:40:13 -03:30
Dan J Miller
fdc7eb2113 Fix gas estimation when sending to contracts (#6195)
* Fix gas estimation when sending to contracts
* Fix calculating of balance sufficiency and tx params when sending token transaction
2019-02-25 14:46:23 -03:30
Dan J Miller
1eebe54c64
Merge pull request #6184 from chikeichan/6132
turn camcelCase method name to space separated
2019-02-19 20:59:43 -03:30
Dan J Miller
cbcaf87998
Merge pull request #6185 from chikeichan/5681
Remove password check when importing Account JSON
2019-02-19 20:59:17 -03:30
Chi Kei Chan
24ed53bbf3 Change "Token Address" to "Token Contract Address" (#6182) 2019-02-19 16:22:09 -03:30
Chi Kei Chan
0bbfb2e506 Remove password check when importing Account JSON 2019-02-18 22:01:43 -08:00
Chi Kei Chan
7be4795257 turn camcelCase method name to space separated 2019-02-18 21:36:12 -08:00
Chi Kei Chan
b58a9bd202 Add Copy Tx ID button to transaction-list-item-details (#6146)
* Add Copy Tx ID button to transaction-list-item-details

* Move justCopied toggle timeout inside setState callback
2019-02-17 01:00:02 -03:30
Whymarrh Whitby
1d8d129305
Checksum address before slicing it for the confirm screen (#6133) 2019-02-14 10:43:12 -03:30
Jonathan Smirnoff
8dddf48904 Fixed issue #5838 (#6001)
Update changelog file
2019-02-13 10:30:46 -10:00
Chi Kei Chan
d438deee89 Add button to force edit token symbol when adding custom token (#6147) 2019-02-13 10:30:22 -03:30
Whymarrh Whitby
1da1ec0df5
Merge pull request #6139 from whymarrh/fix-confirm-advanced-gas
Fix advanced gas controls on the confirm screen
2019-02-12 11:51:18 -03:30
Whymarrh Whitby
eed3ee41d4 Fix advanced gas controls on the confirm screen 2019-02-12 11:24:03 -03:30
Whymarrh Whitby
f41830b798 Trim whitespace from seed phrase during import
Somehow we lost 33b85cf2e
2019-02-12 01:05:05 -03:30
Whymarrh Whitby
0972e23dcd Add e2e tests adjusting gas before sending 2019-02-08 15:44:45 -03:30
Whymarrh Whitby
57ead4914f Fix inline advanced gas editing 2019-02-08 15:44:45 -03:30
Brandon Wissmann
810e5cb256 implement class for sign footer button (#6120) 2019-02-08 08:48:12 -03:30
Dan J Miller
97e92a1b68 Set custom gas data in state from inline advance gas controls on send screen (#6114) 2019-02-06 13:43:45 -03:30
Chi Kei Chan
798930afba Add Swap feature to CurrencyInput (#6091)
* Add Swap feature to CurrencyInput

* Fix linter error

* Fix and Add unit tests
2019-02-06 11:44:17 -03:30
Chi Kei Chan
83109c3dc7 Change gas labels to Slow/Average/Fast (#6090)
* Change gas labels to Slow/Average/Fast

* Fix unit test
2019-02-06 11:40:00 -03:30
Dan J Miller
38b91f63a2 Add togglable advanced gas controls on send and confirm screens (#6112)
* Extract advanced gas input controls to their own component

* Add advanced inline gas toggle to settings

* Add optional advanced inline gas to send send screen

* Adds optional advanced gas inputs to the confirm screen

* Add info modals for advanced gas inputs.

* Fix translation of advance gas toggle description.

* Lint and unit test fixes for inline-advanced-gas-inputs

* Increase margin above advanced options button on send screen

* Move methods from constructor to property syntax in advanced-gas-inputs.component
2019-02-05 16:24:28 -08:00
Whymarrh Whitby
f3a7054f6b Add announcement for users migrated to the new UI 2019-02-05 08:49:55 -03:30
Whymarrh Whitby
a7a6318c13 Default to the new UI for all users 2019-02-05 08:49:55 -03:30
Whymarrh Whitby
c18b6f4117 Remove commented references to Beta UI 2019-02-05 08:49:55 -03:30
Whymarrh Whitby
8a8696f897 Remove "Use old UI" setting 2019-02-05 08:49:55 -03:30
Paul Bouchon
db776b5a02 EIP-1102 updates (#6006)
* Update privacy notice

* Respond to 1102 messages using tab ID
2019-01-30 10:27:33 -08:00
Whymarrh Whitby
b2813d1113
Remove unused InitializeMenuScreen component (#6075) 2019-01-30 14:47:56 -03:30
Dan J Miller
02bdbbbc3e Add visual indicator when displaying a cached balance (#5854) 2019-01-30 08:46:12 -03:30
Frankie
df3169d1c7
I#5956 fix2 dont overwrite existing rpc settings (#6044)
* mm-controller - dont overwrite existing rpc settings

* ui-networkDropdown - dont pass old network as chainId

* add methods preferencesController.updateRpc and metamaskController.updateAndSetCustomRpc

* use updateAndSetCustomRpc in settings to allow rpcs to be updated

* use new rpc as nickname if no nick name has been supplied

* fix update rpc method
2019-01-29 08:13:51 -10:00
Alexander Tseung
941a9a0fd9 Order shapeshift transactions by time within the transactions list 2019-01-24 19:31:30 -03:30
Esteban Miño
2d7c9b3dac Prevent send to token warning (#6058) 2019-01-23 14:39:56 -03:30
Alexander Tseung
fba17d77de Refactor first time flow, remove seed phrase from state (#5994)
* Refactor and fix styling for first time flow. Remove seed phrase from persisted metamask state

* Fix linting and tests

* Fix translations, initialization notice routing

* Fix drizzle tests

* Fix e2e tests

* Fix integration tests

* Fix styling

* Fix migration naming from 030 to 031

* Open extension in browser when user has not completed onboarding
2019-01-23 11:55:34 -03:30
Esteban Miño
1d93d9a385 Prevent send to token (#6051)
* check contact metadata

* check for tokens in state

* tests

* update tests

* validation only if sending tokens

* container test
2019-01-22 11:05:59 -08:00
Esteban Miño
e21dfd1862 Use Parity on-chain registry only when is needed (#6052)
* add and use knownMethodData to avoid infura requests

* dataMethod to methodData and check empty response
2019-01-22 10:22:56 -08:00
Alexander Tseung
fe780fb3d4 Refactor BalanceComponent to jsx (#6048) 2019-01-21 10:56:48 -03:30
Frankie
0ad7797076
I#5956 fix 1 (#6026)
* prevent invalid chainId's when adding cusstom rpcs

* migration 30 removes invalid chaids from preferences and networkController for custom rpcs
2019-01-17 09:10:33 -10:00
Alexander Tseung
de0ac53008 Fix grammar error in Current Conversion (#6029) 2019-01-17 11:37:38 -03:30
Alexander Tseung
3fe78a8f48
Disable account dropdown on signing screens (#6024) 2019-01-16 14:50:24 -08:00
Alexander Tseung
eaca9d21e6 Fix confirm screen for sending ether tx with hex data (#6008) 2019-01-10 12:54:37 -03:30
Hsuan Lee
dd6d3232fa Fix ERC20 token value decoding (#5995)
When MetaMask user calls non-standard ERC20 methods such as `mint`, `tokenData` will be `undefined` and an uncaught error will break the UI
2019-01-04 08:36:25 -03:30
Bowen
866b9af69e Fix Component#componentDidUpdate usage (#5977) 2019-01-03 18:17:37 -03:30
Alexander Tseung
0b4469b842 Add scrolling button to account list 2019-01-03 11:22:38 -08:00
Alexander Tseung
30a2be85ee
Prevent users from changing the From field in the send screen (#5922)
* Prevent users from changing the From field in the send screen

* Fix integration tests
2018-12-13 18:19:36 -08:00
Alexander Tseung
435fdae84a
Fix displayed time and date in the activity log. Remove vreme library, add luxon library. (#5932) 2018-12-13 12:48:15 -08:00
Dan J Miller
c5861c88a5
Merge pull request #5893 from MetaMask/loading-network-screen
Loading network screen
2018-12-13 14:20:27 -03:30
Alexander Tseung
05e8753641 Fix speed up button not showing for transactions with the lowest nonce (#5925) 2018-12-12 18:33:46 -08:00
Dan Miller
04cc98d8e4 Clean up for the loading-network-screen 2018-12-12 14:14:52 -03:30
Dan Miller
f4dc64960d Improve styling of loading retry / error screen 2018-12-12 13:54:45 -03:30
Dan Miller
20dbebae9f Adds network loading retry / error screen. 2018-12-12 13:53:37 -03:30
Dan Miller
0e5e51b8ff Add identifier of private network to the network loading screen message. 2018-12-12 13:53:37 -03:30
Dan Miller
47501a6f7a Add spinner and dropdown arrow to network indicator on custom network loading. 2018-12-12 13:53:37 -03:30
Dan Miller
66f7102c06 Show transaction fee instead of total fee in top left of gas customization modal. 2018-12-12 13:27:44 -03:30
Dan Miller
dabf263733 Fix width of gas customization model in notification view 2018-12-12 13:05:38 -03:30
Dan Miller
3cca6fc886 Add missing translation to the gas customization component. 2018-12-12 13:05:25 -03:30
Dan Miller
1145a0a9ad Ensures that advanced tab gas limit reflects tx gas limit 2018-12-12 12:00:57 -03:30
Alexander Tseung
9c24019659
Add submitDisabled prop to Modals. Disable submit button when creating a cancel transaction (#5910) 2018-12-11 15:04:57 -08:00
Dan J Miller
1fbdce8916 Improve ux for low gas price set (#5862)
* Show user warning if they set gas price below safelow minimum, error if 0.

* Properly cache basic price estimate data.

* Default retry price to recommended price if original price was 0x0

* Use mock fetch in send-new-ui integration tests.
2018-12-10 13:51:00 -08:00
Noah Zinsmeister
49971e9ec2 fix formatting of 32-byte strings in personal_sign (#5878) 2018-12-10 09:47:52 -03:30
Alexander Tseung
d8ab9cc002
Group transactions by nonce (#5886) 2018-12-09 12:48:06 -08:00
Whymarrh Whitby
6a0993a45e Replace height: 100% rule with workaround for flexbox quirks 2018-12-05 14:13:45 -03:30
Dan Miller
8194309a9a Fix styling of send screen in extension view when hex data on. 2018-12-04 00:06:22 -03:30
Dan Miller
d8e41a6aa5 Final gas customization fixes 2018-12-04 00:06:22 -03:30
Dan Miller
75d7545437 Clear custom gas data on hiding of gas customization modal. 2018-12-04 00:06:22 -03:30
Dan Miller
f8ffdaedc9 Modify results of API data to better fit gas chart: remove outliers, pad data 2018-12-04 00:06:22 -03:30
Dan Miller
7ffea926f2 Add loading spinners when waiting for APIs in the gas customization modal 2018-12-04 00:06:22 -03:30
Dan Miller
7f2c5c09de Uses more reliable api on main send screen; caches basic api results in modal 2018-12-04 00:06:22 -03:30
Dan Miller
4111e9f92d Improve responsiveness of customize speed up slider. 2018-12-04 00:06:22 -03:30
Dan Miller
d5411e772d Make gas customization modal responsive. 2018-12-04 00:06:22 -03:30
Dan Miller
8c8359ca14 Remove gas customization integration tests (in favour of e2e tests) 2018-12-04 00:06:22 -03:30
Dan Miller
b70886a99b Fixes for components that break e2e gas customization tests, plus unit test updates. 2018-12-04 00:06:22 -03:30
Dan Miller
a8259f7f6a Update e2e tests for new gas customization modal. 2018-12-04 00:06:22 -03:30
Dan Miller
79de7a45ae Connect gas price chart to gas station api. 2018-12-04 00:06:22 -03:30
Dan Miller
e3f015c88f Adds speed up slide-in gas customization sidebar 2018-12-04 00:06:22 -03:30
Dan Miller
3162a2747c Redesign of gas customization basic tab. 2018-12-04 00:06:05 -03:30
Dan Miller
3ced3c9b2a Clean up for mmui-i11-custom-gas-price-chart branch 2018-12-04 00:06:05 -03:30
Dan Miller
d14af8346a Improve data management and tests for gas-modal-page-container price estimates. 2018-12-04 00:06:05 -03:30
Dan Miller
d0619b024f Update tests, plus some lint fixes, for gas-price-chart 2018-12-04 00:06:05 -03:30
Dan Miller
6f0406125d Clean up gas chart code. 2018-12-04 00:06:05 -03:30
Dan Miller
aa798cc545 Add control arrows to advanced gas tab inputs. 2018-12-04 00:06:05 -03:30
Dan Miller
cd32c58fb4 Complete integration of gas chart with redux. 2018-12-04 00:06:05 -03:30
Dan Miller
a2bbf504b8 Read only connection of gas price chart to redux 2018-12-04 00:06:05 -03:30
Dan Miller
2dbae581ac Gas price chart improvements, redesign, bug fixes, and set up to receive external data 2018-12-04 00:06:05 -03:30
Dan Miller
0ba6f7d9bb Adds not yet functional gas price chart. 2018-12-04 00:06:05 -03:30
Dan Miller
6dd1028c71 Lint and unit test fixes. 2018-12-04 00:06:05 -03:30
Dan Miller
6f8e2b1ad9 Clean up for advanced gas tab customization changes. 2018-12-04 00:06:05 -03:30
Dan Miller
b95eb30ec6 Adds redesign for the customize gas advanced tab. 2018-12-04 00:06:04 -03:30
Dan Miller
5354325fab Test updates and additions for button integration with send screen. 2018-12-04 00:06:04 -03:30
Dan Miller
b567c78bca Integrate gas buttons with the send screen. 2018-12-04 00:06:04 -03:30
Dan Miller
7de3f22d63 Connects remained of the gas customization component to redux. 2018-12-04 00:06:04 -03:30
Dan Miller
6ada9b4a3c Adds gas-duck.test.js tests. 2018-12-04 00:06:04 -03:30
Dan Miller
58feb24fa7 Styling fixes for gas customization advanced tab content. 2018-12-04 00:06:04 -03:30
Dan Miller
d07d40cf7c Improvements to propdefaults in button-group.component and basic-tab-content.component 2018-12-04 00:06:04 -03:30
Dan Miller
0a7dfcd55d Connect the gas-button-group component to redux and a live api. 2018-12-04 00:06:04 -03:30
Dan Miller
112d18e316 Adds basic tab content to gas customizer, with styled button group (static, for now). 2018-12-04 00:06:04 -03:30
Dan Miller
57cd721800 Improve styling of advanced-tab-content gasInput row 2018-12-04 00:06:04 -03:30
Dan Miller
99c8804eeb Add tests for advanced-tab-component.js and subcomponents. 2018-12-04 00:06:04 -03:30
Dan Miller
3b9ec8e1bc Remove gas slider from advance-tab-content.component 2018-12-04 00:06:04 -03:30
Dan Miller
d55a2615a4 Split advanced-tab-content.component.js render() method into smaller pieces; add translations to the same file. 2018-12-04 00:06:04 -03:30
Dan Miller
342dc95410 Adds the content of the advanced tab - w/o chart or dynamic content - to gas customize modal. 2018-12-04 00:06:04 -03:30
Dan Miller
5e7409482b Use BEM for css in gas-modal-page-container 2018-12-04 00:06:04 -03:30
Dan Miller
88d8eb289e Use correct message key in gas-modal-page-container.component.js 2018-12-04 00:06:04 -03:30
Dan Miller
f9aa5a70de Adds new gas customization modal container (without content) 2018-12-04 00:06:04 -03:30
Dan J Miller
4c24555545 Save recent network balances in local storage (#5843)
* Use selector for state.metamask.accounts in all cases.

* Default to cached balance when selecting metamask accounts

* Adds the cached-balances controller

* Documentation and small codes fixes for #5843

Co-Authored-By: danjm <danjm.com@gmail.com>
2018-11-30 14:51:24 -08:00
Whymarrh Whitby
88defe3623
Hide app-header when provider request pending (#5831) 2018-11-26 16:51:07 -03:30
Whymarrh Whitby
1403b8286d
Show disabled cursor in .network-disabled state (#5829) 2018-11-26 13:11:16 -03:30
Thomas Huang
4054b1cb84 Increase Token Symbol length to twelve 2018-11-22 12:39:59 -06:00
Bruno Barbieri
ae8626eceb
Merge pull request #5797 from MetaMask/trezor-v6
Add Firefox and Brave support for Trezor
2018-11-21 14:45:55 -05:00
Whymarrh Whitby
7229f0f9fc
Fix usage of setState in ConfirmTransactionBase#handleSubmit (#5799) 2018-11-21 15:22:18 -03:30
Whymarrh Whitby
74c18ef0e8
Show byte count for hex data on confirm screen (#5798) 2018-11-21 15:21:34 -03:30
brunobar79
9b1df386de fix merge conflicts 2018-11-20 17:44:28 -05:00
Whymarrh Whitby
6b32e82ac1 Remove "Beta" from welcome messages
More sed magic:

    sed -i.bak 's/MetaMask Beta/MetaMask/' app/_locales/**/messages.json && \
    find app/_locales -name '*.bak' -delete

    sed -i.bak 's/"welcomeBeta"/"welcome"/' app/_locales/**/messages.json && \
    find app/_locales -name '*.bak' -delete
2018-11-20 14:04:50 -03:30
Whymarrh Whitby
c5da84d7a2 Remove "Beta" from header logo 2018-11-20 14:04:50 -03:30
Whymarrh Whitby
c482c9926c Default to the new UI for first time users 2018-11-20 14:04:17 -03:30
Alexander Tseung
a7b3750a3e Fix button styling for Create Account Connect (#5787) 2018-11-19 22:46:41 -08:00
Alexander Tseung
4c87c05a02
Fix rounding issue when sending max tokens (#5695)
* Fix rounding issue when sending max tokens

* Ensure amount row shows exact amount of max tokens on send screen (#2)

* Fix tests

* Change stored redux value from BigNumber to hex string. Fix TokenInput default value
2018-11-19 16:06:34 -08:00
Whymarrh Whitby
1988e1e96b ESLint fixes (#5775)
* eslint . --fix

* Upgrade all ESLint warnings to errors
2018-11-16 14:54:55 -10:00
brunobar79
c0557b43e2 clean up 2018-11-15 00:34:49 -05:00
brunobar79
18f39ef69e Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 2018-11-14 15:42:45 -05:00
Alexander Tseung
46b29a50f0 Show APPROVED status for transactions that have been approved but not submitted 2018-11-13 17:37:01 -08:00
brunobar79
484aa6801e Merge branch 'develop' into trezor-v5 2018-11-13 17:21:15 -05:00
PaddyMc
7ce2cf4572 Fixes #3425: Better support for batch transactions (#5437) 2018-11-13 13:49:12 -03:30
Vimal
6bb92a8672 merging upstream branch 2018-11-12 17:50:37 +05:30
Alexander Tseung
83ffb9fafe
Increase number of ETH decimals displayed in the balance view from 3 to 4 (#5710) 2018-11-09 10:17:42 -08:00
Thomas Huang
0ab5c1c6e2
Merge pull request #5481 from MetaMask/reducers
tests/Reducers
2018-11-06 20:56:15 -08:00
brunobar79
c651212025 fix merge conflicts 2018-11-06 20:21:19 -05:00
Whymarrh Whitby
f692123f51 Update the colour of the default image used on Connect Request (#5678) 2018-11-05 15:07:09 -08:00
Whymarrh Whitby
5d928e67c3 Update "Learn more" link on 1102 connect screen (#5677) 2018-11-05 15:07:09 -08:00