From 6a7ea00cd34f83b257f6b4280a5f4e20aa5d34ee Mon Sep 17 00:00:00 2001 From: kumavis Date: Thu, 6 Apr 2017 14:30:14 -0700 Subject: mascara deploy - improve deploy instructions --- Dockerfile | 5 ++++- mascara/README.md | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d06f5377b..d79584c15 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,10 @@ WORKDIR /www/ # install dependencies COPY ./package.json /www/package.json -RUN npm install +# RUN npm install -g node-gyp +RUN npm install >> npm_log 2>> npm_err || true + +RUN cat npm_log && cat npm_err # copy over app dir COPY ./ /www/ diff --git a/mascara/README.md b/mascara/README.md index cdeb4795c..d79f04ae2 100644 --- a/mascara/README.md +++ b/mascara/README.md @@ -18,3 +18,9 @@ node server.js Standing problems: - [ ] IndexDb + +### deploy + +``` +docker-compose build && docker-compose stop && docker-compose up -d && docker-compose logs -f --tail 10 +``` \ No newline at end of file -- cgit v1.2.3 From 19c375fa69ae69977443fc5ec1f638c7879305ff Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Fri, 13 Oct 2017 19:22:02 +0000 Subject: fix(package): update metamascara to version 2.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2b7b2056a..7a1be5579 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "json-rpc-engine": "^3.2.0", "json-rpc-middleware-stream": "^1.0.1", "loglevel": "^1.4.1", - "metamascara": "^1.3.1", + "metamascara": "^2.0.0", "metamask-logo": "^2.1.2", "mississippi": "^1.2.0", "mkdirp": "^0.5.1", -- cgit v1.2.3 From e81ba29359fd934f3075625854b5786e6872fb36 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 21 Dec 2017 16:45:03 +0000 Subject: chore(package): update karma to version 2.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7184e3ea8..8858d4a5b 100644 --- a/package.json +++ b/package.json @@ -193,7 +193,7 @@ "jsdom": "^11.1.0", "jsdom-global": "^3.0.2", "jshint-stylish": "~2.2.1", - "karma": "^1.7.1", + "karma": "^2.0.0", "karma-chrome-launcher": "^2.2.0", "karma-cli": "^1.0.1", "karma-firefox-launcher": "^1.0.1", -- cgit v1.2.3 From a76324f6d397c3e746ba501cfd858c4869cb0af7 Mon Sep 17 00:00:00 2001 From: Ellie Day Date: Sat, 23 Dec 2017 08:23:34 -0600 Subject: Add ExtensionStore and add basic store instance syncing to main controller --- app/scripts/background.js | 12 ++++++++++++ app/scripts/lib/extension-store.js | 20 ++++++++++++++++++++ test/unit/extension-store-test.js | 29 +++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 app/scripts/lib/extension-store.js create mode 100644 test/unit/extension-store-test.js diff --git a/app/scripts/background.js b/app/scripts/background.js index da022c490..45da2f6d0 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -4,6 +4,7 @@ const pump = require('pump') const log = require('loglevel') const extension = require('extensionizer') const LocalStorageStore = require('obs-store/lib/localStorage') +const ExtensionStore = require('./lib/extension-store') const storeTransform = require('obs-store/lib/transform') const asStream = require('obs-store/lib/asStream') const ExtensionPlatform = require('./platforms/extension') @@ -28,6 +29,7 @@ let popupIsOpen = false // state persistence const diskStore = new LocalStorageStore({ storageKey: STORAGE_KEY }) +const extensionStore = new ExtensionStore() // initialization flow initialize().catch(log.error) @@ -45,8 +47,12 @@ async function initialize () { async function loadStateFromPersistence () { // migrations const migrator = new Migrator({ migrations }) + // fetch from extension store + const extensionData = await extensionStore.fetch() // TODO: handle possible exceptions (https://developer.chrome.com/apps/runtime#property-lastError) // read from disk let versionedData = diskStore.getState() || migrator.generateInitialState(firstTimeState) + // merge extension and versioned data + versionedData = { ...versionedData, ...extensionData } // migrate data versionedData = await migrator.migrateData(versionedData) // write to disk @@ -76,6 +82,7 @@ function setupController (initState) { pump( asStream(controller.store), storeTransform(versionifyData), + storeTransform(syncDataWithExtension), asStream(diskStore) ) @@ -85,6 +92,11 @@ function setupController (initState) { return versionedData } + function syncDataWithExtension(state) { + extensionStore.sync(state) // TODO: handle possible exceptions (https://developer.chrome.com/apps/runtime#property-lastError) + return state + } + // // connect to other contexts // diff --git a/app/scripts/lib/extension-store.js b/app/scripts/lib/extension-store.js new file mode 100644 index 000000000..a8b730a65 --- /dev/null +++ b/app/scripts/lib/extension-store.js @@ -0,0 +1,20 @@ +const extension = require('extensionizer') + +const KEYS_TO_SYNC = ['KeyringController', 'PreferencesController'] + +module.exports = class ExtensionStore { + async fetch() { + return new Promise((resolve) => { + extension.storage.sync.get(KEYS_TO_SYNC, data => resolve(data)) + }) + } + async sync(state) { + const dataToSync = KEYS_TO_SYNC.reduce((result, key) => { + result[key] = state.data[key] + return result + }, {}) + return new Promise((resolve) => { + extension.storage.sync.set(dataToSync, () => resolve()) + }) + } +} diff --git a/test/unit/extension-store-test.js b/test/unit/extension-store-test.js new file mode 100644 index 000000000..e3b5713fb --- /dev/null +++ b/test/unit/extension-store-test.js @@ -0,0 +1,29 @@ +const assert = require('assert') + +const ExtensionStore = require('../../app/scripts/lib/extension-store') + +describe('Extension Store', function () { + let extensionStore + + beforeEach(function () { + extensionStore = new ExtensionStore() + }) + + describe('#fetch', function () { + it('should return a promise', function () { + + }) + it('after promise resolution, should have loaded the proper data from the extension', function () { + + }) + }) + + describe('#sync', function () { + it('should return a promise', function () { + + }) + it('after promise resolution, should have synced the proper data from the extension', function () { + + }) + }) +}) -- cgit v1.2.3 From 7184db7632ef79d4bde0e643fdc1a4ee910c77fb Mon Sep 17 00:00:00 2001 From: Ellie Day Date: Tue, 2 Jan 2018 21:31:17 -0800 Subject: handle situation where storage.sync is disabled in certain versions of firefox --- app/scripts/background.js | 5 ++--- app/scripts/lib/extension-store.js | 19 +++++++++++++++++-- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/app/scripts/background.js b/app/scripts/background.js index 45da2f6d0..732f47590 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -47,11 +47,10 @@ async function initialize () { async function loadStateFromPersistence () { // migrations const migrator = new Migrator({ migrations }) - // fetch from extension store - const extensionData = await extensionStore.fetch() // TODO: handle possible exceptions (https://developer.chrome.com/apps/runtime#property-lastError) // read from disk let versionedData = diskStore.getState() || migrator.generateInitialState(firstTimeState) - // merge extension and versioned data + // fetch from extension store and merge in data + const extensionData = await extensionStore.fetch() // TODO: handle possible exceptions (https://developer.chrome.com/apps/runtime#property-lastError) versionedData = { ...versionedData, ...extensionData } // migrate data versionedData = await migrator.migrateData(versionedData) diff --git a/app/scripts/lib/extension-store.js b/app/scripts/lib/extension-store.js index a8b730a65..dd0f82f36 100644 --- a/app/scripts/lib/extension-store.js +++ b/app/scripts/lib/extension-store.js @@ -1,11 +1,24 @@ const extension = require('extensionizer') const KEYS_TO_SYNC = ['KeyringController', 'PreferencesController'] +const FIREFOX_SYNC_DISABLED_MESSAGE = 'Please set webextensions.storage.sync.enabled to true in about:config' + +const handleDisabledSyncAndResolve = (resolve, toResolve) => { + // Firefox 52 has sync available on extension.storage, but it is disabled by default + const lastError = extension.runtime.lastError + if (lastError && lastError.message.includes(FIREFOX_SYNC_DISABLED_MESSAGE)) { + resolve({}) + } else { + resolve(toResolve) + } +} module.exports = class ExtensionStore { async fetch() { return new Promise((resolve) => { - extension.storage.sync.get(KEYS_TO_SYNC, data => resolve(data)) + extension.storage.sync.get(KEYS_TO_SYNC, (data) => { + handleDisabledSyncAndResolve(resolve, data) + }) }) } async sync(state) { @@ -14,7 +27,9 @@ module.exports = class ExtensionStore { return result }, {}) return new Promise((resolve) => { - extension.storage.sync.set(dataToSync, () => resolve()) + extension.storage.sync.set(dataToSync, () => { + handleDisabledSyncAndResolve(resolve) + }) }) } } -- cgit v1.2.3 From 3c6a5b16ad37c83f548028d5b6fa3d0f75293ca5 Mon Sep 17 00:00:00 2001 From: Ellie Day Date: Tue, 2 Jan 2018 21:53:11 -0800 Subject: conditionally use extension store if supported or enabled --- app/scripts/background.js | 12 +++++++++--- app/scripts/lib/extension-store.js | 4 ++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/scripts/background.js b/app/scripts/background.js index 732f47590..d9a2b0a6e 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -50,8 +50,12 @@ async function loadStateFromPersistence () { // read from disk let versionedData = diskStore.getState() || migrator.generateInitialState(firstTimeState) // fetch from extension store and merge in data - const extensionData = await extensionStore.fetch() // TODO: handle possible exceptions (https://developer.chrome.com/apps/runtime#property-lastError) - versionedData = { ...versionedData, ...extensionData } + + if (extensionStore.isSupported && extensionStore.isEnabled) { + const extensionData = await extensionStore.fetch() // TODO: handle possible exceptions (https://developer.chrome.com/apps/runtime#property-lastError) + versionedData = { ...versionedData, ...extensionData } + } + // migrate data versionedData = await migrator.migrateData(versionedData) // write to disk @@ -92,7 +96,9 @@ function setupController (initState) { } function syncDataWithExtension(state) { - extensionStore.sync(state) // TODO: handle possible exceptions (https://developer.chrome.com/apps/runtime#property-lastError) + if (extensionStore.isSupported && extensionStore.isEnabled) { + extensionStore.sync(state) // TODO: handle possible exceptions (https://developer.chrome.com/apps/runtime#property-lastError) + } return state } diff --git a/app/scripts/lib/extension-store.js b/app/scripts/lib/extension-store.js index dd0f82f36..67ee71f16 100644 --- a/app/scripts/lib/extension-store.js +++ b/app/scripts/lib/extension-store.js @@ -14,6 +14,10 @@ const handleDisabledSyncAndResolve = (resolve, toResolve) => { } module.exports = class ExtensionStore { + constructor() { + this.isSupported = !!(extension.storage.sync) + this.isEnabled = true // TODO: get value from user settings + } async fetch() { return new Promise((resolve) => { extension.storage.sync.get(KEYS_TO_SYNC, (data) => { -- cgit v1.2.3 From bad70eb1b328aa911a2523ccab642d7607161b4b Mon Sep 17 00:00:00 2001 From: Nick Doiron Date: Mon, 22 Jan 2018 23:48:03 -1000 Subject: first steps to i18n --- app/_locales/en/messages.json | 167 ++++++++++++++++++++- ui/app/components/account-dropdowns.js | 12 +- ui/app/components/account-export.js | 8 +- ui/app/components/account-menu/index.js | 14 +- ui/app/components/buy-button-subview.js | 8 +- ui/app/components/coinbase-form.js | 4 +- ui/app/components/copyButton.js | 2 +- ui/app/components/copyable.js | 2 +- ui/app/components/customize-gas-modal/index.js | 20 +-- .../dropdowns/components/account-dropdowns.js | 19 ++- ui/app/components/dropdowns/network-dropdown.js | 26 ++-- ui/app/components/dropdowns/token-menu-dropdown.js | 2 +- ui/app/components/ens-input.js | 4 +- ui/app/components/hex-as-decimal-input.js | 2 +- ui/app/components/network.js | 24 +-- ui/app/components/notice.js | 2 +- ui/app/components/pending-msg-details.js | 3 +- ui/app/components/pending-msg.js | 14 +- ui/app/components/pending-personal-msg-details.js | 3 +- ui/app/components/pending-typed-msg-details.js | 2 +- ui/app/components/pending-typed-msg.js | 6 +- ui/app/components/shapeshift-form.js | 22 +-- ui/app/components/shift-list-item.js | 8 +- ui/app/components/signature-request.js | 24 ++- ui/app/components/token-list.js | 6 +- ui/app/components/transaction-list-item.js | 16 +- ui/app/components/transaction-list.js | 3 +- ui/app/components/tx-list-item.js | 2 +- ui/app/components/tx-list.js | 4 +- ui/app/components/tx-view.js | 6 +- ui/app/components/wallet-view.js | 8 +- ui/app/first-time/init-menu.js | 25 +-- 32 files changed, 314 insertions(+), 154 deletions(-) diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 8c28f1c43..6967a44d2 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -6,5 +6,170 @@ "appDescription": { "message": "Ethereum Identity Management", "description": "The description of the application" - } + }, + "encryptNewDen": { + "message": "Encrypt your new DEN" + }, + "denExplainer": { + "message": "Your DEN is your password-encrypted storage within MetaMask." + }, + "importDen": { + "message": "Import Existing DEN" + }, + "createDen": { + "message": "Create" + }, + "newPassword": { + "message": "New Password (min 8 chars)" + }, + "confirmPassword": { + "message": "Confirm Password" + }, + "passwordMismatch": { + "message": "passwords don't match" + }, + "passwordShort": { + "message": "password not long enough" + }, + "myAccounts": { + "message": "My Accounts" + }, + "logout": { + "message": "Log out" + }, + "createAccount": { + "message": "Create Account" + }, + "importAccount": { + "message": "Import Account" + }, + "account": { + "message": "Account:" + }, + "infoHelp": { + "message": "Info & Help" + }, + "settings": { + "message": "Settings" + }, + "importedCaps": { + "message": "IMPORTED" + }, + "saveButton": { + "message": "SAVE" + }, + "cancelButton": { + "message": "CANCEL" + }, + "signButton": { + "message": "SIGN" + }, + "revert": { + "message": "Revert" + }, + "gasLimit": { + "message": "Gas Limit" + }, + "gasLimitCalculation": { + "message": "We calculate the suggested gas limit based on network success rates." + }, + "gasPrice": { + "message": "Gas Price (GWEI)" + }, + "gasPriceCalculation": { + "message": "We calculate the suggested gas prices based on network success rates." + }, + "customGas": { + "message": "Customize Gas" + }, + "balanceIsInsufficientGas": { + "message": "Insufficient balance for current gas total" + }, + "gasLimitTooLow": { + "message": "Gas limit must be at least 21000" + }, + "editButton": { + "message": "Edit" + }, + "looseCaps": { + "message": "LOOSE" + }, + "addToken": "Add Token", + "exportPrivateKey": "Export Private Key", + "copyAddress": "Copy Address to clipboard", + "etherscanView": "View account on Etherscan", + "qrCode": "Show QR Code", + "accDetails": "Account Details", + "networks": "Networks", + "defaultNetwork": "The default network for Ether transactions is Main Net.", + "mainnet": "Main Ethereum Network", + "unknownNetwork": "Unknown Private Network", + "rinkeby": "Rinkeby Test Network", + "kovan": "Kovan Test Network", + "ropsten": "Ropsten Test Network", + "localhost": "Localhost 8545", + "customRPC": "Custom RPC", + "hideToken": "Hide Token", + "copiedClipboard": "Copied to Clipboard", + "detailsCaps": "DETAILS", + "sendButton": "SEND", + "depositButton": "DEPOSIT", + "notStarted": "Not Started", + "noTransactions": "No Transactions", + "contractPublished": "Contract Published", + "noTransactionHistory": "No transaction history.", + "warning": "Warning", + "failed": "Failed", + "rejected": "Rejected", + "sigRequested": "Signature Requested", + "yourSigRequested": "Your signature is being requested", + "balance": "Balance:", + "retryWithMoreGas": "Retry with a higher gas price here", + "takesTooLong": "Taking too long?", + "transactionNumber": "Transaction Number", + "loadingTokens": "Loading Tokens...", + "troubleTokenBalances": "We had trouble loading your token balances. You can view them ", + "here": "here", + "message": "Message", + "signNotice": "Signing this message can have \ndangerous side effects. Only sign messages from \nsites you fully trust with your entire account.\n This dangerous method will be removed in a future version. ", + "youSign": "You are signing:", + "conversionProgress": "Conversion in progress", + "noDeposits": "No deposits received", + "fromShapeShift": "From ShapeShift", + "invalidRequest": "Invalid Request", + "status": "Status", + "limit": "Limit", + "exchangeRate": "Exchange Rate", + "min": "Minimum", + "available": "Available", + "unavailable": "Unavailable", + "depositBTC": "Deposit your BTC to the address below:", + "deposit": "Deposit", + "receive": "Receive", + "refundAddress": "Your Refund Address", + "buyButton": "Buy", + "signMessage": "Sign Message", + "youSignCaps": "YOU ARE SIGNING", + "messageCaps": "MESSAGE", + "readMore": "Read more here.", + "cancel": "Cancel", + "sign": "Sign", + "accept": "Accept", + "attemptingConnect": "Attempting to connect to blockchain.", + "privateNetwork": "Private Network", + "invalidInput": "Invalid input.", + "noAddressForName": "No address has been set for this name.", + "clickCopy": "Click to Copy", + "copyButton": " Copy ", + "copiedButton": "Copied", + "copy": "Copy", + "copiedExclamation": "Copied!", + "continueToCoinbase": "Continue to Coinbase", + "depositEth": "Deposit Eth", + "selectService": "Select Service", + "unknownNetworkId": "Unknown network ID", + "borrowDharma": "Borrow With Dharma (Beta)", + "exportPrivateKeyWarning": "Export private keys at your own risk.", + "confirmPasswordSmall": "confirm password", + "submit": "Submit", } diff --git a/ui/app/components/account-dropdowns.js b/ui/app/components/account-dropdowns.js index 0c34a5154..3e5805c0e 100644 --- a/ui/app/components/account-dropdowns.js +++ b/ui/app/components/account-dropdowns.js @@ -79,7 +79,7 @@ class AccountDropdowns extends Component { try { // Sometimes keyrings aren't loaded yet: const type = keyring.type const isLoose = type !== 'HD Key Tree' - return isLoose ? h('.keyring-label', 'LOOSE') : null + return isLoose ? h('.keyring-label', t('looseCaps')) : null } catch (e) { return } } @@ -129,7 +129,7 @@ class AccountDropdowns extends Component { diameter: 32, }, ), - h('span', { style: { marginLeft: '20px', fontSize: '24px' } }, 'Create Account'), + h('span', { style: { marginLeft: '20px', fontSize: '24px' } }, t('createAccount')), ], ), h( @@ -192,7 +192,7 @@ class AccountDropdowns extends Component { global.platform.openWindow({ url }) }, }, - 'View account on Etherscan', + t('etherscanView'), ), h( DropdownMenuItem, @@ -204,7 +204,7 @@ class AccountDropdowns extends Component { actions.showQrView(selected, identity ? identity.name : '') }, }, - 'Show QR Code', + t('qrCode'), ), h( DropdownMenuItem, @@ -216,7 +216,7 @@ class AccountDropdowns extends Component { copyToClipboard(checkSumAddress) }, }, - 'Copy Address to clipboard', + t('copyAddress'), ), h( DropdownMenuItem, @@ -226,7 +226,7 @@ class AccountDropdowns extends Component { actions.requestAccountExport() }, }, - 'Export Private Key', + t('exportPrivateKey'), ), ] ) diff --git a/ui/app/components/account-export.js b/ui/app/components/account-export.js index 32b103c86..346872a97 100644 --- a/ui/app/components/account-export.js +++ b/ui/app/components/account-export.js @@ -35,7 +35,7 @@ ExportAccountView.prototype.render = function () { if (notExporting) return h('div') if (exportRequested) { - const warning = `Export private keys at your own risk.` + const warning = t('exportPrivateKeyWarning') return ( h('div', { style: { @@ -53,7 +53,7 @@ ExportAccountView.prototype.render = function () { h('p.error', warning), h('input#exportAccount.sizing-input', { type: 'password', - placeholder: 'confirm password', + placeholder: t('confirmPasswordSmall'), onKeyPress: this.onExportKeyPress.bind(this), style: { position: 'relative', @@ -74,10 +74,10 @@ ExportAccountView.prototype.render = function () { style: { marginRight: '10px', }, - }, 'Submit'), + }, t('submit')), h('button', { onClick: () => this.props.dispatch(actions.backToAccountDetail(this.props.address)), - }, 'Cancel'), + }, t('cancel')), ]), (this.props.warning) && ( h('span.error', { diff --git a/ui/app/components/account-menu/index.js b/ui/app/components/account-menu/index.js index aeb8a0b38..aec00ff6b 100644 --- a/ui/app/components/account-menu/index.js +++ b/ui/app/components/account-menu/index.js @@ -70,10 +70,10 @@ AccountMenu.prototype.render = function () { h(Item, { className: 'account-menu__header', }, [ - 'My Accounts', + t('myAccounts'), h('button.account-menu__logout-button', { onClick: lockMetamask, - }, 'Log out'), + }, t('logout')), ]), h(Divider), h('div.account-menu__accounts', this.renderAccounts()), @@ -81,23 +81,23 @@ AccountMenu.prototype.render = function () { h(Item, { onClick: () => showNewAccountPage('CREATE'), icon: h('img', { src: 'images/plus-btn-white.svg' }), - text: 'Create Account', + text: t('createAccount'), }), h(Item, { onClick: () => showNewAccountPage('IMPORT'), icon: h('img', { src: 'images/import-account.svg' }), - text: 'Import Account', + text: t('importAccount'), }), h(Divider), h(Item, { onClick: showInfoPage, icon: h('img', { src: 'images/mm-info-icon.svg' }), - text: 'Info & Help', + text: t('infoHelp'), }), h(Item, { onClick: showConfigPage, icon: h('img', { src: 'images/settings.svg' }), - text: 'Settings', + text: t('settings'), }), ]) } @@ -155,6 +155,6 @@ AccountMenu.prototype.indicateIfLoose = function (keyring) { try { // Sometimes keyrings aren't loaded yet: const type = keyring.type const isLoose = type !== 'HD Key Tree' - return isLoose ? h('.keyring-label', 'IMPORTED') : null + return isLoose ? h('.keyring-label', t('importedCaps')) : null } catch (e) { return } } diff --git a/ui/app/components/buy-button-subview.js b/ui/app/components/buy-button-subview.js index d5958787b..76da4fc9d 100644 --- a/ui/app/components/buy-button-subview.js +++ b/ui/app/components/buy-button-subview.js @@ -76,7 +76,7 @@ BuyButtonSubview.prototype.headerSubview = function () { paddingTop: '4px', paddingBottom: '4px', }, - }, 'Deposit Eth'), + }, t('depositEth')), ]), // loading indication @@ -118,7 +118,7 @@ BuyButtonSubview.prototype.headerSubview = function () { paddingTop: '4px', paddingBottom: '4px', }, - }, 'Select Service'), + }, t('selectService')), ]), ]) @@ -164,14 +164,14 @@ BuyButtonSubview.prototype.primarySubview = function () { style: { marginTop: '15px', }, - }, 'Borrow With Dharma (Beta)') + }, t('borrowDharma')) ) : null, ]) ) default: return ( - h('h2.error', 'Unknown network ID') + h('h2.error', t('unknownNetworkId')) ) } diff --git a/ui/app/components/coinbase-form.js b/ui/app/components/coinbase-form.js index f70208625..6532cb3bf 100644 --- a/ui/app/components/coinbase-form.js +++ b/ui/app/components/coinbase-form.js @@ -37,11 +37,11 @@ CoinbaseForm.prototype.render = function () { }, [ h('button.btn-green', { onClick: this.toCoinbase.bind(this), - }, 'Continue to Coinbase'), + }, t('continueToCoinbase')), h('button.btn-red', { onClick: () => props.dispatch(actions.goHome()), - }, 'Cancel'), + }, t('cancel')), ]), ]) } diff --git a/ui/app/components/copyButton.js b/ui/app/components/copyButton.js index a25d0719c..5d5be8feb 100644 --- a/ui/app/components/copyButton.js +++ b/ui/app/components/copyButton.js @@ -22,7 +22,7 @@ CopyButton.prototype.render = function () { const value = props.value const copied = state.copied - const message = copied ? 'Copied' : props.title || ' Copy ' + const message = copied ? t('copiedButton') : props.title || t('copyButton') return h('.copy-button', { style: { diff --git a/ui/app/components/copyable.js b/ui/app/components/copyable.js index a4f6f4bc6..690e44153 100644 --- a/ui/app/components/copyable.js +++ b/ui/app/components/copyable.js @@ -22,7 +22,7 @@ Copyable.prototype.render = function () { const { copied } = state return h(Tooltip, { - title: copied ? 'Copied!' : 'Copy', + title: copied ? t('copiedExclamation') : t('copy'), position: 'bottom', }, h('span', { style: { diff --git a/ui/app/components/customize-gas-modal/index.js b/ui/app/components/customize-gas-modal/index.js index 826d2cd4b..a5384daaf 100644 --- a/ui/app/components/customize-gas-modal/index.js +++ b/ui/app/components/customize-gas-modal/index.js @@ -146,7 +146,7 @@ CustomizeGasModal.prototype.validate = function ({ gasTotal, gasLimit }) { }) if (!balanceIsSufficient) { - error = 'Insufficient balance for current gas total' + error = t('balanceIsInsufficientGas') } const gasLimitTooLow = gasLimit && conversionGreaterThan( @@ -162,7 +162,7 @@ CustomizeGasModal.prototype.validate = function ({ gasTotal, gasLimit }) { ) if (gasLimitTooLow) { - error = 'Gas limit must be at least 21000' + error = t('gasLimitTooLow') } this.setState({ error }) @@ -239,7 +239,7 @@ CustomizeGasModal.prototype.render = function () { }, [ h('div.send-v2__customize-gas__header', {}, [ - h('div.send-v2__customize-gas__title', 'Customize Gas'), + h('div.send-v2__customize-gas__title', t('customGas')), h('div.send-v2__customize-gas__close', { onClick: hideModal, @@ -255,8 +255,8 @@ CustomizeGasModal.prototype.render = function () { // max: 1000, step: multiplyCurrencies(MIN_GAS_PRICE_GWEI, 10), onChange: value => this.convertAndSetGasPrice(value), - title: 'Gas Price (GWEI)', - copy: 'We calculate the suggested gas prices based on network success rates.', + title: t('gasPrice'), + copy: t('gasPriceCalculation'), }), h(GasModalCard, { @@ -265,8 +265,8 @@ CustomizeGasModal.prototype.render = function () { // max: 100000, step: 1, onChange: value => this.convertAndSetGasLimit(value), - title: 'Gas Limit', - copy: 'We calculate the suggested gas limit based on network success rates.', + title: t('gasLimit'), + copy: t('gasLimitCalculation'), }), ]), @@ -279,16 +279,16 @@ CustomizeGasModal.prototype.render = function () { h('div.send-v2__customize-gas__revert', { onClick: () => this.revert(), - }, ['Revert']), + }, [t('revert')]), h('div.send-v2__customize-gas__buttons', [ h('div.send-v2__customize-gas__cancel', { onClick: this.props.hideModal, - }, ['CANCEL']), + }, [t('cancelButton')]), h(`div.send-v2__customize-gas__save${error ? '__error' : ''}`, { onClick: () => !error && this.save(gasPrice, gasLimit, gasTotal), - }, ['SAVE']), + }, [t('saveButton')]), ]), ]), diff --git a/ui/app/components/dropdowns/components/account-dropdowns.js b/ui/app/components/dropdowns/components/account-dropdowns.js index f97ac0691..7ecec38d2 100644 --- a/ui/app/components/dropdowns/components/account-dropdowns.js +++ b/ui/app/components/dropdowns/components/account-dropdowns.js @@ -129,7 +129,7 @@ class AccountDropdowns extends Component { actions.showEditAccountModal(identity) }, }, [ - 'Edit', + t('editButton'), ]), ]), @@ -159,7 +159,7 @@ class AccountDropdowns extends Component { try { // Sometimes keyrings aren't loaded yet: const type = keyring.type const isLoose = type !== 'HD Key Tree' - return isLoose ? h('.keyring-label', 'LOOSE') : null + return isLoose ? h('.keyring-label', t('looseCaps')) : null } catch (e) { return } } @@ -217,7 +217,7 @@ class AccountDropdowns extends Component { fontSize: '16px', lineHeight: '23px', }, - }, 'Create Account'), + }, t('createAccount')), ], ), h( @@ -251,7 +251,7 @@ class AccountDropdowns extends Component { fontSize: '16px', lineHeight: '23px', }, - }, 'Import Account'), + }, t('importAccount')), ] ), ] @@ -302,7 +302,7 @@ class AccountDropdowns extends Component { menuItemStyles, ), }, - 'Account Details', + t('accDetails'), ), h( DropdownMenuItem, @@ -318,7 +318,7 @@ class AccountDropdowns extends Component { menuItemStyles, ), }, - 'View account on Etherscan', + t('etherscanView'), ), h( DropdownMenuItem, @@ -334,7 +334,7 @@ class AccountDropdowns extends Component { menuItemStyles, ), }, - 'Copy Address to clipboard', + t('copyAddress'), ), h( DropdownMenuItem, @@ -346,7 +346,7 @@ class AccountDropdowns extends Component { menuItemStyles, ), }, - 'Export Private Key', + t('exportPrivateKey'), ), h( DropdownMenuItem, @@ -361,7 +361,7 @@ class AccountDropdowns extends Component { menuItemStyles, ), }, - 'Add Token', + t('addToken'), ), ] @@ -479,4 +479,3 @@ function mapStateToProps (state) { } module.exports = connect(mapStateToProps, mapDispatchToProps)(AccountDropdowns) - diff --git a/ui/app/components/dropdowns/network-dropdown.js b/ui/app/components/dropdowns/network-dropdown.js index dfaa6b22c..02773fb46 100644 --- a/ui/app/components/dropdowns/network-dropdown.js +++ b/ui/app/components/dropdowns/network-dropdown.js @@ -93,13 +93,13 @@ NetworkDropdown.prototype.render = function () { }, [ h('div.network-dropdown-header', {}, [ - h('div.network-dropdown-title', {}, 'Networks'), + h('div.network-dropdown-title', {}, t('networks')), h('div.network-dropdown-divider'), h('div.network-dropdown-content', {}, - 'The default network for Ether transactions is Main Net.' + t('defaultNetwork') ), ]), @@ -121,7 +121,7 @@ NetworkDropdown.prototype.render = function () { style: { color: providerType === 'mainnet' ? '#ffffff' : '#9b9b9b', }, - }, 'Main Ethereum Network'), + }, t('mainnet')), ] ), @@ -143,7 +143,7 @@ NetworkDropdown.prototype.render = function () { style: { color: providerType === 'ropsten' ? '#ffffff' : '#9b9b9b', }, - }, 'Ropsten Test Network'), + }, t('ropsten')), ] ), @@ -165,7 +165,7 @@ NetworkDropdown.prototype.render = function () { style: { color: providerType === 'kovan' ? '#ffffff' : '#9b9b9b', }, - }, 'Kovan Test Network'), + }, t('kovan')), ] ), @@ -187,7 +187,7 @@ NetworkDropdown.prototype.render = function () { style: { color: providerType === 'rinkeby' ? '#ffffff' : '#9b9b9b', }, - }, 'Rinkeby Test Network'), + }, t('rinkeby')), ] ), @@ -209,7 +209,7 @@ NetworkDropdown.prototype.render = function () { style: { color: activeNetwork === 'http://localhost:8545' ? '#ffffff' : '#9b9b9b', }, - }, 'Localhost 8545'), + }, t('localhost')), ] ), @@ -233,7 +233,7 @@ NetworkDropdown.prototype.render = function () { style: { color: activeNetwork === 'custom' ? '#ffffff' : '#9b9b9b', }, - }, 'Custom RPC'), + }, t('customRPC')), ] ), @@ -248,15 +248,15 @@ NetworkDropdown.prototype.getNetworkName = function () { let name if (providerName === 'mainnet') { - name = 'Main Ethereum Network' + name = t('mainnet') } else if (providerName === 'ropsten') { - name = 'Ropsten Test Network' + name = t('ropsten') } else if (providerName === 'kovan') { - name = 'Kovan Test Network' + name = t('kovan') } else if (providerName === 'rinkeby') { - name = 'Rinkeby Test Network' + name = t('rinkeby') } else { - name = 'Unknown Private Network' + name = t('unknownNetwork') } return name diff --git a/ui/app/components/dropdowns/token-menu-dropdown.js b/ui/app/components/dropdowns/token-menu-dropdown.js index dc7a985e3..3dfcec5a8 100644 --- a/ui/app/components/dropdowns/token-menu-dropdown.js +++ b/ui/app/components/dropdowns/token-menu-dropdown.js @@ -43,7 +43,7 @@ TokenMenuDropdown.prototype.render = function () { showHideTokenConfirmationModal(this.props.token) this.props.onClose() }, - }, 'Hide Token'), + }, t('hideToken')), ]), ]), diff --git a/ui/app/components/ens-input.js b/ui/app/components/ens-input.js index 6553053f7..3e7a23369 100644 --- a/ui/app/components/ens-input.js +++ b/ui/app/components/ens-input.js @@ -89,13 +89,13 @@ EnsInput.prototype.lookupEnsName = function () { log.info(`ENS attempting to resolve name: ${recipient}`) this.ens.lookup(recipient.trim()) .then((address) => { - if (address === ZERO_ADDRESS) throw new Error('No address has been set for this name.') + if (address === ZERO_ADDRESS) throw new Error(t('noAddressForName')) if (address !== ensResolution) { this.setState({ loadingEns: false, ensResolution: address, nickname: recipient.trim(), - hoverText: address + '\nClick to Copy', + hoverText: address + '\n' + t('clickCopy'), ensFailure: false, }) } diff --git a/ui/app/components/hex-as-decimal-input.js b/ui/app/components/hex-as-decimal-input.js index 4a71e9585..07432a1f2 100644 --- a/ui/app/components/hex-as-decimal-input.js +++ b/ui/app/components/hex-as-decimal-input.js @@ -132,7 +132,7 @@ HexAsDecimalInput.prototype.constructWarning = function () { } else if (max) { message += `must be less than or equal to ${max}.` } else { - message += 'Invalid input.' + message += t('invalidInput') } return message diff --git a/ui/app/components/network.js b/ui/app/components/network.js index 3e91fa807..6cb1ff53d 100644 --- a/ui/app/components/network.js +++ b/ui/app/components/network.js @@ -33,7 +33,7 @@ Network.prototype.render = function () { onClick: (event) => this.props.onClick(event), }, [ h('img', { - title: 'Attempting to connect to blockchain.', + title: t('attemptingConnect'), style: { width: '27px', }, @@ -41,22 +41,22 @@ Network.prototype.render = function () { }), ]) } else if (providerName === 'mainnet') { - hoverText = 'Main Ethereum Network' + hoverText = t('mainnet') iconName = 'ethereum-network' } else if (providerName === 'ropsten') { - hoverText = 'Ropsten Test Network' + hoverText = t('ropsten') iconName = 'ropsten-test-network' } else if (parseInt(networkNumber) === 3) { - hoverText = 'Ropsten Test Network' + hoverText = t('ropsten') iconName = 'ropsten-test-network' } else if (providerName === 'kovan') { - hoverText = 'Kovan Test Network' + hoverText = t('kovan') iconName = 'kovan-test-network' } else if (providerName === 'rinkeby') { - hoverText = 'Rinkeby Test Network' + hoverText = t('rinkeby') iconName = 'rinkeby-test-network' } else { - hoverText = 'Unknown Private Network' + hoverText = t('unknownNetwork') iconName = 'unknown-private-network' } @@ -84,7 +84,7 @@ Network.prototype.render = function () { backgroundColor: '#038789', // $blue-lagoon nonSelectBackgroundColor: '#15afb2', }), - h('.network-name', 'Main Network'), + h('.network-name', t('mainnet')), h('i.fa.fa-chevron-down.fa-lg.network-caret'), ]) case 'ropsten-test-network': @@ -93,7 +93,7 @@ Network.prototype.render = function () { backgroundColor: '#e91550', // $crimson nonSelectBackgroundColor: '#ec2c50', }), - h('.network-name', 'Ropsten Test Net'), + h('.network-name', t('ropsten')), h('i.fa.fa-chevron-down.fa-lg.network-caret'), ]) case 'kovan-test-network': @@ -102,7 +102,7 @@ Network.prototype.render = function () { backgroundColor: '#690496', // $purple nonSelectBackgroundColor: '#b039f3', }), - h('.network-name', 'Kovan Test Net'), + h('.network-name', t('kovan')), h('i.fa.fa-chevron-down.fa-lg.network-caret'), ]) case 'rinkeby-test-network': @@ -111,7 +111,7 @@ Network.prototype.render = function () { backgroundColor: '#ebb33f', // $tulip-tree nonSelectBackgroundColor: '#ecb23e', }), - h('.network-name', 'Rinkeby Test Net'), + h('.network-name', t('rinkeby')), h('i.fa.fa-chevron-down.fa-lg.network-caret'), ]) default: @@ -123,7 +123,7 @@ Network.prototype.render = function () { }, }), - h('.network-name', 'Private Network'), + h('.network-name', t('privateNetwork')), h('i.fa.fa-chevron-down.fa-lg.network-caret'), ]) } diff --git a/ui/app/components/notice.js b/ui/app/components/notice.js index 941ac33e6..5bda329ed 100644 --- a/ui/app/components/notice.js +++ b/ui/app/components/notice.js @@ -111,7 +111,7 @@ Notice.prototype.render = function () { style: { marginTop: '18px', }, - }, 'Accept'), + }, t('accept')), ]) ) } diff --git a/ui/app/components/pending-msg-details.js b/ui/app/components/pending-msg-details.js index 718a22de0..3ea063c3c 100644 --- a/ui/app/components/pending-msg-details.js +++ b/ui/app/components/pending-msg-details.js @@ -39,7 +39,7 @@ PendingMsgDetails.prototype.render = function () { // message data h('.tx-data.flex-column.flex-justify-center.flex-grow.select-none', [ h('.flex-column.flex-space-between', [ - h('label.font-small', 'MESSAGE'), + h('label.font-small', t('messageCaps')), h('span.font-small', msgParams.data), ]), ]), @@ -47,4 +47,3 @@ PendingMsgDetails.prototype.render = function () { ]) ) } - diff --git a/ui/app/components/pending-msg.js b/ui/app/components/pending-msg.js index 834719c53..236849c18 100644 --- a/ui/app/components/pending-msg.js +++ b/ui/app/components/pending-msg.js @@ -29,17 +29,14 @@ PendingMsg.prototype.render = function () { fontWeight: 'bold', textAlign: 'center', }, - }, 'Sign Message'), + }, t('signMessage')), h('.error', { style: { margin: '10px', }, }, [ - `Signing this message can have - dangerous side effects. Only sign messages from - sites you fully trust with your entire account. - This dangerous method will be removed in a future version. `, + t('signNotice'), h('a', { href: 'https://medium.com/metamask/the-new-secure-way-to-sign-data-in-your-browser-6af9dd2a1527', style: { color: 'rgb(247, 134, 28)' }, @@ -48,7 +45,7 @@ PendingMsg.prototype.render = function () { const url = 'https://medium.com/metamask/the-new-secure-way-to-sign-data-in-your-browser-6af9dd2a1527' global.platform.openWindow({ url }) }, - }, 'Read more here.'), + }, t('readMore')), ]), // message details @@ -58,13 +55,12 @@ PendingMsg.prototype.render = function () { h('.flex-row.flex-space-around', [ h('button', { onClick: state.cancelMessage, - }, 'Cancel'), + }, t('cancel')), h('button', { onClick: state.signMessage, - }, 'Sign'), + }, t('sign')), ]), ]) ) } - diff --git a/ui/app/components/pending-personal-msg-details.js b/ui/app/components/pending-personal-msg-details.js index 1050513f2..30c475347 100644 --- a/ui/app/components/pending-personal-msg-details.js +++ b/ui/app/components/pending-personal-msg-details.js @@ -45,7 +45,7 @@ PendingMsgDetails.prototype.render = function () { height: '260px', }, }, [ - h('label.font-small', { style: { display: 'block' } }, 'MESSAGE'), + h('label.font-small', { style: { display: 'block' } }, t('messageCaps')), h(BinaryRenderer, { value: data, style: { @@ -57,4 +57,3 @@ PendingMsgDetails.prototype.render = function () { ]) ) } - diff --git a/ui/app/components/pending-typed-msg-details.js b/ui/app/components/pending-typed-msg-details.js index b5fd29f71..a3381174d 100644 --- a/ui/app/components/pending-typed-msg-details.js +++ b/ui/app/components/pending-typed-msg-details.js @@ -45,7 +45,7 @@ PendingMsgDetails.prototype.render = function () { height: '260px', }, }, [ - h('label.font-small', { style: { display: 'block' } }, 'YOU ARE SIGNING'), + h('label.font-small', { style: { display: 'block' } }, t('youSignCaps')), h(TypedMessageRenderer, { value: data, style: { diff --git a/ui/app/components/pending-typed-msg.js b/ui/app/components/pending-typed-msg.js index f8926d0a3..73702d0f8 100644 --- a/ui/app/components/pending-typed-msg.js +++ b/ui/app/components/pending-typed-msg.js @@ -26,7 +26,7 @@ PendingMsg.prototype.render = function () { fontWeight: 'bold', textAlign: 'center', }, - }, 'Sign Message'), + }, t('signMessage')), // message details h(PendingTxDetails, state), @@ -35,10 +35,10 @@ PendingMsg.prototype.render = function () { h('.flex-row.flex-space-around', [ h('button', { onClick: state.cancelTypedMessage, - }, 'Cancel'), + }, t('cancelButton')), h('button', { onClick: state.signTypedMessage, - }, 'Sign'), + }, t('signButton')), ]), ]) diff --git a/ui/app/components/shapeshift-form.js b/ui/app/components/shapeshift-form.js index 2270b8236..773ff227c 100644 --- a/ui/app/components/shapeshift-form.js +++ b/ui/app/components/shapeshift-form.js @@ -14,7 +14,7 @@ function mapStateToProps (state) { tokenExchangeRates, selectedAddress, } = state.metamask - + return { coinOptions, tokenExchangeRates, @@ -92,7 +92,7 @@ ShapeshiftForm.prototype.onBuyWithShapeShift = function () { })) .catch(() => this.setState({ showQrCode: false, - errorMessage: 'Invalid Request', + errorMessage: t('invalidRequest'), isLoading: false, })) } @@ -124,10 +124,10 @@ ShapeshiftForm.prototype.renderMarketInfo = function () { return h('div.shapeshift-form__metadata', {}, [ - this.renderMetadata('Status', limit ? 'Available' : 'Unavailable'), - this.renderMetadata('Limit', limit), - this.renderMetadata('Exchange Rate', rate), - this.renderMetadata('Minimum', minimum), + this.renderMetadata(t('status'), limit ? t('available') : t('unavailable')), + this.renderMetadata(t('limit'), limit), + this.renderMetadata(t('exchangeRate'), rate), + this.renderMetadata(t('min'), minimum), ]) } @@ -141,7 +141,7 @@ ShapeshiftForm.prototype.renderQrCode = function () { return h('div.shapeshift-form', {}, [ h('div.shapeshift-form__deposit-instruction', [ - 'Deposit your BTC to the address below:', + t('depositBTC'), ]), h('div', depositAddress), @@ -178,7 +178,7 @@ ShapeshiftForm.prototype.render = function () { h('div.shapeshift-form__selector', [ - h('div.shapeshift-form__selector-label', 'Deposit'), + h('div.shapeshift-form__selector-label', t('deposit')), h(SimpleDropdown, { selectedOption: this.state.depositCoin, @@ -198,7 +198,7 @@ ShapeshiftForm.prototype.render = function () { h('div.shapeshift-form__selector', [ h('div.shapeshift-form__selector-label', [ - 'Receive', + t('receive'), ]), h('div.shapeshift-form__selector-input', ['ETH']), @@ -214,7 +214,7 @@ ShapeshiftForm.prototype.render = function () { }, [ h('div.shapeshift-form__address-input-label', [ - 'Your Refund Address', + t('refundAddress'), ]), h('input.shapeshift-form__address-input', { @@ -236,7 +236,7 @@ ShapeshiftForm.prototype.render = function () { className: btnClass, disabled: !token, onClick: () => this.onBuyWithShapeShift(), - }, ['Buy']), + }, [t('buyButton')]), ]) } diff --git a/ui/app/components/shift-list-item.js b/ui/app/components/shift-list-item.js index 111a77df4..6e5be641f 100644 --- a/ui/app/components/shift-list-item.js +++ b/ui/app/components/shift-list-item.js @@ -141,7 +141,7 @@ ShiftListItem.prototype.renderInfo = function () { width: '100%', }, }, `${props.depositType} to ETH via ShapeShift`), - h('div', 'No deposits received'), + h('div', t('noDeposits')), h('div', { style: { fontSize: 'x-small', @@ -164,7 +164,7 @@ ShiftListItem.prototype.renderInfo = function () { width: '100%', }, }, `${props.depositType} to ETH via ShapeShift`), - h('div', 'Conversion in progress'), + h('div', t('conversionProgress')), h('div', { style: { fontSize: 'x-small', @@ -189,7 +189,7 @@ ShiftListItem.prototype.renderInfo = function () { color: '#ABA9AA', width: '100%', }, - }, 'From ShapeShift'), + }, t('fromShapeShift')), h('div', formatDate(props.time)), h('div', { style: { @@ -201,7 +201,7 @@ ShiftListItem.prototype.renderInfo = function () { ]) case 'failed': - return h('span.error', '(Failed)') + return h('span.error', '(' + t('failed') + ')') default: return '' } diff --git a/ui/app/components/signature-request.js b/ui/app/components/signature-request.js index c5cc23aa8..459d6a1a2 100644 --- a/ui/app/components/signature-request.js +++ b/ui/app/components/signature-request.js @@ -54,7 +54,7 @@ SignatureRequest.prototype.renderHeader = function () { h('div.request-signature__header-background'), - h('div.request-signature__header__text', 'Signature Request'), + h('div.request-signature__header__text', t('sigRequest')), h('div.request-signature__header__tip-container', [ h('div.request-signature__header__tip'), @@ -75,7 +75,7 @@ SignatureRequest.prototype.renderAccountDropdown = function () { return h('div.request-signature__account', [ - h('div.request-signature__account-text', ['Account:']), + h('div.request-signature__account-text', [t('account')]), h(AccountDropdownMini, { selectedAccount, @@ -102,7 +102,7 @@ SignatureRequest.prototype.renderBalance = function () { return h('div.request-signature__balance', [ - h('div.request-signature__balance-text', ['Balance:']), + h('div.request-signature__balance-text', [t('balance')]), h('div.request-signature__balance-value', `${balanceInEther} ETH`), @@ -136,7 +136,7 @@ SignatureRequest.prototype.renderRequestInfo = function () { return h('div.request-signature__request-info', [ h('div.request-signature__headline', [ - `Your signature is being requested`, + t('yourSigRequested'), ]), ]) @@ -154,21 +154,18 @@ SignatureRequest.prototype.msgHexToText = function (hex) { SignatureRequest.prototype.renderBody = function () { let rows - let notice = 'You are signing:' + let notice = t('youSign') const { txData } = this.props const { type, msgParams: { data } } = txData if (type === 'personal_sign') { - rows = [{ name: 'Message', value: this.msgHexToText(data) }] + rows = [{ name: t('message'), value: this.msgHexToText(data) }] } else if (type === 'eth_signTypedData') { rows = data } else if (type === 'eth_sign') { - rows = [{ name: 'Message', value: data }] - notice = `Signing this message can have - dangerous side effects. Only sign messages from - sites you fully trust with your entire account. - This dangerous method will be removed in a future version. ` + rows = [{ name: t('message'), value: data }] + notice = t('signNotice') } return h('div.request-signature__body', {}, [ @@ -227,10 +224,10 @@ SignatureRequest.prototype.renderFooter = function () { return h('div.request-signature__footer', [ h('button.request-signature__footer__cancel-button', { onClick: cancel, - }, 'CANCEL'), + }, t('cancelButton')), h('button.request-signature__footer__sign-button', { onClick: sign, - }, 'SIGN'), + }, t('signButton')), ]) } @@ -250,4 +247,3 @@ SignatureRequest.prototype.render = function () { ) } - diff --git a/ui/app/components/token-list.js b/ui/app/components/token-list.js index 8e06e0f27..a25566e64 100644 --- a/ui/app/components/token-list.js +++ b/ui/app/components/token-list.js @@ -42,7 +42,7 @@ TokenList.prototype.render = function () { const { tokens, isLoading, error } = state if (isLoading) { - return this.message('Loading Tokens...') + return this.message(t('loadingTokens')) } if (error) { @@ -52,7 +52,7 @@ TokenList.prototype.render = function () { padding: '80px', }, }, [ - 'We had trouble loading your token balances. You can view them ', + t('troubleTokenBalances'), h('span.hotFix', { style: { color: 'rgba(247, 134, 28, 1)', @@ -63,7 +63,7 @@ TokenList.prototype.render = function () { url: `https://ethplorer.io/address/${userAddress}`, }) }, - }, 'here'), + }, t('here')), ]) } diff --git a/ui/app/components/transaction-list-item.js b/ui/app/components/transaction-list-item.js index 4e3d2cb93..10d4236cb 100644 --- a/ui/app/components/transaction-list-item.js +++ b/ui/app/components/transaction-list-item.js @@ -85,7 +85,7 @@ TransactionListItem.prototype.render = function () { ]), h(Tooltip, { - title: 'Transaction Number', + title: t('transactionNumber'), position: 'right', }, [ h('span', { @@ -142,12 +142,12 @@ TransactionListItem.prototype.render = function () { style: { paddingRight: '2px', }, - }, 'Taking too long?'), + }, t('takesTooLong')), h('div', { style: { textDecoration: 'underline', }, - }, 'Retry with a higher gas price here'), + }, t('retryWithMoreGas')), ]), ]) ) @@ -176,11 +176,11 @@ function recipientField (txParams, transaction, isTx, isMsg) { let message if (isMsg) { - message = 'Signature Requested' + message = t('sigRequested') } else if (txParams.to) { message = addressSummary(txParams.to) } else { - message = 'Contract Published' + message = t('contractPublished') } return h('div', { @@ -203,7 +203,7 @@ function renderErrorOrWarning (transaction) { // show rejected if (status === 'rejected') { - return h('span.error', ' (Rejected)') + return h('span.error', ' (' + t('rejected') + ')') } if (transaction.err || transaction.warning) { const { err, warning = {} } = transaction @@ -219,7 +219,7 @@ function renderErrorOrWarning (transaction) { title: message, position: 'bottom', }, [ - h(`span.error`, ` (Failed)`), + h(`span.error`, ` (` + t('failed') + `)`), ]) ) } @@ -231,7 +231,7 @@ function renderErrorOrWarning (transaction) { title: message, position: 'bottom', }, [ - h(`span.warning`, ` (Warning)`), + h(`span.warning`, ` (` + t('warning') + `)`), ]) } } diff --git a/ui/app/components/transaction-list.js b/ui/app/components/transaction-list.js index 69b72614c..cb3f8097b 100644 --- a/ui/app/components/transaction-list.js +++ b/ui/app/components/transaction-list.js @@ -78,10 +78,9 @@ TransactionList.prototype.render = function () { style: { marginTop: '50px', }, - }, 'No transaction history.'), + }, t('noTransactionHistory')), ]), ]), ]) ) } - diff --git a/ui/app/components/tx-list-item.js b/ui/app/components/tx-list-item.js index 7ccc5c315..d53277925 100644 --- a/ui/app/components/tx-list-item.js +++ b/ui/app/components/tx-list-item.js @@ -63,7 +63,7 @@ TxListItem.prototype.getAddressText = function () { default: return address ? `${address.slice(0, 10)}...${address.slice(-4)}` - : 'Contract Published' + : t('contractPublished') } } diff --git a/ui/app/components/tx-list.js b/ui/app/components/tx-list.js index 84cd0f093..6076ab5d3 100644 --- a/ui/app/components/tx-list.js +++ b/ui/app/components/tx-list.js @@ -55,7 +55,7 @@ TxList.prototype.renderTransaction = function () { : [h( 'div.tx-list-item.tx-list-item--empty', { key: 'tx-list-none' }, - [ 'No Transactions' ], + [ t('noTransactions') ], )] } @@ -110,7 +110,7 @@ TxList.prototype.renderTransactionListItem = function (transaction, conversionRa if (isUnapproved) { opts.onClick = () => showConfTxPage({id: transActionId}) - opts.transactionStatus = 'Not Started' + opts.transactionStatus = t('Not Started') } else if (transactionHash) { opts.onClick = () => this.view(transactionHash, transactionNetworkId) } diff --git a/ui/app/components/tx-view.js b/ui/app/components/tx-view.js index b25d8e0f9..423234d4f 100644 --- a/ui/app/components/tx-view.js +++ b/ui/app/components/tx-view.js @@ -72,21 +72,21 @@ TxView.prototype.renderButtons = function () { onClick: () => showModal({ name: 'DEPOSIT_ETHER', }), - }, 'DEPOSIT'), + }, t('depositButton')), h('button.btn-clear.hero-balance-button', { style: { marginLeft: '0.8em', }, onClick: showSendPage, - }, 'SEND'), + }, t('sendButton')), ]) ) : ( h('div.flex-row.flex-center.hero-balance-buttons', [ h('button.btn-clear.hero-balance-button', { onClick: showSendTokenPage, - }, 'SEND'), + }, t('sendButton')), ]) ) } diff --git a/ui/app/components/wallet-view.js b/ui/app/components/wallet-view.js index b1ef83cee..3d9c01c6e 100644 --- a/ui/app/components/wallet-view.js +++ b/ui/app/components/wallet-view.js @@ -113,7 +113,7 @@ WalletView.prototype.render = function () { onClick: hideSidebar, }), - h('div.wallet-view__keyring-label', isLoose ? 'IMPORTED' : ''), + h('div.wallet-view__keyring-label', isLoose ? t('importedCaps') : ''), h('div.flex-column.flex-center.wallet-view__name-container', { style: { margin: '0 auto' }, @@ -130,7 +130,7 @@ WalletView.prototype.render = function () { selectedIdentity.name, ]), - h('button.btn-clear.wallet-view__details-button', 'DETAILS'), + h('button.btn-clear.wallet-view__details-button', t('detailsCaps')), ]), ]), @@ -142,7 +142,7 @@ WalletView.prototype.render = function () { setTimeout(() => this.setState({ hasCopied: false }), 3000) }, }, [ - this.state.hasCopied && 'Copied to Clipboard', + this.state.hasCopied && t('copiedClipboard'), !this.state.hasCopied && `${selectedAddress.slice(0, 4)}...${selectedAddress.slice(-4)}`, h('i.fa.fa-clipboard', { style: { marginLeft: '8px' } }), ]), @@ -156,7 +156,7 @@ WalletView.prototype.render = function () { showAddTokenPage() hideSidebar() }, - }, 'Add Token'), + }, t('addToken')), ]) } diff --git a/ui/app/first-time/init-menu.js b/ui/app/first-time/init-menu.js index b4587f1ee..c496690a7 100644 --- a/ui/app/first-time/init-menu.js +++ b/ui/app/first-time/init-menu.js @@ -10,6 +10,13 @@ const getCaretCoordinates = require('textarea-caret') let isSubmitting = false +let t = chrome.i18n.getMessage || (function() { + let msg = require('../../../app/_locales/en/messages.json'); + return (function(key) { + return msg[key].message; + }); +})(); + module.exports = connect(mapStateToProps)(InitializeMenuScreen) inherits(InitializeMenuScreen, Component) @@ -57,7 +64,7 @@ InitializeMenuScreen.prototype.renderMenu = function (state) { color: '#7F8082', marginBottom: 10, }, - }, 'MetaMask'), + }, t('appName')), h('div', [ @@ -67,10 +74,10 @@ InitializeMenuScreen.prototype.renderMenu = function (state) { color: '#7F8082', display: 'inline', }, - }, 'Encrypt your new DEN'), + }, t('encryptNewDen')), h(Tooltip, { - title: 'Your DEN is your password-encrypted storage within MetaMask.', + title: t('denExplainer'), }, [ h('i.fa.fa-question-circle.pointer', { style: { @@ -90,7 +97,7 @@ InitializeMenuScreen.prototype.renderMenu = function (state) { h('input.large-input.letter-spacey', { type: 'password', id: 'password-box', - placeholder: 'New Password (min 8 chars)', + placeholder: t('newPassword'), onInput: this.inputChanged.bind(this), style: { width: 260, @@ -102,7 +109,7 @@ InitializeMenuScreen.prototype.renderMenu = function (state) { h('input.large-input.letter-spacey', { type: 'password', id: 'password-box-confirm', - placeholder: 'Confirm Password', + placeholder: t('confirmPassword'), onKeyPress: this.createVaultOnEnter.bind(this), onInput: this.inputChanged.bind(this), style: { @@ -117,7 +124,7 @@ InitializeMenuScreen.prototype.renderMenu = function (state) { style: { margin: 12, }, - }, 'Create'), + }, t('createDen')), h('.flex-row.flex-center.flex-grow', [ h('p.pointer', { @@ -127,7 +134,7 @@ InitializeMenuScreen.prototype.renderMenu = function (state) { color: 'rgb(247, 134, 28)', textDecoration: 'underline', }, - }, 'Import Existing DEN'), + }, t('importDen')), ]), ]) @@ -156,12 +163,12 @@ InitializeMenuScreen.prototype.createNewVaultAndKeychain = function () { var passwordConfirm = passwordConfirmBox.value if (password.length < 8) { - this.warning = 'password not long enough' + this.warning = t('passwordShort') this.props.dispatch(actions.displayWarning(this.warning)) return } if (password !== passwordConfirm) { - this.warning = 'passwords don\'t match' + this.warning = t('passwordMismatch') this.props.dispatch(actions.displayWarning(this.warning)) return } -- cgit v1.2.3 From 03c64ba8a646cbc5a62f2b2a8c5881bb4a4bda60 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Tue, 23 Jan 2018 15:45:33 -0800 Subject: Add unlimitedStorage option to manifest --- app/manifest.json | 1 + 1 file changed, 1 insertion(+) diff --git a/app/manifest.json b/app/manifest.json index d795a225a..13ba074e7 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -60,6 +60,7 @@ "http://localhost:8545/", "https://*.infura.io/" ], + "unlimitedStorage": true, "web_accessible_resources": [ "scripts/inpage.js" ], -- cgit v1.2.3 From 456dfdb9fdc0b7b0637d50808beb85ae33602f5b Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Tue, 23 Jan 2018 16:26:50 -0800 Subject: Modify @heyellieday's work to use storage.local to replace main storage --- app/scripts/background.js | 15 ++++++++------- app/scripts/lib/local-store.js | 25 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 app/scripts/lib/local-store.js diff --git a/app/scripts/background.js b/app/scripts/background.js index d9a2b0a6e..9790129aa 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -4,7 +4,7 @@ const pump = require('pump') const log = require('loglevel') const extension = require('extensionizer') const LocalStorageStore = require('obs-store/lib/localStorage') -const ExtensionStore = require('./lib/extension-store') +const LocalStore = require('./lib/local-store') const storeTransform = require('obs-store/lib/transform') const asStream = require('obs-store/lib/asStream') const ExtensionPlatform = require('./platforms/extension') @@ -29,7 +29,7 @@ let popupIsOpen = false // state persistence const diskStore = new LocalStorageStore({ storageKey: STORAGE_KEY }) -const extensionStore = new ExtensionStore() +const localStore = new LocalStore() // initialization flow initialize().catch(log.error) @@ -51,9 +51,10 @@ async function loadStateFromPersistence () { let versionedData = diskStore.getState() || migrator.generateInitialState(firstTimeState) // fetch from extension store and merge in data - if (extensionStore.isSupported && extensionStore.isEnabled) { - const extensionData = await extensionStore.fetch() // TODO: handle possible exceptions (https://developer.chrome.com/apps/runtime#property-lastError) - versionedData = { ...versionedData, ...extensionData } + if (localStore.isSupported) { + const localData = await localStore.get() + // TODO: handle possible exceptions (https://developer.chrome.com/apps/runtime#property-lastError) + versionedData = localData || versionedData } // migrate data @@ -96,8 +97,8 @@ function setupController (initState) { } function syncDataWithExtension(state) { - if (extensionStore.isSupported && extensionStore.isEnabled) { - extensionStore.sync(state) // TODO: handle possible exceptions (https://developer.chrome.com/apps/runtime#property-lastError) + if (localStore.isSupported) { + localStore.set(state) // TODO: handle possible exceptions (https://developer.chrome.com/apps/runtime#property-lastError) } return state } diff --git a/app/scripts/lib/local-store.js b/app/scripts/lib/local-store.js new file mode 100644 index 000000000..32faac96b --- /dev/null +++ b/app/scripts/lib/local-store.js @@ -0,0 +1,25 @@ +// We should not rely on local storage in an extension! +// We should use this instead! +// https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/storage/local + +const extension = require('extensionizer') +const STORAGE_KEY = 'metamask-config' + +module.exports = class ExtensionStore { + constructor() { + this.isSupported = !!(extension.storage.local) + if (!this.isSupported) { + log.error('Storage local API not available.') + } + } + async get() { + return new Promise((resolve) => { + extension.storage.local.get(STORAGE_KEY, resolve) + }) + } + async set(state) { + return new Promise((resolve) => { + extension.storage.local.set(state, resolve) + }) + } +} -- cgit v1.2.3 From 99898ac77594d8fe6d4d2aa5bc3e3ba6492f4a10 Mon Sep 17 00:00:00 2001 From: Nick Doiron Date: Tue, 23 Jan 2018 22:14:47 -1000 Subject: better organization of locale file; i18n in more view files --- app/_locales/en/messages.json | 631 +++++++++++++++++---- ui/app/accounts/import/json.js | 14 +- ui/app/accounts/import/private-key.js | 6 +- ui/app/accounts/import/seed.js | 5 +- ui/app/accounts/new-account/create-form.js | 8 +- ui/app/accounts/new-account/index.js | 8 +- ui/app/components/customize-gas-modal/index.js | 4 +- .../dropdowns/components/account-dropdowns.js | 2 +- ui/app/components/modals/account-details-modal.js | 4 +- .../components/modals/account-modal-container.js | 2 +- ui/app/components/modals/buy-options-modal.js | 14 +- ui/app/components/modals/deposit-ether-modal.js | 29 +- .../components/modals/edit-account-name-modal.js | 4 +- .../components/modals/export-private-key-modal.js | 15 +- .../modals/hide-token-confirmation-modal.js | 8 +- ui/app/components/modals/modal.js | 10 +- ui/app/components/modals/new-account-modal.js | 12 +- .../pending-tx/confirm-deploy-contract.js | 20 +- ui/app/components/pending-tx/confirm-send-ether.js | 18 +- ui/app/components/pending-tx/confirm-send-token.js | 26 +- ui/app/components/pending-typed-msg.js | 4 +- ui/app/components/send-token/index.js | 32 +- ui/app/components/send/gas-fee-display-v2.js | 3 +- ui/app/components/send/gas-tooltip.js | 3 +- ui/app/components/send/to-autocomplete.js | 3 +- ui/app/components/signature-request.js | 4 +- 26 files changed, 629 insertions(+), 260 deletions(-) diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 6967a44d2..54f266318 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -1,71 +1,224 @@ { - "appName": { - "message": "MetaMask", - "description": "The name of the application" + "accept": { + "message": "Accept" + }, + "account": { + "message": "Account:" + }, + "accDetails": { + "message": "Account Details" + }, + "accountName": { + "message": "Account Name" + }, + "address": { + "message": "Address" + }, + "addToken": { + "message": "Add Token" + }, + "amountPlusGas": { + "message": "Amount + Gas" }, "appDescription": { "message": "Ethereum Identity Management", "description": "The description of the application" }, - "encryptNewDen": { - "message": "Encrypt your new DEN" + "appName": { + "message": "MetaMask", + "description": "The name of the application" }, - "denExplainer": { - "message": "Your DEN is your password-encrypted storage within MetaMask." + "attemptingConnect": { + "message": "Attempting to connect to blockchain." }, - "importDen": { - "message": "Import Existing DEN" + "available": { + "message": "Available" }, - "createDen": { - "message": "Create" + "back": { + "message": "Back" }, - "newPassword": { - "message": "New Password (min 8 chars)" + "balance": { + "message": "Balance:" + }, + "balanceIsInsufficientGas": { + "message": "Insufficient balance for current gas total" + }, + "borrowDharma": { + "message": "Borrow With Dharma (Beta)" + }, + "buyButton": { + "message": "Buy" + }, + "buyCoinbase": { + "message": "Buy on Coinbase" + }, + "buyCoinbaseExplainer": { + "message": "Coinbase is the world’s most popular way to buy and sell bitcoin, ethereum, and litecoin." + }, + "cancel": { + "message": "Cancel" + }, + "cancelCaps": { + "message": "CANCEL" + }, + "clickCopy": { + "message": "Click to Copy" + }, + "confirm": { + "message": "Confirm" + }, + "confirmCaps": { + "message": "CONFIRM" + }, + "confirmContract": { + "message": "Confirm Contract" }, "confirmPassword": { "message": "Confirm Password" }, - "passwordMismatch": { - "message": "passwords don't match" + "confirmPasswordSmall": { + "message": "confirm password" }, - "passwordShort": { - "message": "password not long enough" + "continueToCoinbase": { + "message": "Continue to Coinbase" }, - "myAccounts": { - "message": "My Accounts" + "contractPublished": { + "message": "Contract Published" }, - "logout": { - "message": "Log out" + "conversionProgress": { + "message": "Conversion in progress" + }, + "copiedButton": { + "message": "Copied" + }, + "copiedClipboard": { + "message": "Copied to Clipboard" + }, + "copiedExclamation": { + "message": "Copied!" + }, + "copy": { + "message": "Copy" + }, + "copyAddress": { + "message": "Copy Address to clipboard" + }, + "copyButton": { + "message": " Copy " + }, + "copyPrivateKey": { + "message": "This is your private key (click to copy)" }, "createAccount": { "message": "Create Account" }, - "importAccount": { - "message": "Import Account" + "createCaps": { + "message": "CREATE" }, - "account": { - "message": "Account:" + "createDen": { + "message": "Create" }, - "infoHelp": { - "message": "Info & Help" + "customGas": { + "message": "Customize Gas" }, - "settings": { - "message": "Settings" + "customize": { + "message": "Customize" }, - "importedCaps": { - "message": "IMPORTED" + "customRPC": { + "message": "Custom RPC" }, - "saveButton": { - "message": "SAVE" + "defaultNetwork": { + "message": "The default network for Ether transactions is Main Net." }, - "cancelButton": { - "message": "CANCEL" + "denExplainer": { + "message": "Your DEN is your password-encrypted storage within MetaMask." }, - "signButton": { - "message": "SIGN" + "deposit": { + "message": "Deposit" }, - "revert": { - "message": "Revert" + "depositBTC": { + "message": "Deposit your BTC to the address below:" + }, + "depositButton": { + "message": "DEPOSIT" + }, + "depositEth": { + "message": "Deposit Eth" + }, + "depositEther": { + "message": "Deposit Ether" + }, + "depositFiat": { + "message": "Deposit with Fiat" + }, + "depositFromAccount": { + "message": "Deposit from another account" + }, + "depositShapeShift": { + "message": "Deposit with ShapeShift" + }, + "depositShapeShiftExplainer": { + "message": "If you own other cryptocurrencies, you can trade and deposit Ether directly into your MetaMask wallet. No Account Needed." + }, + "detailsCaps": { + "message": "DETAILS" + }, + "directDeposit": { + "message": "Direct Deposit" + }, + "directDepositEther": { + "message": "Directly Deposit Ether" + }, + "directDepositEtherExplainer": { + "message": "If you already have some Ether, the quickest way to get Ether in your new wallet by direct deposit." + }, + "done": { + "message": "Done" + }, + "editAccountName": { + "message": "Edit Account Name" + }, + "editCaps": { + "message": "EDIT" + }, + "encryptNewDen": { + "message": "Encrypt your new DEN" + }, + "enterPassword": { + "message": "Enter password" + }, + "etherscanView": { + "message": "View account on Etherscan" + }, + "exchangeRate": { + "message": "Exchange Rate" + }, + "exportPrivateKey": { + "message": "Export Private Key" + }, + "exportPrivateKeyLower": { + "message": "Export private key" + }, + "exportPrivateKeyWarning": { + "message": "Export private keys at your own risk." + }, + "failed": { + "message": "Failed" + }, + "fileImportFail": { + "message": "File import not working? Click here!" + }, + "from": { + "message": "From" + }, + "fromShapeShift": { + "message": "From ShapeShift" + }, + "gasFee": { + "message": "Gas Fee" + }, + "gasFeeSpecific": { + "message": "Gas fee:" }, "gasLimit": { "message": "Gas Limit" @@ -73,103 +226,331 @@ "gasLimitCalculation": { "message": "We calculate the suggested gas limit based on network success rates." }, + "gasLimitRequired": { + "message": "Gas Limit Required" + }, + "gasLimitTooLow": { + "message": "Gas limit must be at least 21000" + }, "gasPrice": { "message": "Gas Price (GWEI)" }, "gasPriceCalculation": { "message": "We calculate the suggested gas prices based on network success rates." }, - "customGas": { - "message": "Customize Gas" + "gasPriceRequired": { + "message": "Gas Price Required" }, - "balanceIsInsufficientGas": { - "message": "Insufficient balance for current gas total" + "getEther": { + "message": "Get Ether" }, - "gasLimitTooLow": { - "message": "Gas limit must be at least 21000" + "here": { + "message": "here" + }, + "hideCaps": { + "message": "HIDE" + }, + "hideToken": { + "message": "Hide Token" + }, + "hideTokenPrompt": { + "message": "Hide Token?" + }, + "howToDeposit": { + "message": "How would you like to deposit Ether?" + }, + "import": { + "message": "Import" }, - "editButton": { - "message": "Edit" + "importAccount": { + "message": "Import Account" + }, + "importAnAccount": { + "message": "Import an account" + }, + "importCaps": { + "message": "IMPORT" + }, + "importDen": { + "message": "Import Existing DEN" + }, + "importedCaps": { + "message": "IMPORTED" + }, + "infoHelp": { + "message": "Info & Help" + }, + "invalidAddress": { + "message": "Invalid address" + }, + "invalidGasParams": { + "message": "Invalid Gas Parameters" + }, + "invalidInput": { + "message": "Invalid input." + }, + "invalidRequest": { + "message": "Invalid Request" + }, + "kovan": { + "message": "Kovan Test Network" + }, + "limit": { + "message": "Limit" + }, + "loading": { + "message": "Loading..." + }, + "loadingTokens": { + "message": "Loading Tokens..." + }, + "localhost": { + "message": "Localhost 8545" + }, + "logout": { + "message": "Log out" }, "looseCaps": { "message": "LOOSE" }, - "addToken": "Add Token", - "exportPrivateKey": "Export Private Key", - "copyAddress": "Copy Address to clipboard", - "etherscanView": "View account on Etherscan", - "qrCode": "Show QR Code", - "accDetails": "Account Details", - "networks": "Networks", - "defaultNetwork": "The default network for Ether transactions is Main Net.", - "mainnet": "Main Ethereum Network", - "unknownNetwork": "Unknown Private Network", - "rinkeby": "Rinkeby Test Network", - "kovan": "Kovan Test Network", - "ropsten": "Ropsten Test Network", - "localhost": "Localhost 8545", - "customRPC": "Custom RPC", - "hideToken": "Hide Token", - "copiedClipboard": "Copied to Clipboard", - "detailsCaps": "DETAILS", - "sendButton": "SEND", - "depositButton": "DEPOSIT", - "notStarted": "Not Started", - "noTransactions": "No Transactions", - "contractPublished": "Contract Published", - "noTransactionHistory": "No transaction history.", - "warning": "Warning", - "failed": "Failed", - "rejected": "Rejected", - "sigRequested": "Signature Requested", - "yourSigRequested": "Your signature is being requested", - "balance": "Balance:", - "retryWithMoreGas": "Retry with a higher gas price here", - "takesTooLong": "Taking too long?", - "transactionNumber": "Transaction Number", - "loadingTokens": "Loading Tokens...", - "troubleTokenBalances": "We had trouble loading your token balances. You can view them ", - "here": "here", - "message": "Message", - "signNotice": "Signing this message can have \ndangerous side effects. Only sign messages from \nsites you fully trust with your entire account.\n This dangerous method will be removed in a future version. ", - "youSign": "You are signing:", - "conversionProgress": "Conversion in progress", - "noDeposits": "No deposits received", - "fromShapeShift": "From ShapeShift", - "invalidRequest": "Invalid Request", - "status": "Status", - "limit": "Limit", - "exchangeRate": "Exchange Rate", - "min": "Minimum", - "available": "Available", - "unavailable": "Unavailable", - "depositBTC": "Deposit your BTC to the address below:", - "deposit": "Deposit", - "receive": "Receive", - "refundAddress": "Your Refund Address", - "buyButton": "Buy", - "signMessage": "Sign Message", - "youSignCaps": "YOU ARE SIGNING", - "messageCaps": "MESSAGE", - "readMore": "Read more here.", - "cancel": "Cancel", - "sign": "Sign", - "accept": "Accept", - "attemptingConnect": "Attempting to connect to blockchain.", - "privateNetwork": "Private Network", - "invalidInput": "Invalid input.", - "noAddressForName": "No address has been set for this name.", - "clickCopy": "Click to Copy", - "copyButton": " Copy ", - "copiedButton": "Copied", - "copy": "Copy", - "copiedExclamation": "Copied!", - "continueToCoinbase": "Continue to Coinbase", - "depositEth": "Deposit Eth", - "selectService": "Select Service", - "unknownNetworkId": "Unknown network ID", - "borrowDharma": "Borrow With Dharma (Beta)", - "exportPrivateKeyWarning": "Export private keys at your own risk.", - "confirmPasswordSmall": "confirm password", - "submit": "Submit", + "mainnet": { + "message": "Main Ethereum Network" + }, + "message": { + "message": "Message" + }, + "messageCaps": { + "message": "MESSAGE" + }, + "min": { + "message": "Minimum" + }, + "myAccounts": { + "message": "My Accounts" + }, + "needEtherInWallet": { + "message": "To interact with decentralized applications using MetaMask, you’ll need Ether in your wallet." + }, + "needImportFile": { + "message": "You must select a file to import." + }, + "needImportPassword": { + "message": "You must enter a password for the selected file." + }, + "networks": { + "message": "Networks" + }, + "newAccount": { + "message": "New Account" + }, + "newContract": { + "message": "New Contract" + }, + "newPassword": { + "message": "New Password (min 8 chars)" + }, + "newRecipient": { + "message": "New Recipient" + }, + "next": { + "message": "Next" + }, + "noAddressForName": { + "message": "No address has been set for this name." + }, + "noDeposits": { + "message": "No deposits received" + }, + "noTransactionHistory": { + "message": "No transaction history." + }, + "noTransactions": { + "message": "No Transactions" + }, + "notStarted": { + "message": "Not Started" + }, + "oldUI": { + "message": "Old UI" + }, + "oldUIMessage": { + "message": "You have returned to the old UI. You can switch back to the New UI through the option in the top right dropdown menu." + }, + "or": { + "message": "or" + }, + "passwordMismatch": { + "message": "passwords don't match" + }, + "passwordShort": { + "message": "password not long enough" + }, + "pastePrivateKey": { + "message": "Paste your private key string here:" + }, + "pasteSeed": { + "message": "Paste your seed phrase here!" + }, + "privateKeyWarning": { + "message": "Warning: Never disclose this key. Anyone with your private keys can take steal any assets held in your account." + }, + "privateNetwork": { + "message": "Private Network" + }, + "qrCode": { + "message": "Show QR Code" + }, + "readdToken": { + "message": "You can add this token back in the future by going go to “Add token” in your accounts options menu." + }, + "readMore": { + "message": "Read more here." + }, + "receive": { + "message": "Receive" + }, + "recipientAddress": { + "message": "Recipient Address" + }, + "refundAddress": { + "message": "Your Refund Address" + }, + "rejected": { + "message": "Rejected" + }, + "required": { + "message": "Required" + }, + "retryWithMoreGas": { + "message": "Retry with a higher gas price here" + }, + "revert": { + "message": "Revert" + }, + "rinkeby": { + "message": "Rinkeby Test Network" + }, + "ropsten": { + "message": "Ropsten Test Network" + }, + "sampleAccountName": { + "message": "E.g. My new account" + }, + "saveCaps": { + "message": "SAVE" + }, + "selectService": { + "message": "Select Service" + }, + "sendButton": { + "message": "SEND" + }, + "sendTokens": { + "message": "Send Tokens" + }, + "sendTokensAnywhere": { + "message": "Send Tokens to anyone with an Ethereum account" + }, + "settings": { + "message": "Settings" + }, + "shapeshiftBuy": { + "message": "Buy with Shapeshift" + }, + "showPrivateKeys": { + "message": "Show Private Keys" + }, + "sign": { + "message": "Sign" + }, + "signCaps": { + "message": "SIGN" + }, + "signMessage": { + "message": "Sign Message" + }, + "signNotice": { + "message": "Signing this message can have \ndangerous side effects. Only sign messages from \nsites you fully trust with your entire account.\n This dangerous method will be removed in a future version. " + }, + "sigRequested": { + "message": "Signature Requested" + }, + "status": { + "message": "Status" + }, + "submit": { + "message": "Submit" + }, + "takesTooLong": { + "message": "Taking too long?" + }, + "testFaucet": { + "message": "Test Faucet" + }, + "to": { + "message": "To" + }, + "tokenBalance": { + "message": "Your Token Balance is:" + }, + "toSpecific": { + "message": "To:" + }, + "total": { + "message": "Total" + }, + "transactionMemo": { + "message": "Transaction memo (optional)" + }, + "transactionNumber": { + "message": "Transaction Number" + }, + "transfers": { + "message": "Transfers" + }, + "troubleTokenBalances": { + "message": "We had trouble loading your token balances. You can view them " + }, + "typePassword": { + "message": "Type Your Password" + }, + "uiWelcome": { + "message": "Welcome to the New UI (Beta)" + }, + "uiWelcomeMessage": { + "message": "You are now using the new Metamask UI. Take a look around, try out new features like sending tokens, and let us know if you have any issues." + }, + "unavailable": { + "message": "Unavailable" + }, + "unknown": { + "message": "Unknown" + }, + "unknownNetwork": { + "message": "Unknown Private Network" + }, + "unknownNetworkId": { + "message": "Unknown network ID" + }, + "usedByClients": { + "message": "Used by a variety of different clients" + }, + "viewAccount": { + "message": "View Account" + }, + "warning": { + "message": "Warning" + }, + "whatsThis": { + "message": "What's this?" + }, + "yourSigRequested": { + "message": "Your signature is being requested" + }, + "youSign": { + "message": "You are signing:" + }, + "youSignCaps": { + "message": "YOU ARE SIGNING" + } } diff --git a/ui/app/accounts/import/json.js b/ui/app/accounts/import/json.js index 9cefcfa77..ca9a29e34 100644 --- a/ui/app/accounts/import/json.js +++ b/ui/app/accounts/import/json.js @@ -26,8 +26,8 @@ JsonImportSubview.prototype.render = function () { return ( h('div.new-account-import-form__json', [ - h('p', 'Used by a variety of different clients'), - h('a.warning', { href: HELP_LINK, target: '_blank' }, 'File import not working? Click here!'), + h('p', t('usedByClients')), + h('a.warning', { href: HELP_LINK, target: '_blank' }, t('fileImportFail')), h(FileInput, { readAs: 'text', @@ -42,7 +42,7 @@ JsonImportSubview.prototype.render = function () { h('input.new-account-import-form__input-password', { type: 'password', - placeholder: 'Enter password', + placeholder: t('enterPassword'), id: 'json-password-box', onKeyPress: this.createKeyringOnEnter.bind(this), }), @@ -52,13 +52,13 @@ JsonImportSubview.prototype.render = function () { h('button.new-account-create-form__button-cancel', { onClick: () => this.props.goHome(), }, [ - 'CANCEL', + t('cancelCaps'), ]), h('button.new-account-create-form__button-create', { onClick: () => this.createNewKeychain.bind(this), }, [ - 'IMPORT', + t('importCaps'), ]), ]), @@ -84,7 +84,7 @@ JsonImportSubview.prototype.createNewKeychain = function () { const { fileContents } = state if (!fileContents) { - const message = 'You must select a file to import.' + const message = t('needImportFile') return this.props.dispatch(actions.displayWarning(message)) } @@ -92,7 +92,7 @@ JsonImportSubview.prototype.createNewKeychain = function () { const password = passwordInput.value if (!password) { - const message = 'You must enter a password for the selected file.' + const message = t('needImportPassword') return this.props.dispatch(actions.displayWarning(message)) } diff --git a/ui/app/accounts/import/private-key.js b/ui/app/accounts/import/private-key.js index 43afbca87..d8aa1a3d8 100644 --- a/ui/app/accounts/import/private-key.js +++ b/ui/app/accounts/import/private-key.js @@ -32,7 +32,7 @@ PrivateKeyImportView.prototype.render = function () { return ( h('div.new-account-import-form__private-key', [ - h('span.new-account-create-form__instruction', 'Paste your private key string here:'), + h('span.new-account-create-form__instruction', t('pastePrivateKey')), h('input.new-account-import-form__input-password', { type: 'password', @@ -45,13 +45,13 @@ PrivateKeyImportView.prototype.render = function () { h('button.new-account-create-form__button-cancel', { onClick: () => goHome(), }, [ - 'CANCEL', + t('cancelCaps'), ]), h('button.new-account-create-form__button-create', { onClick: () => this.createNewKeychain(), }, [ - 'IMPORT', + t('importCaps'), ]), ]), diff --git a/ui/app/accounts/import/seed.js b/ui/app/accounts/import/seed.js index b4a7c0afa..241200c6f 100644 --- a/ui/app/accounts/import/seed.js +++ b/ui/app/accounts/import/seed.js @@ -20,11 +20,10 @@ SeedImportSubview.prototype.render = function () { style: { }, }, [ - `Paste your seed phrase here!`, + t('pasteSeed'), h('textarea'), h('br'), - h('button', 'Submit'), + h('button', t('submit')), ]) ) } - diff --git a/ui/app/accounts/new-account/create-form.js b/ui/app/accounts/new-account/create-form.js index 494726ae4..f9faa928c 100644 --- a/ui/app/accounts/new-account/create-form.js +++ b/ui/app/accounts/new-account/create-form.js @@ -21,13 +21,13 @@ class NewAccountCreateForm extends Component { return h('div.new-account-create-form', [ h('div.new-account-create-form__input-label', {}, [ - 'Account Name', + t('accountName'), ]), h('div.new-account-create-form__input-wrapper', {}, [ h('input.new-account-create-form__input', { value: this.state.newAccountName, - placeholder: 'E.g. My new account', + placeholder: t('sampleAccountName'), onChange: event => this.setState({ newAccountName: event.target.value }), }, []), ]), @@ -37,13 +37,13 @@ class NewAccountCreateForm extends Component { h('button.new-account-create-form__button-cancel', { onClick: () => this.props.goHome(), }, [ - 'CANCEL', + t('cancelCaps'), ]), h('button.new-account-create-form__button-create', { onClick: () => this.props.createAccount(newAccountName), }, [ - 'CREATE', + t('createCaps'), ]), ]), diff --git a/ui/app/accounts/new-account/index.js b/ui/app/accounts/new-account/index.js index acf0dc6e4..1ed43ae08 100644 --- a/ui/app/accounts/new-account/index.js +++ b/ui/app/accounts/new-account/index.js @@ -42,10 +42,10 @@ AccountDetailsModal.prototype.render = function () { const { displayedForm, displayForm } = this.props return h('div.new-account', {}, [ - + h('div.new-account__header', [ - h('div.new-account__title', 'New Account'), + h('div.new-account__title', t('newAccount')), h('div.new-account__tabs', [ @@ -55,7 +55,7 @@ AccountDetailsModal.prototype.render = function () { 'new-account__tabs__unselected cursor-pointer': displayedForm !== 'CREATE', }), onClick: () => displayForm('CREATE'), - }, 'Create'), + }, t('createDen')), h('div.new-account__tabs__tab', { className: classnames('new-account__tabs__tab', { @@ -63,7 +63,7 @@ AccountDetailsModal.prototype.render = function () { 'new-account__tabs__unselected cursor-pointer': displayedForm !== 'IMPORT', }), onClick: () => displayForm('IMPORT'), - }, 'Import'), + }, t('import')), ]), diff --git a/ui/app/components/customize-gas-modal/index.js b/ui/app/components/customize-gas-modal/index.js index a5384daaf..ae9ff769d 100644 --- a/ui/app/components/customize-gas-modal/index.js +++ b/ui/app/components/customize-gas-modal/index.js @@ -284,11 +284,11 @@ CustomizeGasModal.prototype.render = function () { h('div.send-v2__customize-gas__buttons', [ h('div.send-v2__customize-gas__cancel', { onClick: this.props.hideModal, - }, [t('cancelButton')]), + }, [t('cancelCaps')]), h(`div.send-v2__customize-gas__save${error ? '__error' : ''}`, { onClick: () => !error && this.save(gasPrice, gasLimit, gasTotal), - }, [t('saveButton')]), + }, [t('saveCaps')]), ]), ]), diff --git a/ui/app/components/dropdowns/components/account-dropdowns.js b/ui/app/components/dropdowns/components/account-dropdowns.js index 7ecec38d2..76fbb8060 100644 --- a/ui/app/components/dropdowns/components/account-dropdowns.js +++ b/ui/app/components/dropdowns/components/account-dropdowns.js @@ -129,7 +129,7 @@ class AccountDropdowns extends Component { actions.showEditAccountModal(identity) }, }, [ - t('editButton'), + t('editCaps'), ]), ]), diff --git a/ui/app/components/modals/account-details-modal.js b/ui/app/components/modals/account-details-modal.js index c1f7a3236..746c6de4c 100644 --- a/ui/app/components/modals/account-details-modal.js +++ b/ui/app/components/modals/account-details-modal.js @@ -64,12 +64,12 @@ AccountDetailsModal.prototype.render = function () { h('button.btn-clear.account-modal__button', { onClick: () => global.platform.openWindow({ url: genAccountLink(address, network) }), - }, 'View account on Etherscan'), + }, t('etherscanView')), // Holding on redesign for Export Private Key functionality h('button.btn-clear.account-modal__button', { onClick: () => showExportPrivateKeyModal(), - }, 'Export private key'), + }, t('exportPrivateKeyLower')), ]) } diff --git a/ui/app/components/modals/account-modal-container.js b/ui/app/components/modals/account-modal-container.js index c548fb7b3..538edcf13 100644 --- a/ui/app/components/modals/account-modal-container.js +++ b/ui/app/components/modals/account-modal-container.js @@ -59,7 +59,7 @@ AccountModalContainer.prototype.render = function () { h('i.fa.fa-angle-left.fa-lg'), - h('span.account-modal-back__text', ' Back'), + h('span.account-modal-back__text', ' ' + t('back')), ]), diff --git a/ui/app/components/modals/buy-options-modal.js b/ui/app/components/modals/buy-options-modal.js index 74a7a847e..60fef7db4 100644 --- a/ui/app/components/modals/buy-options-modal.js +++ b/ui/app/components/modals/buy-options-modal.js @@ -56,15 +56,15 @@ BuyOptions.prototype.render = function () { }, [ h('div.buy-modal-content-title', { style: {}, - }, 'Transfers'), - h('div', {}, 'How would you like to deposit Ether?'), + }, t('transfers')), + h('div', {}, t('howToDeposit')), ]), h('div.buy-modal-content-options.flex-column.flex-center', {}, [ isTestNetwork - ? this.renderModalContentOption(networkName, 'Test Faucet', () => toFaucet(network)) - : this.renderModalContentOption('Coinbase', 'Deposit with Fiat', () => toCoinbase(address)), + ? this.renderModalContentOption(networkName, t('testFaucet'), () => toFaucet(network)) + : this.renderModalContentOption('Coinbase', t('depositFiat'), () => toCoinbase(address)), // h('div.buy-modal-content-option', {}, [ // h('div.buy-modal-content-option-title', {}, 'Shapeshift'), @@ -72,8 +72,8 @@ BuyOptions.prototype.render = function () { // ]),, this.renderModalContentOption( - 'Direct Deposit', - 'Deposit from another account', + t('directDeposit'), + t('depositFromAccount'), () => this.goToAccountDetailsModal() ), @@ -84,7 +84,7 @@ BuyOptions.prototype.render = function () { background: 'white', }, onClick: () => { this.props.hideModal() }, - }, h('div.buy-modal-content-footer#buy-modal-content-footer-text', {}, 'Cancel')), + }, h('div.buy-modal-content-footer#buy-modal-content-footer-text', {}, t('cancel'))), ]), ]) } diff --git a/ui/app/components/modals/deposit-ether-modal.js b/ui/app/components/modals/deposit-ether-modal.js index 532d66653..85f640a68 100644 --- a/ui/app/components/modals/deposit-ether-modal.js +++ b/ui/app/components/modals/deposit-ether-modal.js @@ -6,16 +6,13 @@ const actions = require('../../actions') const networkNames = require('../../../../app/scripts/config.js').networkNames const ShapeshiftForm = require('../shapeshift-form') -const DIRECT_DEPOSIT_ROW_TITLE = 'Directly Deposit Ether' -const DIRECT_DEPOSIT_ROW_TEXT = `If you already have some Ether, the quickest way to get Ether in -your new wallet by direct deposit.` -const COINBASE_ROW_TITLE = 'Buy on Coinbase' -const COINBASE_ROW_TEXT = `Coinbase is the world’s most popular way to buy and sell bitcoin, -ethereum, and litecoin.` -const SHAPESHIFT_ROW_TITLE = 'Deposit with ShapeShift' -const SHAPESHIFT_ROW_TEXT = `If you own other cryptocurrencies, you can trade and deposit Ether -directly into your MetaMask wallet. No Account Needed.` -const FAUCET_ROW_TITLE = 'Test Faucet' +const DIRECT_DEPOSIT_ROW_TITLE = t('directDepositEther') +const DIRECT_DEPOSIT_ROW_TEXT = t('directDepositEtherExplainer') +const COINBASE_ROW_TITLE = t('buyCoinbase') +const COINBASE_ROW_TEXT = t('buyCoinbaseExplainer') +const SHAPESHIFT_ROW_TITLE = t('depositShapeShift') +const SHAPESHIFT_ROW_TEXT = t('depositShapeShiftExplainer') +const FAUCET_ROW_TITLE = t('testFaucet') const facuetRowText = networkName => `Get Ether from a faucet for the ${networkName}` function mapStateToProps (state) { @@ -110,10 +107,10 @@ DepositEtherModal.prototype.render = function () { h('div.deposit-ether-modal__header', [ - h('div.deposit-ether-modal__header__title', ['Deposit Ether']), + h('div.deposit-ether-modal__header__title', [t('depositEther')]), h('div.deposit-ether-modal__header__description', [ - 'To interact with decentralized applications using MetaMask, you’ll need Ether in your wallet.', + t('needEtherInWallet'), ]), h('div.deposit-ether-modal__header__close', { @@ -131,7 +128,7 @@ DepositEtherModal.prototype.render = function () { logo: h('img.deposit-ether-modal__buy-row__eth-logo', { src: '../../../images/eth_logo.svg' }), title: DIRECT_DEPOSIT_ROW_TITLE, text: DIRECT_DEPOSIT_ROW_TEXT, - buttonLabel: 'View Account', + buttonLabel: t('viewAccount'), onButtonClick: () => this.goToAccountDetailsModal(), hide: buyingWithShapeshift, }), @@ -140,7 +137,7 @@ DepositEtherModal.prototype.render = function () { logo: h('i.fa.fa-tint.fa-2x'), title: FAUCET_ROW_TITLE, text: facuetRowText(networkName), - buttonLabel: 'Get Ether', + buttonLabel: t('getEther'), onButtonClick: () => toFaucet(network), hide: !isTestNetwork || buyingWithShapeshift, }), @@ -151,7 +148,7 @@ DepositEtherModal.prototype.render = function () { }), title: COINBASE_ROW_TITLE, text: COINBASE_ROW_TEXT, - buttonLabel: 'Continue to Coinbase', + buttonLabel: t('continueToCoinbase'), onButtonClick: () => toCoinbase(address), hide: isTestNetwork || buyingWithShapeshift, }), @@ -162,7 +159,7 @@ DepositEtherModal.prototype.render = function () { }), title: SHAPESHIFT_ROW_TITLE, text: SHAPESHIFT_ROW_TEXT, - buttonLabel: 'Buy with Shapeshift', + buttonLabel: t('shapeshiftBuy'), onButtonClick: () => this.setState({ buyingWithShapeshift: true }), hide: isTestNetwork, hideButton: buyingWithShapeshift, diff --git a/ui/app/components/modals/edit-account-name-modal.js b/ui/app/components/modals/edit-account-name-modal.js index e2361140d..410fac7ba 100644 --- a/ui/app/components/modals/edit-account-name-modal.js +++ b/ui/app/components/modals/edit-account-name-modal.js @@ -50,7 +50,7 @@ EditAccountNameModal.prototype.render = function () { ]), h('div.edit-account-name-modal-title', { - }, ['Edit Account Name']), + }, [t('editAccountName')]), h('input.edit-account-name-modal-input', { placeholder: identity.name, @@ -69,7 +69,7 @@ EditAccountNameModal.prototype.render = function () { }, disabled: this.state.inputText.length === 0, }, [ - 'SAVE', + t('saveCaps'), ]), ]), diff --git a/ui/app/components/modals/export-private-key-modal.js b/ui/app/components/modals/export-private-key-modal.js index 422f23f44..0745827cb 100644 --- a/ui/app/components/modals/export-private-key-modal.js +++ b/ui/app/components/modals/export-private-key-modal.js @@ -48,8 +48,8 @@ ExportPrivateKeyModal.prototype.exportAccountAndGetPrivateKey = function (passwo ExportPrivateKeyModal.prototype.renderPasswordLabel = function (privateKey) { return h('span.private-key-password-label', privateKey - ? 'This is your private key (click to copy)' - : 'Type Your Password' + ? t('copyPrivateKey') + : t('typePassword') ) } @@ -86,8 +86,8 @@ ExportPrivateKeyModal.prototype.renderButtons = function (privateKey, password, ), (privateKey - ? this.renderButton('btn-clear export-private-key__button', () => hideModal(), 'Done') - : this.renderButton('btn-clear export-private-key__button', () => this.exportAccountAndGetPrivateKey(this.state.password, address), 'Confirm') + ? this.renderButton('btn-clear export-private-key__button', () => hideModal(), t('done')) + : this.renderButton('btn-clear export-private-key__button', () => this.exportAccountAndGetPrivateKey(this.state.password, address), t('confirm')) ), ]) @@ -120,7 +120,7 @@ ExportPrivateKeyModal.prototype.render = function () { h('div.account-modal-divider'), - h('span.modal-body-title', 'Show Private Keys'), + h('span.modal-body-title', t('showPrivateKeys')), h('div.private-key-password', {}, [ this.renderPasswordLabel(privateKey), @@ -130,10 +130,7 @@ ExportPrivateKeyModal.prototype.render = function () { !warning ? null : h('span.private-key-password-error', warning), ]), - h('div.private-key-password-warning', `Warning: Never disclose this key. - Anyone with your private keys can take steal any assets held in your - account.` - ), + h('div.private-key-password-warning', t('privateKeyWarning')), this.renderButtons(privateKey, this.state.password, address, hideModal), diff --git a/ui/app/components/modals/hide-token-confirmation-modal.js b/ui/app/components/modals/hide-token-confirmation-modal.js index 56c7ba299..55f1695af 100644 --- a/ui/app/components/modals/hide-token-confirmation-modal.js +++ b/ui/app/components/modals/hide-token-confirmation-modal.js @@ -41,7 +41,7 @@ HideTokenConfirmationModal.prototype.render = function () { h('div.hide-token-confirmation__container', { }, [ h('div.hide-token-confirmation__title', {}, [ - 'Hide Token?', + t('hideTokenPrompt'), ]), h(Identicon, { @@ -54,19 +54,19 @@ HideTokenConfirmationModal.prototype.render = function () { h('div.hide-token-confirmation__symbol', {}, symbol), h('div.hide-token-confirmation__copy', {}, [ - 'You can add this token back in the future by going go to “Add token” in your accounts options menu.', + t('readdToken'), ]), h('div.hide-token-confirmation__buttons', {}, [ h('button.btn-cancel.hide-token-confirmation__button', { onClick: () => hideModal(), }, [ - 'CANCEL', + t('cancelCaps'), ]), h('button.btn-clear.hide-token-confirmation__button', { onClick: () => hideToken(address), }, [ - 'HIDE', + t('hideCaps'), ]), ]), ]), diff --git a/ui/app/components/modals/modal.js b/ui/app/components/modals/modal.js index afb2a2175..e4e644d40 100644 --- a/ui/app/components/modals/modal.js +++ b/ui/app/components/modals/modal.js @@ -169,9 +169,8 @@ const MODALS = { BETA_UI_NOTIFICATION_MODAL: { contents: [ h(NotifcationModal, { - header: 'Welcome to the New UI (Beta)', - message: `You are now using the new Metamask UI. Take a look around, try out new features like sending tokens, - and let us know if you have any issues.`, + header: t('uiWelcome'), + message: t('uiWelcomeMessage'), }), ], mobileModalStyle: { @@ -187,9 +186,8 @@ const MODALS = { OLD_UI_NOTIFICATION_MODAL: { contents: [ h(NotifcationModal, { - header: 'Old UI', - message: `You have returned to the old UI. You can switch back to the New UI through the option in the top - right dropdown menu.`, + header: t('oldUI'), + message: t('oldUIMessage'), }), ], mobileModalStyle: { diff --git a/ui/app/components/modals/new-account-modal.js b/ui/app/components/modals/new-account-modal.js index fc1fd413d..4fdfbd745 100644 --- a/ui/app/components/modals/new-account-modal.js +++ b/ui/app/components/modals/new-account-modal.js @@ -22,7 +22,7 @@ class NewAccountModal extends Component { h('div.new-account-modal-wrapper', { }, [ h('div.new-account-modal-header', {}, [ - 'New Account', + t('newAccount'), ]), h('div.modal-close-x', { @@ -30,19 +30,19 @@ class NewAccountModal extends Component { }), h('div.new-account-modal-content', {}, [ - 'Account Name', + t('accountName'), ]), h('div.new-account-input-wrapper', {}, [ h('input.new-account-input', { value: this.state.newAccountName, - placeholder: 'E.g. My new account', + placeholder: t('sampleAccountName'), onChange: event => this.setState({ newAccountName: event.target.value }), }, []), ]), h('div.new-account-modal-content.after-input', {}, [ - 'or', + t('or'), ]), h('div.new-account-modal-content.after-input.pointer', { @@ -50,13 +50,13 @@ class NewAccountModal extends Component { this.props.hideModal() this.props.showImportPage() }, - }, 'Import an account'), + }, t('importAnAccount')), h('div.new-account-modal-content.button', {}, [ h('button.btn-clear', { onClick: () => this.props.createAccount(newAccountName), }, [ - 'SAVE', + t('saveCaps'), ]), ]), ]), diff --git a/ui/app/components/pending-tx/confirm-deploy-contract.js b/ui/app/components/pending-tx/confirm-deploy-contract.js index ae6c6ef7b..0d8b2721f 100644 --- a/ui/app/components/pending-tx/confirm-deploy-contract.js +++ b/ui/app/components/pending-tx/confirm-deploy-contract.js @@ -200,7 +200,7 @@ ConfirmDeployContract.prototype.renderGasFee = function () { return ( h('section.flex-row.flex-center.confirm-screen-row', [ - h('span.confirm-screen-label.confirm-screen-section-column', [ 'Gas Fee' ]), + h('span.confirm-screen-label.confirm-screen-section-column', [ t('gasFee') ]), h('div.confirm-screen-section-column', [ h('div.confirm-screen-row-info', `${fiatGas} ${currentCurrency.toUpperCase()}`), @@ -239,8 +239,8 @@ ConfirmDeployContract.prototype.renderTotalPlusGas = function () { return ( h('section.flex-row.flex-center.confirm-screen-total-box ', [ h('div.confirm-screen-section-column', [ - h('span.confirm-screen-label', [ 'Total ' ]), - h('div.confirm-screen-total-box__subtitle', [ 'Amount + Gas' ]), + h('span.confirm-screen-label', [ t('total') + ' ' ]), + h('div.confirm-screen-total-box__subtitle', [ t('amountPlusGas') ]), ]), h('div.confirm-screen-section-column', [ @@ -274,7 +274,7 @@ ConfirmDeployContract.prototype.render = function () { h('button.confirm-screen-back-button', { onClick: () => backToAccountDetail(selectedAddress), }, 'BACK'), - h('div.confirm-screen-title', 'Confirm Contract'), + h('div.confirm-screen-title', t('confirmContract')), h('div.confirm-screen-header-tip'), ]), h('div.flex-row.flex-center.confirm-screen-identicons', [ @@ -292,7 +292,7 @@ ConfirmDeployContract.prototype.render = function () { h('i.fa.fa-arrow-right.fa-lg'), h('div.confirm-screen-account-wrapper', [ h('i.fa.fa-file-text-o'), - h('span.confirm-screen-account-name', 'New Contract'), + h('span.confirm-screen-account-name', t('newContract')), h('span.confirm-screen-account-number', ' '), ]), ]), @@ -310,7 +310,7 @@ ConfirmDeployContract.prototype.render = function () { h('div.confirm-screen-rows', [ h('section.flex-row.flex-center.confirm-screen-row', [ - h('span.confirm-screen-label.confirm-screen-section-column', [ 'From' ]), + h('span.confirm-screen-label.confirm-screen-section-column', [ t('from') ]), h('div.confirm-screen-section-column', [ h('div.confirm-screen-row-info', fromName), h('div.confirm-screen-row-detail', `...${fromAddress.slice(fromAddress.length - 4)}`), @@ -318,9 +318,9 @@ ConfirmDeployContract.prototype.render = function () { ]), h('section.flex-row.flex-center.confirm-screen-row', [ - h('span.confirm-screen-label.confirm-screen-section-column', [ 'To' ]), + h('span.confirm-screen-label.confirm-screen-section-column', [ t('to') ]), h('div.confirm-screen-section-column', [ - h('div.confirm-screen-row-info', 'New Contract'), + h('div.confirm-screen-row-info', t('newContract')), ]), ]), @@ -337,10 +337,10 @@ ConfirmDeployContract.prototype.render = function () { // Cancel Button h('div.cancel.btn-light.confirm-screen-cancel-button', { onClick: (event) => this.cancel(event, txMeta), - }, 'CANCEL'), + }, t('cancelCaps')), // Accept Button - h('button.confirm-screen-confirm-button', ['CONFIRM']), + h('button.confirm-screen-confirm-button', [t('confirmCaps')]), ]), ]) diff --git a/ui/app/components/pending-tx/confirm-send-ether.js b/ui/app/components/pending-tx/confirm-send-ether.js index 652300c94..7608e02ad 100644 --- a/ui/app/components/pending-tx/confirm-send-ether.js +++ b/ui/app/components/pending-tx/confirm-send-ether.js @@ -165,7 +165,7 @@ ConfirmSendEther.prototype.getData = function () { }, to: { address: txParams.to, - name: identities[txParams.to] ? identities[txParams.to].name : 'New Recipient', + name: identities[txParams.to] ? identities[txParams.to].name : t('newRecipient'), }, memo: txParams.memo || '', gasFeeInFIAT, @@ -268,7 +268,7 @@ ConfirmSendEther.prototype.render = function () { h('div.confirm-screen-rows', [ h('section.flex-row.flex-center.confirm-screen-row', [ - h('span.confirm-screen-label.confirm-screen-section-column', [ 'From' ]), + h('span.confirm-screen-label.confirm-screen-section-column', [ t('from') ]), h('div.confirm-screen-section-column', [ h('div.confirm-screen-row-info', fromName), h('div.confirm-screen-row-detail', `...${fromAddress.slice(fromAddress.length - 4)}`), @@ -276,7 +276,7 @@ ConfirmSendEther.prototype.render = function () { ]), h('section.flex-row.flex-center.confirm-screen-row', [ - h('span.confirm-screen-label.confirm-screen-section-column', [ 'To' ]), + h('span.confirm-screen-label.confirm-screen-section-column', [ t('to') ]), h('div.confirm-screen-section-column', [ h('div.confirm-screen-row-info', toName), h('div.confirm-screen-row-detail', `...${toAddress.slice(toAddress.length - 4)}`), @@ -284,7 +284,7 @@ ConfirmSendEther.prototype.render = function () { ]), h('section.flex-row.flex-center.confirm-screen-row', [ - h('span.confirm-screen-label.confirm-screen-section-column', [ 'Gas Fee' ]), + h('span.confirm-screen-label.confirm-screen-section-column', [ t('gasFee') ]), h('div.confirm-screen-section-column', [ h('div.confirm-screen-row-info', `${gasFeeInFIAT} ${currentCurrency.toUpperCase()}`), @@ -295,8 +295,8 @@ ConfirmSendEther.prototype.render = function () { h('section.flex-row.flex-center.confirm-screen-total-box ', [ h('div.confirm-screen-section-column', [ - h('span.confirm-screen-label', [ 'Total ' ]), - h('div.confirm-screen-total-box__subtitle', [ 'Amount + Gas' ]), + h('span.confirm-screen-label', [ t('total') + ' ' ]), + h('div.confirm-screen-total-box__subtitle', [ t('amountPlusGas') ]), ]), h('div.confirm-screen-section-column', [ @@ -396,10 +396,10 @@ ConfirmSendEther.prototype.render = function () { clearSend() this.cancel(event, txMeta) }, - }, 'CANCEL'), + }, t('cancelCaps')), // Accept Button - h('button.confirm-screen-confirm-button', ['CONFIRM']), + h('button.confirm-screen-confirm-button', [t('confirmCaps')]), ]), ]) ) @@ -414,7 +414,7 @@ ConfirmSendEther.prototype.onSubmit = function (event) { if (valid && this.verifyGasParams()) { this.props.sendTransaction(txMeta, event) } else { - this.props.dispatch(actions.displayWarning('Invalid Gas Parameters')) + this.props.dispatch(actions.displayWarning(t('invalidGasParams'))) this.setState({ submitting: false }) } } diff --git a/ui/app/components/pending-tx/confirm-send-token.js b/ui/app/components/pending-tx/confirm-send-token.js index ad489c3e9..88644d57a 100644 --- a/ui/app/components/pending-tx/confirm-send-token.js +++ b/ui/app/components/pending-tx/confirm-send-token.js @@ -133,7 +133,7 @@ ConfirmSendToken.prototype.getAmount = function () { ? +(sendTokenAmount * tokenExchangeRate * conversionRate).toFixed(2) : null, token: typeof value === 'undefined' - ? 'Unknown' + ? t('unknown') : +sendTokenAmount.toFixed(decimals), } @@ -204,7 +204,7 @@ ConfirmSendToken.prototype.getData = function () { }, to: { address: value, - name: identities[value] ? identities[value].name : 'New Recipient', + name: identities[value] ? identities[value].name : t('newRecipient'), }, memo: txParams.memo || '', } @@ -244,7 +244,7 @@ ConfirmSendToken.prototype.renderGasFee = function () { return ( h('section.flex-row.flex-center.confirm-screen-row', [ - h('span.confirm-screen-label.confirm-screen-section-column', [ 'Gas Fee' ]), + h('span.confirm-screen-label.confirm-screen-section-column', [ t('gasFee') ]), h('div.confirm-screen-section-column', [ h('div.confirm-screen-row-info', `${fiatGas} ${currentCurrency}`), @@ -266,8 +266,8 @@ ConfirmSendToken.prototype.renderTotalPlusGas = function () { ? ( h('section.flex-row.flex-center.confirm-screen-total-box ', [ h('div.confirm-screen-section-column', [ - h('span.confirm-screen-label', [ 'Total ' ]), - h('div.confirm-screen-total-box__subtitle', [ 'Amount + Gas' ]), + h('span.confirm-screen-label', [ t('total') + ' ' ]), + h('div.confirm-screen-total-box__subtitle', [ t('amountPlusGas') ]), ]), h('div.confirm-screen-section-column', [ @@ -279,8 +279,8 @@ ConfirmSendToken.prototype.renderTotalPlusGas = function () { : ( h('section.flex-row.flex-center.confirm-screen-total-box ', [ h('div.confirm-screen-section-column', [ - h('span.confirm-screen-label', [ 'Total ' ]), - h('div.confirm-screen-total-box__subtitle', [ 'Amount + Gas' ]), + h('span.confirm-screen-label', [ t('total') + ' ' ]), + h('div.confirm-screen-total-box__subtitle', [ t('amountPlusGas') ]), ]), h('div.confirm-screen-section-column', [ @@ -316,7 +316,7 @@ ConfirmSendToken.prototype.render = function () { h('h3.flex-center.confirm-screen-header', [ h('button.btn-clear.confirm-screen-back-button', { onClick: () => editTransaction(txMeta), - }, 'EDIT'), + }, t('editCaps')), h('div.confirm-screen-title', 'Confirm Transaction'), h('div.confirm-screen-header-tip'), ]), @@ -359,7 +359,7 @@ ConfirmSendToken.prototype.render = function () { h('div.confirm-screen-rows', [ h('section.flex-row.flex-center.confirm-screen-row', [ - h('span.confirm-screen-label.confirm-screen-section-column', [ 'From' ]), + h('span.confirm-screen-label.confirm-screen-section-column', [ t('from') ]), h('div.confirm-screen-section-column', [ h('div.confirm-screen-row-info', fromName), h('div.confirm-screen-row-detail', `...${fromAddress.slice(fromAddress.length - 4)}`), @@ -367,7 +367,7 @@ ConfirmSendToken.prototype.render = function () { ]), toAddress && h('section.flex-row.flex-center.confirm-screen-row', [ - h('span.confirm-screen-label.confirm-screen-section-column', [ 'To' ]), + h('span.confirm-screen-label.confirm-screen-section-column', [ t('to') ]), h('div.confirm-screen-section-column', [ h('div.confirm-screen-row-info', toName), h('div.confirm-screen-row-detail', `...${toAddress.slice(toAddress.length - 4)}`), @@ -387,10 +387,10 @@ ConfirmSendToken.prototype.render = function () { // Cancel Button h('div.cancel.btn-light.confirm-screen-cancel-button', { onClick: (event) => this.cancel(event, txMeta), - }, 'CANCEL'), + }, t('cancelCaps')), // Accept Button - h('button.confirm-screen-confirm-button', ['CONFIRM']), + h('button.confirm-screen-confirm-button', [t('confirmCaps')]), ]), @@ -407,7 +407,7 @@ ConfirmSendToken.prototype.onSubmit = function (event) { if (valid && this.verifyGasParams()) { this.props.sendTransaction(txMeta, event) } else { - this.props.dispatch(actions.displayWarning('Invalid Gas Parameters')) + this.props.dispatch(actions.displayWarning(t('invalidGasParams'))) this.setState({ submitting: false }) } } diff --git a/ui/app/components/pending-typed-msg.js b/ui/app/components/pending-typed-msg.js index 73702d0f8..f0f846027 100644 --- a/ui/app/components/pending-typed-msg.js +++ b/ui/app/components/pending-typed-msg.js @@ -35,10 +35,10 @@ PendingMsg.prototype.render = function () { h('.flex-row.flex-space-around', [ h('button', { onClick: state.cancelTypedMessage, - }, t('cancelButton')), + }, t('cancelCaps')), h('button', { onClick: state.signTypedMessage, - }, t('signButton')), + }, t('signCaps')), ]), ]) diff --git a/ui/app/components/send-token/index.js b/ui/app/components/send-token/index.js index 99d078251..a40664977 100644 --- a/ui/app/components/send-token/index.js +++ b/ui/app/components/send-token/index.js @@ -126,14 +126,14 @@ SendTokenScreen.prototype.validate = function () { const amount = Number(stringAmount) const errors = { - to: !to ? 'Required' : null, - amount: !amount ? 'Required' : null, - gasPrice: !gasPrice ? 'Gas Price Required' : null, - gasLimit: !gasLimit ? 'Gas Limit Required' : null, + to: !to ? t('required') : null, + amount: !amount ? t('required') : null, + gasPrice: !gasPrice ? t('gasPriceRequired') : null, + gasLimit: !gasLimit ? t('gasLimitRequired') : null, } if (to && !isValidAddress(to)) { - errors.to = 'Invalid address' + errors.to = t('invalidAddress') } const isValid = Object.entries(errors).every(([key, value]) => value === null) @@ -233,11 +233,11 @@ SendTokenScreen.prototype.renderToAddressInput = function () { 'send-screen-input-wrapper--error': errorMessage, }), }, [ - h('div', ['To:']), + h('div', [t('toSpecific')]), h('input.large-input.send-screen-input', { name: 'address', list: 'addresses', - placeholder: 'Address', + placeholder: t('address'), value: to, onChange: e => this.setState({ to: e.target.value, @@ -355,8 +355,8 @@ SendTokenScreen.prototype.renderGasInput = function () { }), h('div.send-screen-gas-labels', {}, [ - h('span', [ h('i.fa.fa-bolt'), 'Gas fee:']), - h('span', ['What\'s this?']), + h('span', [ h('i.fa.fa-bolt'), t('gasFeeSpecific')]), + h('span', [t('whatsThis')]), ]), h('div.large-input.send-screen-gas-input', [ h(GasFeeDisplay, { @@ -370,7 +370,7 @@ SendTokenScreen.prototype.renderGasInput = function () { h( 'div.send-screen-gas-input-customize', { onClick: () => this.setState({ isGasTooltipOpen: !isGasTooltipOpen }) }, - ['Customize'] + [t('customize')] ), ]), h('div.send-screen-input-wrapper__error-message', [ @@ -381,7 +381,7 @@ SendTokenScreen.prototype.renderGasInput = function () { SendTokenScreen.prototype.renderMemoInput = function () { return h('div.send-screen-input-wrapper', [ - h('div', {}, ['Transaction memo (optional)']), + h('div', {}, [t('transactionMemo')]), h( 'input.large-input.send-screen-input', { onChange: e => this.setState({ memo: e.target.value }) } @@ -397,10 +397,10 @@ SendTokenScreen.prototype.renderButtons = function () { h('button.send-token__button-next.btn-secondary', { className: !isValid && 'send-screen__send-button__disabled', onClick: () => isValid && this.submit(), - }, ['Next']), + }, [t('next')]), h('button.send-token__button-cancel.btn-tertiary', { onClick: () => backToAccountDetail(selectedAddress), - }, ['Cancel']), + }, [t('cancel')]), ]) } @@ -417,9 +417,9 @@ SendTokenScreen.prototype.render = function () { diameter: 75, address: selectedTokenAddress, }), - h('div.send-token__title', ['Send Tokens']), - h('div.send-token__description', ['Send Tokens to anyone with an Ethereum account']), - h('div.send-token__balance-text', ['Your Token Balance is:']), + h('div.send-token__title', [t('sendTokens')]), + h('div.send-token__description', [t('sendTokensAnywhere')]), + h('div.send-token__balance-text', [t('tokenBalance')]), h('div.send-token__token-balance', [ h(TokenBalance, { token: selectedToken, balanceOnly: true }), ]), diff --git a/ui/app/components/send/gas-fee-display-v2.js b/ui/app/components/send/gas-fee-display-v2.js index 0c4c3f7a9..edaa297b9 100644 --- a/ui/app/components/send/gas-fee-display-v2.js +++ b/ui/app/components/send/gas-fee-display-v2.js @@ -30,7 +30,7 @@ GasFeeDisplay.prototype.render = function () { convertedPrefix: '$', readOnly: true, }) - : h('div.currency-display', 'Loading...'), + : h('div.currency-display', t('loading')), h('button.send-v2__sliders-icon-container', { onClick, @@ -41,4 +41,3 @@ GasFeeDisplay.prototype.render = function () { ]) } - diff --git a/ui/app/components/send/gas-tooltip.js b/ui/app/components/send/gas-tooltip.js index 46aff3499..da2a53c9e 100644 --- a/ui/app/components/send/gas-tooltip.js +++ b/ui/app/components/send/gas-tooltip.js @@ -81,7 +81,7 @@ GasTooltip.prototype.render = function () { 'marginTop': '81px', }, }, [ - h('span.gas-tooltip-label', {}, ['Gas Limit']), + h('span.gas-tooltip-label', {}, [t('gasLimit')]), h('i.fa.fa-info-circle'), ]), h(InputNumber, { @@ -97,4 +97,3 @@ GasTooltip.prototype.render = function () { ]), ]) } - diff --git a/ui/app/components/send/to-autocomplete.js b/ui/app/components/send/to-autocomplete.js index e0cdd0a58..85e7bfa0e 100644 --- a/ui/app/components/send/to-autocomplete.js +++ b/ui/app/components/send/to-autocomplete.js @@ -92,7 +92,7 @@ ToAutoComplete.prototype.render = function () { return h('div.send-v2__to-autocomplete', {}, [ h('input.send-v2__to-autocomplete__input', { - placeholder: 'Recipient Address', + placeholder: t('recipientAddress'), className: inError ? `send-v2__error-border` : '', value: to, onChange: event => onChange(event.target.value), @@ -111,4 +111,3 @@ ToAutoComplete.prototype.render = function () { ]) } - diff --git a/ui/app/components/signature-request.js b/ui/app/components/signature-request.js index 459d6a1a2..8003f8b1d 100644 --- a/ui/app/components/signature-request.js +++ b/ui/app/components/signature-request.js @@ -224,10 +224,10 @@ SignatureRequest.prototype.renderFooter = function () { return h('div.request-signature__footer', [ h('button.request-signature__footer__cancel-button', { onClick: cancel, - }, t('cancelButton')), + }, t('cancelCaps')), h('button.request-signature__footer__sign-button', { onClick: sign, - }, t('signButton')), + }, t('signCaps')), ]) } -- cgit v1.2.3 From 0164030e56b1db8117a1a0bdff91987321b2cd1a Mon Sep 17 00:00:00 2001 From: Dan Date: Wed, 24 Jan 2018 09:41:32 -0330 Subject: Handle errors when getting and setting to localStore. --- app/scripts/background.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/app/scripts/background.js b/app/scripts/background.js index 280c28d70..88600bf1e 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -57,7 +57,13 @@ async function loadStateFromPersistence () { // fetch from extension store and merge in data if (localStore.isSupported) { - const localData = await localStore.get() + let localData + try { + localData = await localStore.get() + } catch (err) { + log.error('error fetching state from local store:', err) + } + // TODO: handle possible exceptions (https://developer.chrome.com/apps/runtime#property-lastError) versionedData = Object.keys(localData).length > 0 ? localData : versionedData } @@ -113,7 +119,11 @@ function setupController (initState) { function syncDataWithExtension(state) { if (localStore.isSupported) { - localStore.set(state) // TODO: handle possible exceptions (https://developer.chrome.com/apps/runtime#property-lastError) + try { + localStore.set(state) + } catch (err) { + log.error('error setting state in local store:', err) + } } return state } -- cgit v1.2.3 From b7ae77f57a0e2bc68e9548364baa120805a1420c Mon Sep 17 00:00:00 2001 From: Dan Date: Wed, 24 Jan 2018 09:43:20 -0330 Subject: Check that extension.storage exists before attempting to call methods on it. --- app/scripts/lib/extension-store.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/scripts/lib/extension-store.js b/app/scripts/lib/extension-store.js index 67ee71f16..4a970321c 100644 --- a/app/scripts/lib/extension-store.js +++ b/app/scripts/lib/extension-store.js @@ -15,12 +15,12 @@ const handleDisabledSyncAndResolve = (resolve, toResolve) => { module.exports = class ExtensionStore { constructor() { - this.isSupported = !!(extension.storage.sync) + this.isSupported = !!(extension.storage && extension.storage.sync) this.isEnabled = true // TODO: get value from user settings } async fetch() { return new Promise((resolve) => { - extension.storage.sync.get(KEYS_TO_SYNC, (data) => { + extension.storage && extension.storage.sync.get(KEYS_TO_SYNC, (data) => { handleDisabledSyncAndResolve(resolve, data) }) }) @@ -31,7 +31,7 @@ module.exports = class ExtensionStore { return result }, {}) return new Promise((resolve) => { - extension.storage.sync.set(dataToSync, () => { + extension.storage && extension.storage.sync.set(dataToSync, () => { handleDisabledSyncAndResolve(resolve) }) }) -- cgit v1.2.3 From 598390e83ec68feaef256c0cfa3a239c6595475a Mon Sep 17 00:00:00 2001 From: Dan Date: Wed, 24 Jan 2018 09:44:00 -0330 Subject: Finish tests for extension-store fetch and sync. --- test/unit/extension-store-test.js | 50 ++++++++++++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 6 deletions(-) diff --git a/test/unit/extension-store-test.js b/test/unit/extension-store-test.js index e3b5713fb..e32f37d3c 100644 --- a/test/unit/extension-store-test.js +++ b/test/unit/extension-store-test.js @@ -1,5 +1,18 @@ const assert = require('assert') +const sinon = require('sinon') +const KEYS_TO_SYNC = ['KeyringController', 'PreferencesController'] +const mockSyncGetResult = 123 +const syncGetStub = sinon.stub().callsFake((str, cb) => cb(mockSyncGetResult)) +const syncSetStub = sinon.stub().callsFake((str, cb) => cb()) + +window.storage = { + sync: { + get: syncGetStub, + set: syncSetStub, + }, +} +window.runtime = {} const ExtensionStore = require('../../app/scripts/lib/extension-store') describe('Extension Store', function () { @@ -11,19 +24,44 @@ describe('Extension Store', function () { describe('#fetch', function () { it('should return a promise', function () { - + const extensionStoreFetchResult = extensionStore.fetch() + assert.ok(Promise.resolve(extensionStoreFetchResult) === extensionStoreFetchResult) }) - it('after promise resolution, should have loaded the proper data from the extension', function () { - + it('after promise resolution, should have loaded the proper data from the extension', function (done) { + extensionStore.fetch() + .then((result) => { + assert.deepEqual(syncGetStub.getCall(0).args[0], KEYS_TO_SYNC.slice(0)) + assert.equal(result, mockSyncGetResult) + done() + }) }) }) describe('#sync', function () { it('should return a promise', function () { - + const extensionStoreSyncResult = extensionStore.sync() + assert.ok(Promise.resolve(extensionStoreSyncResult) === extensionStoreSyncResult) }) - it('after promise resolution, should have synced the proper data from the extension', function () { - + it('after promise resolution, should have synced the proper data from the extension', function (done) { + const mockState = { + data: { + KeyringController: 5, + PreferencesController: 6, + someOtherData: 7 + }, + someOtherProp: { + evenMoreData: 8, + }, + } + const expectedDataToSync = { + KeyringController: 5, + PreferencesController: 6, + } + extensionStore.sync(mockState) + .then(() => { + assert.deepEqual(syncSetStub.getCall(0).args[0], expectedDataToSync) + done() + }) }) }) }) -- cgit v1.2.3 From 61cf5e9474676878853263a8f43b2d24e739f526 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Wed, 24 Jan 2018 11:03:24 -0800 Subject: Bump changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 905f1f98f..89ecb33ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Current Master +- Fix bug that could cause MetaMask to lose all of its local data. + ## 3.13.7 2018-1-22 - Add ability to bypass gas estimation loading indicator. -- cgit v1.2.3 From dd80bd48babc1bfebf91ac2350491b06971b1fc1 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Wed, 24 Jan 2018 11:36:15 -0800 Subject: Corrected unlimitedStorage permission --- app/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/manifest.json b/app/manifest.json index 13ba074e7..114586d0f 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -56,11 +56,11 @@ ], "permissions": [ "storage", + "unlimitedStorage", "clipboardWrite", "http://localhost:8545/", "https://*.infura.io/" ], - "unlimitedStorage": true, "web_accessible_resources": [ "scripts/inpage.js" ], -- cgit v1.2.3 From f09d72fa2aa88f0def76d228cb7d8eab29e3b092 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Wed, 24 Jan 2018 11:36:42 -0800 Subject: Remove extension-store since we aren't using it yet --- app/scripts/lib/extension-store.js | 39 ---------------------- test/unit/extension-store-test.js | 67 -------------------------------------- 2 files changed, 106 deletions(-) delete mode 100644 app/scripts/lib/extension-store.js delete mode 100644 test/unit/extension-store-test.js diff --git a/app/scripts/lib/extension-store.js b/app/scripts/lib/extension-store.js deleted file mode 100644 index 4a970321c..000000000 --- a/app/scripts/lib/extension-store.js +++ /dev/null @@ -1,39 +0,0 @@ -const extension = require('extensionizer') - -const KEYS_TO_SYNC = ['KeyringController', 'PreferencesController'] -const FIREFOX_SYNC_DISABLED_MESSAGE = 'Please set webextensions.storage.sync.enabled to true in about:config' - -const handleDisabledSyncAndResolve = (resolve, toResolve) => { - // Firefox 52 has sync available on extension.storage, but it is disabled by default - const lastError = extension.runtime.lastError - if (lastError && lastError.message.includes(FIREFOX_SYNC_DISABLED_MESSAGE)) { - resolve({}) - } else { - resolve(toResolve) - } -} - -module.exports = class ExtensionStore { - constructor() { - this.isSupported = !!(extension.storage && extension.storage.sync) - this.isEnabled = true // TODO: get value from user settings - } - async fetch() { - return new Promise((resolve) => { - extension.storage && extension.storage.sync.get(KEYS_TO_SYNC, (data) => { - handleDisabledSyncAndResolve(resolve, data) - }) - }) - } - async sync(state) { - const dataToSync = KEYS_TO_SYNC.reduce((result, key) => { - result[key] = state.data[key] - return result - }, {}) - return new Promise((resolve) => { - extension.storage && extension.storage.sync.set(dataToSync, () => { - handleDisabledSyncAndResolve(resolve) - }) - }) - } -} diff --git a/test/unit/extension-store-test.js b/test/unit/extension-store-test.js deleted file mode 100644 index e32f37d3c..000000000 --- a/test/unit/extension-store-test.js +++ /dev/null @@ -1,67 +0,0 @@ -const assert = require('assert') -const sinon = require('sinon') - -const KEYS_TO_SYNC = ['KeyringController', 'PreferencesController'] -const mockSyncGetResult = 123 -const syncGetStub = sinon.stub().callsFake((str, cb) => cb(mockSyncGetResult)) -const syncSetStub = sinon.stub().callsFake((str, cb) => cb()) - -window.storage = { - sync: { - get: syncGetStub, - set: syncSetStub, - }, -} -window.runtime = {} -const ExtensionStore = require('../../app/scripts/lib/extension-store') - -describe('Extension Store', function () { - let extensionStore - - beforeEach(function () { - extensionStore = new ExtensionStore() - }) - - describe('#fetch', function () { - it('should return a promise', function () { - const extensionStoreFetchResult = extensionStore.fetch() - assert.ok(Promise.resolve(extensionStoreFetchResult) === extensionStoreFetchResult) - }) - it('after promise resolution, should have loaded the proper data from the extension', function (done) { - extensionStore.fetch() - .then((result) => { - assert.deepEqual(syncGetStub.getCall(0).args[0], KEYS_TO_SYNC.slice(0)) - assert.equal(result, mockSyncGetResult) - done() - }) - }) - }) - - describe('#sync', function () { - it('should return a promise', function () { - const extensionStoreSyncResult = extensionStore.sync() - assert.ok(Promise.resolve(extensionStoreSyncResult) === extensionStoreSyncResult) - }) - it('after promise resolution, should have synced the proper data from the extension', function (done) { - const mockState = { - data: { - KeyringController: 5, - PreferencesController: 6, - someOtherData: 7 - }, - someOtherProp: { - evenMoreData: 8, - }, - } - const expectedDataToSync = { - KeyringController: 5, - PreferencesController: 6, - } - extensionStore.sync(mockState) - .then(() => { - assert.deepEqual(syncSetStub.getCall(0).args[0], expectedDataToSync) - done() - }) - }) - }) -}) -- cgit v1.2.3 From 7da52c599784130a5f7b6737f5b017bd3a95c1ed Mon Sep 17 00:00:00 2001 From: Nick Doiron Date: Wed, 24 Jan 2018 10:10:28 -1000 Subject: separate out cross-browser i18n for extensions --- ui/app/accounts/import/json.js | 1 + ui/app/accounts/import/private-key.js | 1 + ui/app/accounts/import/seed.js | 1 + ui/app/accounts/new-account/create-form.js | 1 + ui/app/accounts/new-account/index.js | 1 + ui/app/components/account-menu/index.js | 1 + ui/app/components/customize-gas-modal/index.js | 1 + .../dropdowns/components/account-dropdowns.js | 1 + ui/app/components/dropdowns/network-dropdown.js | 1 + ui/app/components/dropdowns/token-menu-dropdown.js | 1 + ui/app/components/modals/account-details-modal.js | 1 + ui/app/components/modals/account-modal-container.js | 1 + ui/app/components/modals/buy-options-modal.js | 1 + ui/app/components/modals/deposit-ether-modal.js | 1 + ui/app/components/modals/edit-account-name-modal.js | 1 + ui/app/components/modals/export-private-key-modal.js | 1 + .../components/modals/hide-token-confirmation-modal.js | 1 + ui/app/components/modals/modal.js | 1 + ui/app/components/modals/new-account-modal.js | 1 + .../components/pending-tx/confirm-deploy-contract.js | 1 + ui/app/components/pending-tx/confirm-send-ether.js | 1 + ui/app/components/pending-tx/confirm-send-token.js | 1 + ui/app/first-time/init-menu.js | 8 +------- ui/i18n.js | 18 ++++++++++++++++++ 24 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 ui/i18n.js diff --git a/ui/app/accounts/import/json.js b/ui/app/accounts/import/json.js index ca9a29e34..8b5a2b469 100644 --- a/ui/app/accounts/import/json.js +++ b/ui/app/accounts/import/json.js @@ -4,6 +4,7 @@ const h = require('react-hyperscript') const connect = require('react-redux').connect const actions = require('../../actions') const FileInput = require('react-simple-file-input').default +const t = require('../../../i18n') const HELP_LINK = 'https://support.metamask.io/kb/article/7-importing-accounts' diff --git a/ui/app/accounts/import/private-key.js b/ui/app/accounts/import/private-key.js index d8aa1a3d8..4a04156e0 100644 --- a/ui/app/accounts/import/private-key.js +++ b/ui/app/accounts/import/private-key.js @@ -3,6 +3,7 @@ const Component = require('react').Component const h = require('react-hyperscript') const connect = require('react-redux').connect const actions = require('../../actions') +const t = require('../../../i18n') module.exports = connect(mapStateToProps, mapDispatchToProps)(PrivateKeyImportView) diff --git a/ui/app/accounts/import/seed.js b/ui/app/accounts/import/seed.js index 241200c6f..9ffc669a2 100644 --- a/ui/app/accounts/import/seed.js +++ b/ui/app/accounts/import/seed.js @@ -2,6 +2,7 @@ const inherits = require('util').inherits const Component = require('react').Component const h = require('react-hyperscript') const connect = require('react-redux').connect +const t = require('../../../i18n') module.exports = connect(mapStateToProps)(SeedImportSubview) diff --git a/ui/app/accounts/new-account/create-form.js b/ui/app/accounts/new-account/create-form.js index f9faa928c..6f35e8886 100644 --- a/ui/app/accounts/new-account/create-form.js +++ b/ui/app/accounts/new-account/create-form.js @@ -3,6 +3,7 @@ const PropTypes = require('prop-types') const h = require('react-hyperscript') const { connect } = require('react-redux') const actions = require('../../actions') +const t = require('../../../i18n') class NewAccountCreateForm extends Component { constructor (props) { diff --git a/ui/app/accounts/new-account/index.js b/ui/app/accounts/new-account/index.js index 1ed43ae08..854568c77 100644 --- a/ui/app/accounts/new-account/index.js +++ b/ui/app/accounts/new-account/index.js @@ -3,6 +3,7 @@ const h = require('react-hyperscript') const inherits = require('util').inherits const connect = require('react-redux').connect const actions = require('../../actions') +const t = require('../../../i18n') const { getCurrentViewContext } = require('../../selectors') const classnames = require('classnames') diff --git a/ui/app/components/account-menu/index.js b/ui/app/components/account-menu/index.js index aec00ff6b..9c7b6b15a 100644 --- a/ui/app/components/account-menu/index.js +++ b/ui/app/components/account-menu/index.js @@ -6,6 +6,7 @@ const actions = require('../../actions') const { Menu, Item, Divider, CloseArea } = require('../dropdowns/components/menu') const Identicon = require('../identicon') const { formatBalance } = require('../../util') +const t = require('../../../i18n') module.exports = connect(mapStateToProps, mapDispatchToProps)(AccountMenu) diff --git a/ui/app/components/customize-gas-modal/index.js b/ui/app/components/customize-gas-modal/index.js index ae9ff769d..1c6036867 100644 --- a/ui/app/components/customize-gas-modal/index.js +++ b/ui/app/components/customize-gas-modal/index.js @@ -3,6 +3,7 @@ const h = require('react-hyperscript') const inherits = require('util').inherits const connect = require('react-redux').connect const actions = require('../../actions') +const t = require('../../../i18n') const GasModalCard = require('./gas-modal-card') const ethUtil = require('ethereumjs-util') diff --git a/ui/app/components/dropdowns/components/account-dropdowns.js b/ui/app/components/dropdowns/components/account-dropdowns.js index 76fbb8060..dfa5e5fac 100644 --- a/ui/app/components/dropdowns/components/account-dropdowns.js +++ b/ui/app/components/dropdowns/components/account-dropdowns.js @@ -10,6 +10,7 @@ const Identicon = require('../../identicon') const ethUtil = require('ethereumjs-util') const copyToClipboard = require('copy-to-clipboard') const { formatBalance } = require('../../../util') +const t = require('../../../../i18n') class AccountDropdowns extends Component { constructor (props) { diff --git a/ui/app/components/dropdowns/network-dropdown.js b/ui/app/components/dropdowns/network-dropdown.js index 02773fb46..0e16048d5 100644 --- a/ui/app/components/dropdowns/network-dropdown.js +++ b/ui/app/components/dropdowns/network-dropdown.js @@ -6,6 +6,7 @@ const actions = require('../../actions') const Dropdown = require('./components/dropdown').Dropdown const DropdownMenuItem = require('./components/dropdown').DropdownMenuItem const NetworkDropdownIcon = require('./components/network-dropdown-icon') +const t = require('../../../i18n') const R = require('ramda') // classes from nodes of the toggle element. diff --git a/ui/app/components/dropdowns/token-menu-dropdown.js b/ui/app/components/dropdowns/token-menu-dropdown.js index 3dfcec5a8..a4f93b505 100644 --- a/ui/app/components/dropdowns/token-menu-dropdown.js +++ b/ui/app/components/dropdowns/token-menu-dropdown.js @@ -3,6 +3,7 @@ const h = require('react-hyperscript') const inherits = require('util').inherits const connect = require('react-redux').connect const actions = require('../../actions') +const t = require('../../../i18n') module.exports = connect(null, mapDispatchToProps)(TokenMenuDropdown) diff --git a/ui/app/components/modals/account-details-modal.js b/ui/app/components/modals/account-details-modal.js index 746c6de4c..17760dc1a 100644 --- a/ui/app/components/modals/account-details-modal.js +++ b/ui/app/components/modals/account-details-modal.js @@ -8,6 +8,7 @@ const { getSelectedIdentity } = require('../../selectors') const genAccountLink = require('../../../lib/account-link.js') const QrView = require('../qr-code') const EditableLabel = require('../editable-label') +const t = require('../../../i18n') function mapStateToProps (state) { return { diff --git a/ui/app/components/modals/account-modal-container.js b/ui/app/components/modals/account-modal-container.js index 538edcf13..08540aa76 100644 --- a/ui/app/components/modals/account-modal-container.js +++ b/ui/app/components/modals/account-modal-container.js @@ -5,6 +5,7 @@ const connect = require('react-redux').connect const actions = require('../../actions') const { getSelectedIdentity } = require('../../selectors') const Identicon = require('../identicon') +const t = require('../../../i18n') function mapStateToProps (state) { return { diff --git a/ui/app/components/modals/buy-options-modal.js b/ui/app/components/modals/buy-options-modal.js index 60fef7db4..7eb73c3a6 100644 --- a/ui/app/components/modals/buy-options-modal.js +++ b/ui/app/components/modals/buy-options-modal.js @@ -4,6 +4,7 @@ const inherits = require('util').inherits const connect = require('react-redux').connect const actions = require('../../actions') const networkNames = require('../../../../app/scripts/config.js').networkNames +const t = require('../../../i18n') function mapStateToProps (state) { return { diff --git a/ui/app/components/modals/deposit-ether-modal.js b/ui/app/components/modals/deposit-ether-modal.js index 85f640a68..e91b43841 100644 --- a/ui/app/components/modals/deposit-ether-modal.js +++ b/ui/app/components/modals/deposit-ether-modal.js @@ -5,6 +5,7 @@ const connect = require('react-redux').connect const actions = require('../../actions') const networkNames = require('../../../../app/scripts/config.js').networkNames const ShapeshiftForm = require('../shapeshift-form') +const t = require('../../../i18n') const DIRECT_DEPOSIT_ROW_TITLE = t('directDepositEther') const DIRECT_DEPOSIT_ROW_TEXT = t('directDepositEtherExplainer') diff --git a/ui/app/components/modals/edit-account-name-modal.js b/ui/app/components/modals/edit-account-name-modal.js index 410fac7ba..611def005 100644 --- a/ui/app/components/modals/edit-account-name-modal.js +++ b/ui/app/components/modals/edit-account-name-modal.js @@ -4,6 +4,7 @@ const inherits = require('util').inherits const connect = require('react-redux').connect const actions = require('../../actions') const { getSelectedAccount } = require('../../selectors') +const t = require('../../../i18n') function mapStateToProps (state) { return { diff --git a/ui/app/components/modals/export-private-key-modal.js b/ui/app/components/modals/export-private-key-modal.js index 0745827cb..017177cfd 100644 --- a/ui/app/components/modals/export-private-key-modal.js +++ b/ui/app/components/modals/export-private-key-modal.js @@ -7,6 +7,7 @@ const actions = require('../../actions') const AccountModalContainer = require('./account-modal-container') const { getSelectedIdentity } = require('../../selectors') const ReadOnlyInput = require('../readonly-input') +const t = require('../../../i18n') const copyToClipboard = require('copy-to-clipboard') function mapStateToProps (state) { diff --git a/ui/app/components/modals/hide-token-confirmation-modal.js b/ui/app/components/modals/hide-token-confirmation-modal.js index 55f1695af..98b1e2d03 100644 --- a/ui/app/components/modals/hide-token-confirmation-modal.js +++ b/ui/app/components/modals/hide-token-confirmation-modal.js @@ -4,6 +4,7 @@ const inherits = require('util').inherits const connect = require('react-redux').connect const actions = require('../../actions') const Identicon = require('../identicon') +const t = require('../../../i18n') function mapStateToProps (state) { return { diff --git a/ui/app/components/modals/modal.js b/ui/app/components/modals/modal.js index e4e644d40..ea6ac5135 100644 --- a/ui/app/components/modals/modal.js +++ b/ui/app/components/modals/modal.js @@ -6,6 +6,7 @@ const FadeModal = require('boron').FadeModal const actions = require('../../actions') const isMobileView = require('../../../lib/is-mobile-view') const isPopupOrNotification = require('../../../../app/scripts/lib/is-popup-or-notification') +const t = require('../../../i18n') // Modal Components const BuyOptions = require('./buy-options-modal') diff --git a/ui/app/components/modals/new-account-modal.js b/ui/app/components/modals/new-account-modal.js index 4fdfbd745..35f4764a6 100644 --- a/ui/app/components/modals/new-account-modal.js +++ b/ui/app/components/modals/new-account-modal.js @@ -3,6 +3,7 @@ const PropTypes = require('prop-types') const h = require('react-hyperscript') const { connect } = require('react-redux') const actions = require('../../actions') +const t = require('../../../i18n') class NewAccountModal extends Component { constructor (props) { diff --git a/ui/app/components/pending-tx/confirm-deploy-contract.js b/ui/app/components/pending-tx/confirm-deploy-contract.js index 0d8b2721f..e6972c541 100644 --- a/ui/app/components/pending-tx/confirm-deploy-contract.js +++ b/ui/app/components/pending-tx/confirm-deploy-contract.js @@ -9,6 +9,7 @@ const ethUtil = require('ethereumjs-util') const BN = ethUtil.BN const hexToBn = require('../../../../app/scripts/lib/hex-to-bn') const { conversionUtil } = require('../../conversion-util') +const t = require('../../../i18n') const { MIN_GAS_PRICE_HEX } = require('../send/send-constants') diff --git a/ui/app/components/pending-tx/confirm-send-ether.js b/ui/app/components/pending-tx/confirm-send-ether.js index 7608e02ad..52693b4f6 100644 --- a/ui/app/components/pending-tx/confirm-send-ether.js +++ b/ui/app/components/pending-tx/confirm-send-ether.js @@ -9,6 +9,7 @@ const ethUtil = require('ethereumjs-util') const BN = ethUtil.BN const hexToBn = require('../../../../app/scripts/lib/hex-to-bn') const { conversionUtil, addCurrencies } = require('../../conversion-util') +const t = require('../../../i18n') const { MIN_GAS_PRICE_HEX } = require('../send/send-constants') diff --git a/ui/app/components/pending-tx/confirm-send-token.js b/ui/app/components/pending-tx/confirm-send-token.js index 88644d57a..14523461f 100644 --- a/ui/app/components/pending-tx/confirm-send-token.js +++ b/ui/app/components/pending-tx/confirm-send-token.js @@ -6,6 +6,7 @@ const tokenAbi = require('human-standard-token-abi') const abiDecoder = require('abi-decoder') abiDecoder.addABI(tokenAbi) const actions = require('../../actions') +const t = require('../../../i18n') const clone = require('clone') const Identicon = require('../identicon') const ethUtil = require('ethereumjs-util') diff --git a/ui/app/first-time/init-menu.js b/ui/app/first-time/init-menu.js index c496690a7..6b50bf504 100644 --- a/ui/app/first-time/init-menu.js +++ b/ui/app/first-time/init-menu.js @@ -6,17 +6,11 @@ const h = require('react-hyperscript') const Mascot = require('../components/mascot') const actions = require('../actions') const Tooltip = require('../components/tooltip') +const t = require('../../i18n') const getCaretCoordinates = require('textarea-caret') let isSubmitting = false -let t = chrome.i18n.getMessage || (function() { - let msg = require('../../../app/_locales/en/messages.json'); - return (function(key) { - return msg[key].message; - }); -})(); - module.exports = connect(mapStateToProps)(InitializeMenuScreen) inherits(InitializeMenuScreen, Component) diff --git a/ui/i18n.js b/ui/i18n.js new file mode 100644 index 000000000..e842c9ef9 --- /dev/null +++ b/ui/i18n.js @@ -0,0 +1,18 @@ + +// cross-browser connection to extension i18n API + +var getMessage; + +if ((chrome && chrome.i18n && chrome.i18n.getMessage) || + (browser && browser.i18n && browser.i18n.getMessage)) { + getMessage = (chrome || browser).i18n.getMessage; +} else { + // fallback function + console.warn('browser.i18n API not available?'); + let msg = require('../app/_locales/en/messages.json'); + getMessage = function(key) { + return msg[key].message; + }); +} + +module.exports = getMessage; -- cgit v1.2.3 From b281a5275983c4e2d924ba696c4885fd779d2c44 Mon Sep 17 00:00:00 2001 From: Dan Date: Wed, 24 Jan 2018 16:49:12 -0330 Subject: Remove already handled TODO comment. --- app/scripts/background.js | 1 - 1 file changed, 1 deletion(-) diff --git a/app/scripts/background.js b/app/scripts/background.js index 88600bf1e..3e04a31b3 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -64,7 +64,6 @@ async function loadStateFromPersistence () { log.error('error fetching state from local store:', err) } - // TODO: handle possible exceptions (https://developer.chrome.com/apps/runtime#property-lastError) versionedData = Object.keys(localData).length > 0 ? localData : versionedData } -- cgit v1.2.3 From cd5eaa4393a122247295c7627a3fad3e678bea30 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Wed, 24 Jan 2018 13:05:13 -0800 Subject: Remove redundant async modifiers --- app/scripts/lib/local-store.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/scripts/lib/local-store.js b/app/scripts/lib/local-store.js index 32faac96b..9114364b6 100644 --- a/app/scripts/lib/local-store.js +++ b/app/scripts/lib/local-store.js @@ -12,12 +12,12 @@ module.exports = class ExtensionStore { log.error('Storage local API not available.') } } - async get() { + get() { return new Promise((resolve) => { extension.storage.local.get(STORAGE_KEY, resolve) }) } - async set(state) { + set(state) { return new Promise((resolve) => { extension.storage.local.set(state, resolve) }) -- cgit v1.2.3 From 76521cf7399c1e694a7202dcb9725ed5e1e2a0d7 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Wed, 24 Jan 2018 15:03:16 -0800 Subject: Fix retrieval of object --- app/scripts/lib/local-store.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/scripts/lib/local-store.js b/app/scripts/lib/local-store.js index 9114364b6..9e8d8db37 100644 --- a/app/scripts/lib/local-store.js +++ b/app/scripts/lib/local-store.js @@ -3,7 +3,6 @@ // https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/storage/local const extension = require('extensionizer') -const STORAGE_KEY = 'metamask-config' module.exports = class ExtensionStore { constructor() { @@ -14,7 +13,7 @@ module.exports = class ExtensionStore { } get() { return new Promise((resolve) => { - extension.storage.local.get(STORAGE_KEY, resolve) + extension.storage.local.get(null, resolve) }) } set(state) { -- cgit v1.2.3 From 2f13790653cb20d9d967700133df6cf31ff02d14 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Wed, 24 Jan 2018 15:28:15 -0800 Subject: Remove local storage writes, add log --- app/scripts/background.js | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/app/scripts/background.js b/app/scripts/background.js index 3e04a31b3..a77763c41 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -35,6 +35,7 @@ let popupIsOpen = false // state persistence const diskStore = new LocalStorageStore({ storageKey: STORAGE_KEY }) const localStore = new LocalStore() +let versionedData // initialization flow initialize().catch(log.error) @@ -53,7 +54,7 @@ async function loadStateFromPersistence () { // migrations const migrator = new Migrator({ migrations }) // read from disk - let versionedData = diskStore.getState() || migrator.generateInitialState(firstTimeState) + versionedData = diskStore.getState() || migrator.generateInitialState(firstTimeState) // fetch from extension store and merge in data if (localStore.isSupported) { @@ -64,13 +65,24 @@ async function loadStateFromPersistence () { log.error('error fetching state from local store:', err) } - versionedData = Object.keys(localData).length > 0 ? localData : versionedData + console.log('Comparing localdata and versionedData') + console.dir({ localData }) + + if (Object.keys(localData).length > 0) { + console.log('using the local store data') + versionedData = localData + } } // migrate data versionedData = await migrator.migrateData(versionedData) + // write to disk - diskStore.putState(versionedData) + localStore.set(versionedData) + .catch((reason) => { + log.error('Problem saving migrated data', versionedData) + }) + // return just the data return versionedData.data } @@ -107,11 +119,9 @@ function setupController (initState) { asStream(controller.store), storeTransform(versionifyData), storeTransform(syncDataWithExtension), - asStream(diskStore) ) function versionifyData (state) { - const versionedData = diskStore.getState() versionedData.data = state return versionedData } @@ -119,6 +129,7 @@ function setupController (initState) { function syncDataWithExtension(state) { if (localStore.isSupported) { try { + console.log('persisting state', state) localStore.set(state) } catch (err) { log.error('error setting state in local store:', err) -- cgit v1.2.3 From 9c133aaab30decce16a1bf4120071d4614f99bc8 Mon Sep 17 00:00:00 2001 From: Nick Doiron Date: Wed, 24 Jan 2018 19:41:29 -1000 Subject: get t imported in all files currently using i18n --- ui/app/components/account-dropdowns.js | 1 + ui/app/components/account-export.js | 1 + ui/app/components/buy-button-subview.js | 1 + ui/app/components/coinbase-form.js | 1 + ui/app/components/copyButton.js | 1 + ui/app/components/copyable.js | 1 + ui/app/components/ens-input.js | 1 + ui/app/components/hex-as-decimal-input.js | 1 + ui/app/components/network.js | 1 + ui/app/components/notice.js | 1 + ui/app/components/pending-msg-details.js | 1 + ui/app/components/pending-msg.js | 1 + ui/app/components/pending-personal-msg-details.js | 1 + ui/app/components/pending-typed-msg-details.js | 1 + ui/app/components/pending-typed-msg.js | 1 + ui/app/components/send-token/index.js | 1 + ui/app/components/send/gas-fee-display-v2.js | 1 + ui/app/components/send/gas-tooltip.js | 1 + ui/app/components/send/to-autocomplete.js | 1 + ui/app/components/shapeshift-form.js | 1 + ui/app/components/shift-list-item.js | 1 + ui/app/components/signature-request.js | 1 + ui/app/components/token-list.js | 1 + ui/app/components/transaction-list-item.js | 1 + ui/app/components/transaction-list.js | 1 + ui/app/components/tx-list-item.js | 1 + ui/app/components/tx-list.js | 1 + ui/app/components/tx-view.js | 1 + ui/app/components/wallet-view.js | 1 + ui/i18n.js | 2 +- 30 files changed, 30 insertions(+), 1 deletion(-) diff --git a/ui/app/components/account-dropdowns.js b/ui/app/components/account-dropdowns.js index 3e5805c0e..ede40d3f2 100644 --- a/ui/app/components/account-dropdowns.js +++ b/ui/app/components/account-dropdowns.js @@ -9,6 +9,7 @@ const DropdownMenuItem = require('./dropdown').DropdownMenuItem const Identicon = require('./identicon') const ethUtil = require('ethereumjs-util') const copyToClipboard = require('copy-to-clipboard') +const t = require('../../i18n') class AccountDropdowns extends Component { constructor (props) { diff --git a/ui/app/components/account-export.js b/ui/app/components/account-export.js index 346872a97..25f36da58 100644 --- a/ui/app/components/account-export.js +++ b/ui/app/components/account-export.js @@ -6,6 +6,7 @@ const copyToClipboard = require('copy-to-clipboard') const actions = require('../actions') const ethUtil = require('ethereumjs-util') const connect = require('react-redux').connect +const t = require('../../i18n') module.exports = connect(mapStateToProps)(ExportAccountView) diff --git a/ui/app/components/buy-button-subview.js b/ui/app/components/buy-button-subview.js index 76da4fc9d..6f2c74b6d 100644 --- a/ui/app/components/buy-button-subview.js +++ b/ui/app/components/buy-button-subview.js @@ -9,6 +9,7 @@ const Loading = require('./loading') const AccountPanel = require('./account-panel') const RadioList = require('./custom-radio-list') const networkNames = require('../../../app/scripts/config.js').networkNames +const t = require('../../i18n') module.exports = connect(mapStateToProps)(BuyButtonSubview) diff --git a/ui/app/components/coinbase-form.js b/ui/app/components/coinbase-form.js index 6532cb3bf..e442b43d5 100644 --- a/ui/app/components/coinbase-form.js +++ b/ui/app/components/coinbase-form.js @@ -3,6 +3,7 @@ const h = require('react-hyperscript') const inherits = require('util').inherits const connect = require('react-redux').connect const actions = require('../actions') +const t = require('../../i18n') module.exports = connect(mapStateToProps)(CoinbaseForm) diff --git a/ui/app/components/copyButton.js b/ui/app/components/copyButton.js index 5d5be8feb..355f78d45 100644 --- a/ui/app/components/copyButton.js +++ b/ui/app/components/copyButton.js @@ -2,6 +2,7 @@ const Component = require('react').Component const h = require('react-hyperscript') const inherits = require('util').inherits const copyToClipboard = require('copy-to-clipboard') +const t = require('../../i18n') const Tooltip = require('./tooltip') diff --git a/ui/app/components/copyable.js b/ui/app/components/copyable.js index 690e44153..fca7d3863 100644 --- a/ui/app/components/copyable.js +++ b/ui/app/components/copyable.js @@ -4,6 +4,7 @@ const inherits = require('util').inherits const Tooltip = require('./tooltip') const copyToClipboard = require('copy-to-clipboard') +const t = require('../../i18n') module.exports = Copyable diff --git a/ui/app/components/ens-input.js b/ui/app/components/ens-input.js index 3e7a23369..add67ea35 100644 --- a/ui/app/components/ens-input.js +++ b/ui/app/components/ens-input.js @@ -8,6 +8,7 @@ const ENS = require('ethjs-ens') const networkMap = require('ethjs-ens/lib/network-map.json') const ensRE = /.+\..+$/ const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000' +const t = require('../../i18n') module.exports = EnsInput diff --git a/ui/app/components/hex-as-decimal-input.js b/ui/app/components/hex-as-decimal-input.js index 07432a1f2..992d8c8cd 100644 --- a/ui/app/components/hex-as-decimal-input.js +++ b/ui/app/components/hex-as-decimal-input.js @@ -4,6 +4,7 @@ const inherits = require('util').inherits const ethUtil = require('ethereumjs-util') const BN = ethUtil.BN const extend = require('xtend') +const t = require('../../i18n') module.exports = HexAsDecimalInput diff --git a/ui/app/components/network.js b/ui/app/components/network.js index 6cb1ff53d..f3df2242a 100644 --- a/ui/app/components/network.js +++ b/ui/app/components/network.js @@ -3,6 +3,7 @@ const h = require('react-hyperscript') const classnames = require('classnames') const inherits = require('util').inherits const NetworkDropdownIcon = require('./dropdowns/components/network-dropdown-icon') +const t = require('../../i18n') module.exports = Network diff --git a/ui/app/components/notice.js b/ui/app/components/notice.js index 5bda329ed..390639297 100644 --- a/ui/app/components/notice.js +++ b/ui/app/components/notice.js @@ -4,6 +4,7 @@ const h = require('react-hyperscript') const ReactMarkdown = require('react-markdown') const linker = require('extension-link-enabler') const findDOMNode = require('react-dom').findDOMNode +const t = require('../../i18n') module.exports = Notice diff --git a/ui/app/components/pending-msg-details.js b/ui/app/components/pending-msg-details.js index 3ea063c3c..b66657f3b 100644 --- a/ui/app/components/pending-msg-details.js +++ b/ui/app/components/pending-msg-details.js @@ -1,6 +1,7 @@ const Component = require('react').Component const h = require('react-hyperscript') const inherits = require('util').inherits +const t = require('../../i18n') const AccountPanel = require('./account-panel') diff --git a/ui/app/components/pending-msg.js b/ui/app/components/pending-msg.js index 236849c18..dc406b955 100644 --- a/ui/app/components/pending-msg.js +++ b/ui/app/components/pending-msg.js @@ -2,6 +2,7 @@ const Component = require('react').Component const h = require('react-hyperscript') const inherits = require('util').inherits const PendingTxDetails = require('./pending-msg-details') +const t = require('../../i18n') module.exports = PendingMsg diff --git a/ui/app/components/pending-personal-msg-details.js b/ui/app/components/pending-personal-msg-details.js index 30c475347..d21689f86 100644 --- a/ui/app/components/pending-personal-msg-details.js +++ b/ui/app/components/pending-personal-msg-details.js @@ -1,6 +1,7 @@ const Component = require('react').Component const h = require('react-hyperscript') const inherits = require('util').inherits +const t = require('../../i18n') const AccountPanel = require('./account-panel') const BinaryRenderer = require('./binary-renderer') diff --git a/ui/app/components/pending-typed-msg-details.js b/ui/app/components/pending-typed-msg-details.js index a3381174d..9708ed1d7 100644 --- a/ui/app/components/pending-typed-msg-details.js +++ b/ui/app/components/pending-typed-msg-details.js @@ -4,6 +4,7 @@ const inherits = require('util').inherits const AccountPanel = require('./account-panel') const TypedMessageRenderer = require('./typed-message-renderer') +const t = require('../../i18n') module.exports = PendingMsgDetails diff --git a/ui/app/components/pending-typed-msg.js b/ui/app/components/pending-typed-msg.js index f0f846027..3d473f47d 100644 --- a/ui/app/components/pending-typed-msg.js +++ b/ui/app/components/pending-typed-msg.js @@ -2,6 +2,7 @@ const Component = require('react').Component const h = require('react-hyperscript') const inherits = require('util').inherits const PendingTxDetails = require('./pending-typed-msg-details') +const t = require('../../i18n') module.exports = PendingMsg diff --git a/ui/app/components/send-token/index.js b/ui/app/components/send-token/index.js index a40664977..2ad7c9dd0 100644 --- a/ui/app/components/send-token/index.js +++ b/ui/app/components/send-token/index.js @@ -7,6 +7,7 @@ const inherits = require('util').inherits const actions = require('../../actions') const selectors = require('../../selectors') const { isValidAddress, allNull } = require('../../util') +const t = require('../../../i18n') // const BalanceComponent = require('./balance-component') const Identicon = require('../identicon') diff --git a/ui/app/components/send/gas-fee-display-v2.js b/ui/app/components/send/gas-fee-display-v2.js index edaa297b9..0c6f76303 100644 --- a/ui/app/components/send/gas-fee-display-v2.js +++ b/ui/app/components/send/gas-fee-display-v2.js @@ -2,6 +2,7 @@ const Component = require('react').Component const h = require('react-hyperscript') const inherits = require('util').inherits const CurrencyDisplay = require('./currency-display') +const t = require('../../../i18n') module.exports = GasFeeDisplay diff --git a/ui/app/components/send/gas-tooltip.js b/ui/app/components/send/gas-tooltip.js index da2a53c9e..d925d3ed8 100644 --- a/ui/app/components/send/gas-tooltip.js +++ b/ui/app/components/send/gas-tooltip.js @@ -2,6 +2,7 @@ const Component = require('react').Component const h = require('react-hyperscript') const inherits = require('util').inherits const InputNumber = require('../input-number.js') +const t = require('../../../i18n') module.exports = GasTooltip diff --git a/ui/app/components/send/to-autocomplete.js b/ui/app/components/send/to-autocomplete.js index 85e7bfa0e..72074229e 100644 --- a/ui/app/components/send/to-autocomplete.js +++ b/ui/app/components/send/to-autocomplete.js @@ -2,6 +2,7 @@ const Component = require('react').Component const h = require('react-hyperscript') const inherits = require('util').inherits const AccountListItem = require('./account-list-item') +const t = require('../../../i18n') module.exports = ToAutoComplete diff --git a/ui/app/components/shapeshift-form.js b/ui/app/components/shapeshift-form.js index 773ff227c..329feb38f 100644 --- a/ui/app/components/shapeshift-form.js +++ b/ui/app/components/shapeshift-form.js @@ -7,6 +7,7 @@ const { qrcode } = require('qrcode-npm') const { shapeShiftSubview, pairUpdate, buyWithShapeShift } = require('../actions') const { isValidAddress } = require('../util') const SimpleDropdown = require('./dropdowns/simple-dropdown') +const t = require('../../i18n') function mapStateToProps (state) { const { diff --git a/ui/app/components/shift-list-item.js b/ui/app/components/shift-list-item.js index 6e5be641f..21d41a06c 100644 --- a/ui/app/components/shift-list-item.js +++ b/ui/app/components/shift-list-item.js @@ -6,6 +6,7 @@ const vreme = new (require('vreme'))() const explorerLink = require('etherscan-link').createExplorerLink const actions = require('../actions') const addressSummary = require('../util').addressSummary +const t = require('../../i18n') const CopyButton = require('./copyButton') const EthBalance = require('./eth-balance') diff --git a/ui/app/components/signature-request.js b/ui/app/components/signature-request.js index 8003f8b1d..d0e568bca 100644 --- a/ui/app/components/signature-request.js +++ b/ui/app/components/signature-request.js @@ -9,6 +9,7 @@ const classnames = require('classnames') const AccountDropdownMini = require('./dropdowns/account-dropdown-mini') const actions = require('../actions') +const t = require('../../i18n') const { conversionUtil } = require('../conversion-util') const { diff --git a/ui/app/components/token-list.js b/ui/app/components/token-list.js index a25566e64..01529aeda 100644 --- a/ui/app/components/token-list.js +++ b/ui/app/components/token-list.js @@ -5,6 +5,7 @@ const TokenTracker = require('eth-token-tracker') const TokenCell = require('./token-cell.js') const connect = require('react-redux').connect const selectors = require('../selectors') +const t = require('../../i18n') function mapStateToProps (state) { return { diff --git a/ui/app/components/transaction-list-item.js b/ui/app/components/transaction-list-item.js index 10d4236cb..6baf60141 100644 --- a/ui/app/components/transaction-list-item.js +++ b/ui/app/components/transaction-list-item.js @@ -11,6 +11,7 @@ const vreme = new (require('vreme'))() const Tooltip = require('./tooltip') const numberToBN = require('number-to-bn') const actions = require('../actions') +const t = require('../../i18n') const TransactionIcon = require('./transaction-list-item-icon') const ShiftListItem = require('./shift-list-item') diff --git a/ui/app/components/transaction-list.js b/ui/app/components/transaction-list.js index cb3f8097b..07f7a06ae 100644 --- a/ui/app/components/transaction-list.js +++ b/ui/app/components/transaction-list.js @@ -3,6 +3,7 @@ const h = require('react-hyperscript') const inherits = require('util').inherits const TransactionListItem = require('./transaction-list-item') +const t = require('../../i18n') module.exports = TransactionList diff --git a/ui/app/components/tx-list-item.js b/ui/app/components/tx-list-item.js index d53277925..7a38096b6 100644 --- a/ui/app/components/tx-list-item.js +++ b/ui/app/components/tx-list-item.js @@ -13,6 +13,7 @@ const { conversionUtil, multiplyCurrencies } = require('../conversion-util') const { calcTokenAmount } = require('../token-util') const { getCurrentCurrency } = require('../selectors') +const t = require('../../i18n') module.exports = connect(mapStateToProps)(TxListItem) diff --git a/ui/app/components/tx-list.js b/ui/app/components/tx-list.js index 6076ab5d3..8343ec46b 100644 --- a/ui/app/components/tx-list.js +++ b/ui/app/components/tx-list.js @@ -10,6 +10,7 @@ const { formatDate } = require('../util') const { showConfTxPage } = require('../actions') const classnames = require('classnames') const { tokenInfoGetter } = require('../token-util') +const t = require('../../i18n') module.exports = connect(mapStateToProps, mapDispatchToProps)(TxList) diff --git a/ui/app/components/tx-view.js b/ui/app/components/tx-view.js index 423234d4f..adc9b8e94 100644 --- a/ui/app/components/tx-view.js +++ b/ui/app/components/tx-view.js @@ -5,6 +5,7 @@ const ethUtil = require('ethereumjs-util') const inherits = require('util').inherits const actions = require('../actions') const selectors = require('../selectors') +const t = require('../../i18n') const BalanceComponent = require('./balance-component') const TxList = require('./tx-list') diff --git a/ui/app/components/wallet-view.js b/ui/app/components/wallet-view.js index 3d9c01c6e..60a780fc6 100644 --- a/ui/app/components/wallet-view.js +++ b/ui/app/components/wallet-view.js @@ -9,6 +9,7 @@ const actions = require('../actions') const BalanceComponent = require('./balance-component') const TokenList = require('./token-list') const selectors = require('../selectors') +const t = require('../../i18n') module.exports = connect(mapStateToProps, mapDispatchToProps)(WalletView) diff --git a/ui/i18n.js b/ui/i18n.js index e842c9ef9..c2cf9b449 100644 --- a/ui/i18n.js +++ b/ui/i18n.js @@ -12,7 +12,7 @@ if ((chrome && chrome.i18n && chrome.i18n.getMessage) || let msg = require('../app/_locales/en/messages.json'); getMessage = function(key) { return msg[key].message; - }); + }; } module.exports = getMessage; -- cgit v1.2.3 From ceebc6caa4f3eab1cf6c9ec8f47dc8bd450ca4a9 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Thu, 25 Jan 2018 13:01:03 -0800 Subject: Debounce storage to avoid crashing pump --- app/scripts/background.js | 16 ++++++++-------- package.json | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/scripts/background.js b/app/scripts/background.js index a77763c41..2a8efd844 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -1,6 +1,7 @@ const urlUtil = require('url') const endOfStream = require('end-of-stream') const pump = require('pump') +const debounce = require('debounce-stream') const log = require('loglevel') const extension = require('extensionizer') const LocalStorageStore = require('obs-store/lib/localStorage') @@ -65,11 +66,7 @@ async function loadStateFromPersistence () { log.error('error fetching state from local store:', err) } - console.log('Comparing localdata and versionedData') - console.dir({ localData }) - if (Object.keys(localData).length > 0) { - console.log('using the local store data') versionedData = localData } } @@ -117,8 +114,12 @@ function setupController (initState) { // setup state persistence pump( asStream(controller.store), + debounce(200), storeTransform(versionifyData), storeTransform(syncDataWithExtension), + (error) => { + log.error('pump hit error', error) + } ) function versionifyData (state) { @@ -126,15 +127,14 @@ function setupController (initState) { return versionedData } - function syncDataWithExtension(state) { + async function syncDataWithExtension(state) { if (localStore.isSupported) { try { - console.log('persisting state', state) - localStore.set(state) + await localStore.set(state) } catch (err) { log.error('error setting state in local store:', err) } - } + } else { log.error('local store not supported') } return state } diff --git a/package.json b/package.json index a1de1db14..c50b29e42 100644 --- a/package.json +++ b/package.json @@ -62,6 +62,7 @@ "clone": "^2.1.1", "copy-to-clipboard": "^3.0.8", "debounce": "^1.0.0", + "debounce-stream": "^2.0.0", "deep-extend": "^0.5.0", "detect-node": "^2.0.3", "disc": "^1.3.2", -- cgit v1.2.3 From 8ba64c657ff801425c06db166e2c9a06289047de Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Thu, 25 Jan 2018 15:38:43 -0800 Subject: Increase storage debounce value --- app/scripts/background.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/background.js b/app/scripts/background.js index 2a8efd844..07a260a4f 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -114,7 +114,7 @@ function setupController (initState) { // setup state persistence pump( asStream(controller.store), - debounce(200), + debounce(1000), storeTransform(versionifyData), storeTransform(syncDataWithExtension), (error) => { -- cgit v1.2.3 From f673c2a8a4d6aac1d22813c3e076fe91f08823f2 Mon Sep 17 00:00:00 2001 From: Nick Doiron Date: Sun, 28 Jan 2018 00:20:56 -0500 Subject: pass linter, update ui test --- test/integration/lib/first-time.js | 2 +- ui/i18n.js | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/test/integration/lib/first-time.js b/test/integration/lib/first-time.js index e59897713..318119902 100644 --- a/test/integration/lib/first-time.js +++ b/test/integration/lib/first-time.js @@ -41,7 +41,7 @@ async function runFirstTimeUsageTest(assert, done) { // Scroll through terms const title = app.find('h1').text() // TODO Find where Metamask is getting added twice in the title - assert.equal(title, 'MetaMaskMetaMask', 'title screen') + assert.equal(title, 'MetaMask', 'title screen') // enter password const pwBox = app.find('#password-box')[0] diff --git a/ui/i18n.js b/ui/i18n.js index c2cf9b449..0f4e9fce4 100644 --- a/ui/i18n.js +++ b/ui/i18n.js @@ -1,18 +1,20 @@ // cross-browser connection to extension i18n API -var getMessage; +const chrome = chrome || null +const browser = browser || null +let getMessage = null if ((chrome && chrome.i18n && chrome.i18n.getMessage) || (browser && browser.i18n && browser.i18n.getMessage)) { - getMessage = (chrome || browser).i18n.getMessage; + getMessage = (chrome || browser).i18n.getMessage } else { // fallback function - console.warn('browser.i18n API not available?'); - let msg = require('../app/_locales/en/messages.json'); - getMessage = function(key) { - return msg[key].message; - }; + console.warn('browser.i18n API not available?') + let msg = require('../app/_locales/en/messages.json') + getMessage = function (key) { + return msg[key].message + } } -module.exports = getMessage; +module.exports = getMessage -- cgit v1.2.3 From 1698541bcdce6c2933c8b3b4e1c89e2f391c3a68 Mon Sep 17 00:00:00 2001 From: Nick Doiron Date: Sun, 28 Jan 2018 21:14:06 -0500 Subject: CI still has MetaMask title doubled --- test/integration/lib/first-time.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/lib/first-time.js b/test/integration/lib/first-time.js index 318119902..e59897713 100644 --- a/test/integration/lib/first-time.js +++ b/test/integration/lib/first-time.js @@ -41,7 +41,7 @@ async function runFirstTimeUsageTest(assert, done) { // Scroll through terms const title = app.find('h1').text() // TODO Find where Metamask is getting added twice in the title - assert.equal(title, 'MetaMask', 'title screen') + assert.equal(title, 'MetaMaskMetaMask', 'title screen') // enter password const pwBox = app.find('#password-box')[0] -- cgit v1.2.3 From abfa74f09a0119345165a32090d88a1d95df6c80 Mon Sep 17 00:00:00 2001 From: Nick Doiron Date: Mon, 29 Jan 2018 15:29:01 -0500 Subject: complete i18n across new UI --- app/_locales/en/messages.json | 168 +++++++++++++-------- app/manifest.json | 6 +- ui/app/accounts/import/index.js | 9 +- ui/app/accounts/import/json.js | 8 +- ui/app/accounts/import/private-key.js | 8 +- ui/app/accounts/new-account/create-form.js | 8 +- ui/app/components/account-dropdowns.js | 6 +- ui/app/components/account-export.js | 8 +- ui/app/components/account-menu/index.js | 2 +- ui/app/components/bn-as-decimal-input.js | 9 +- ui/app/components/buy-button-subview.js | 6 +- ui/app/components/customize-gas-modal/index.js | 8 +- .../dropdowns/components/account-dropdowns.js | 8 +- ui/app/components/hex-as-decimal-input.js | 6 +- ui/app/components/modals/account-details-modal.js | 2 +- ui/app/components/modals/deposit-ether-modal.js | 4 +- .../components/modals/edit-account-name-modal.js | 4 +- .../modals/hide-token-confirmation-modal.js | 8 +- ui/app/components/modals/new-account-modal.js | 6 +- ui/app/components/pending-msg-details.js | 2 +- ui/app/components/pending-personal-msg-details.js | 2 +- .../pending-tx/confirm-deploy-contract.js | 12 +- ui/app/components/pending-tx/confirm-send-ether.js | 6 +- ui/app/components/pending-tx/confirm-send-token.js | 14 +- ui/app/components/pending-typed-msg-details.js | 2 +- ui/app/components/pending-typed-msg.js | 8 +- ui/app/components/send-token/index.js | 6 +- ui/app/components/shapeshift-form.js | 2 +- ui/app/components/shift-list-item.js | 6 +- ui/app/components/signature-request.js | 8 +- ui/app/components/tx-view.js | 8 +- ui/app/components/wallet-view.js | 4 +- ui/app/css/itcss/generic/index.scss | 4 + ui/i18n.js | 17 ++- 34 files changed, 220 insertions(+), 165 deletions(-) diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json index 54f266318..a0c9088cb 100644 --- a/app/_locales/en/messages.json +++ b/app/_locales/en/messages.json @@ -3,9 +3,9 @@ "message": "Accept" }, "account": { - "message": "Account:" + "message": "Account" }, - "accDetails": { + "accountDetails": { "message": "Account Details" }, "accountName": { @@ -17,11 +17,14 @@ "addToken": { "message": "Add Token" }, + "amount": { + "message": "Amount" + }, "amountPlusGas": { "message": "Amount + Gas" }, "appDescription": { - "message": "Ethereum Identity Management", + "message": "Ethereum Browser Extension", "description": "The description of the application" }, "appName": { @@ -43,10 +46,14 @@ "balanceIsInsufficientGas": { "message": "Insufficient balance for current gas total" }, + "betweenMinAndMax": { + "message": "must be greater than or equal to $1 and less than or equal to $2.", + "description": "helper for inputting hex as decimal input" + }, "borrowDharma": { "message": "Borrow With Dharma (Beta)" }, - "buyButton": { + "buy": { "message": "Buy" }, "buyCoinbase": { @@ -58,26 +65,20 @@ "cancel": { "message": "Cancel" }, - "cancelCaps": { - "message": "CANCEL" - }, "clickCopy": { "message": "Click to Copy" }, "confirm": { "message": "Confirm" }, - "confirmCaps": { - "message": "CONFIRM" - }, "confirmContract": { "message": "Confirm Contract" }, "confirmPassword": { "message": "Confirm Password" }, - "confirmPasswordSmall": { - "message": "confirm password" + "confirmTransaction": { + "message": "Confirm Transaction" }, "continueToCoinbase": { "message": "Continue to Coinbase" @@ -109,15 +110,19 @@ "copyPrivateKey": { "message": "This is your private key (click to copy)" }, + "create": { + "message": "Create" + }, "createAccount": { "message": "Create Account" }, - "createCaps": { - "message": "CREATE" - }, "createDen": { "message": "Create" }, + "crypto": { + "message": "Crypto", + "description": "Exchange type (cryptocurrencies)" + }, "customGas": { "message": "Customize Gas" }, @@ -139,9 +144,6 @@ "depositBTC": { "message": "Deposit your BTC to the address below:" }, - "depositButton": { - "message": "DEPOSIT" - }, "depositEth": { "message": "Deposit Eth" }, @@ -160,8 +162,8 @@ "depositShapeShiftExplainer": { "message": "If you own other cryptocurrencies, you can trade and deposit Ether directly into your MetaMask wallet. No Account Needed." }, - "detailsCaps": { - "message": "DETAILS" + "details": { + "message": "Details" }, "directDeposit": { "message": "Direct Deposit" @@ -175,12 +177,12 @@ "done": { "message": "Done" }, + "edit": { + "message": "Edit" + }, "editAccountName": { "message": "Edit Account Name" }, - "editCaps": { - "message": "EDIT" - }, "encryptNewDen": { "message": "Encrypt your new DEN" }, @@ -196,17 +198,19 @@ "exportPrivateKey": { "message": "Export Private Key" }, - "exportPrivateKeyLower": { - "message": "Export private key" - }, "exportPrivateKeyWarning": { "message": "Export private keys at your own risk." }, "failed": { "message": "Failed" }, + "fiat": { + "message": "FIAT", + "description": "Exchange type" + }, "fileImportFail": { - "message": "File import not working? Click here!" + "message": "File import not working? Click here!", + "description": "Helps user import their account from a JSON file" }, "from": { "message": "From" @@ -214,12 +218,13 @@ "fromShapeShift": { "message": "From ShapeShift" }, + "gas": { + "message": "Gas", + "description": "Short indication of gas cost" + }, "gasFee": { "message": "Gas Fee" }, - "gasFeeSpecific": { - "message": "Gas fee:" - }, "gasLimit": { "message": "Gas Limit" }, @@ -244,11 +249,20 @@ "getEther": { "message": "Get Ether" }, + "getEtherFromFaucet": { + "message": "Get Ether from a faucet for the $1", + "description": "Displays network name for Ether faucet" + }, + "greaterThanMin": { + "message": "must be greater than or equal to $1.", + "description": "helper for inputting hex as decimal input" + }, "here": { - "message": "here" + "message": "here", + "description": "as in -click here- for more information (goes with troubleTokenBalances)" }, - "hideCaps": { - "message": "HIDE" + "hide": { + "message": "Hide" }, "hideToken": { "message": "Hide Token" @@ -260,7 +274,8 @@ "message": "How would you like to deposit Ether?" }, "import": { - "message": "Import" + "message": "Import", + "description": "Button to import an account from a selected file" }, "importAccount": { "message": "Import Account" @@ -268,14 +283,12 @@ "importAnAccount": { "message": "Import an account" }, - "importCaps": { - "message": "IMPORT" - }, "importDen": { "message": "Import Existing DEN" }, - "importedCaps": { - "message": "IMPORTED" + "imported": { + "message": "Imported", + "description": "status showing that an account has been fully loaded into the keyring" }, "infoHelp": { "message": "Info & Help" @@ -292,9 +305,17 @@ "invalidRequest": { "message": "Invalid Request" }, + "jsonFile": { + "message": "JSON File", + "description": "format for importing an account" + }, "kovan": { "message": "Kovan Test Network" }, + "lessThanMax": { + "message": "must be less than or equal to $1.", + "description": "helper for inputting hex as decimal input" + }, "limit": { "message": "Limit" }, @@ -310,8 +331,8 @@ "logout": { "message": "Log out" }, - "looseCaps": { - "message": "LOOSE" + "loose": { + "message": "Loose" }, "mainnet": { "message": "Main Ethereum Network" @@ -319,9 +340,6 @@ "message": { "message": "Message" }, - "messageCaps": { - "message": "MESSAGE" - }, "min": { "message": "Minimum" }, @@ -332,10 +350,12 @@ "message": "To interact with decentralized applications using MetaMask, you’ll need Ether in your wallet." }, "needImportFile": { - "message": "You must select a file to import." + "message": "You must select a file to import.", + "description": "User is important an account and needs to add a file to continue" }, "needImportPassword": { - "message": "You must enter a password for the selected file." + "message": "You must enter a password for the selected file.", + "description": "Password and file needed to import an account" }, "networks": { "message": "Networks" @@ -377,20 +397,28 @@ "message": "You have returned to the old UI. You can switch back to the New UI through the option in the top right dropdown menu." }, "or": { - "message": "or" + "message": "or", + "description": "choice between creating or importing a new account" }, "passwordMismatch": { - "message": "passwords don't match" + "message": "passwords don't match", + "description": "in password creation process, the two new password fields did not match" }, "passwordShort": { - "message": "password not long enough" + "message": "password not long enough", + "description": "in password creation process, the password is not long enough to be secure" }, "pastePrivateKey": { - "message": "Paste your private key string here:" + "message": "Paste your private key string here:", + "description": "For importing an account from a private key" }, "pasteSeed": { "message": "Paste your seed phrase here!" }, + "privateKey": { + "message": "Private Key", + "description": "select this type of file to use to import an account" + }, "privateKeyWarning": { "message": "Warning: Never disclose this key. Anyone with your private keys can take steal any assets held in your account." }, @@ -434,16 +462,21 @@ "message": "Ropsten Test Network" }, "sampleAccountName": { - "message": "E.g. My new account" + "message": "E.g. My new account", + "description": "Help user understand concept of adding a human-readable name to their account" + }, + "save": { + "message": "Save" }, - "saveCaps": { - "message": "SAVE" + "saveAsFile": { + "message": "Save as File", + "description": "Account export process" }, "selectService": { "message": "Select Service" }, - "sendButton": { - "message": "SEND" + "send": { + "message": "Send" }, "sendTokens": { "message": "Send Tokens" @@ -460,12 +493,12 @@ "showPrivateKeys": { "message": "Show Private Keys" }, + "showQRCode": { + "message": "Show QR Code" + }, "sign": { "message": "Sign" }, - "signCaps": { - "message": "SIGN" - }, "signMessage": { "message": "Sign Message" }, @@ -490,12 +523,13 @@ "to": { "message": "To" }, + "toETHviaShapeShift": { + "message": "$1 to ETH via ShapeShift", + "description": "system will fill in deposit type in start of message" + }, "tokenBalance": { "message": "Your Token Balance is:" }, - "toSpecific": { - "message": "To:" - }, "total": { "message": "Total" }, @@ -509,7 +543,8 @@ "message": "Transfers" }, "troubleTokenBalances": { - "message": "We had trouble loading your token balances. You can view them " + "message": "We had trouble loading your token balances. You can view them ", + "description": "Followed by a link (here) to view token balances" }, "typePassword": { "message": "Type Your Password" @@ -532,6 +567,10 @@ "unknownNetworkId": { "message": "Unknown network ID" }, + "usaOnly": { + "message": "USA only", + "description": "Using this exchange is limited to people inside the USA" + }, "usedByClients": { "message": "Used by a variety of different clients" }, @@ -548,9 +587,6 @@ "message": "Your signature is being requested" }, "youSign": { - "message": "You are signing:" - }, - "youSignCaps": { - "message": "YOU ARE SIGNING" + "message": "You are signing" } } diff --git a/app/manifest.json b/app/manifest.json index d906382e9..b52d3245d 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,10 +1,10 @@ { - "name": "MetaMask", - "short_name": "Metamask", + "name": "__MSG_appName__", + "short_name": "__MSG_appName__", "version": "4.0.10", "manifest_version": 2, "author": "https://metamask.io", - "description": "Ethereum Browser Extension", + "description": "__MSG_appDescription__", "commands": { "_execute_browser_action": { "suggested_key": { diff --git a/ui/app/accounts/import/index.js b/ui/app/accounts/import/index.js index 0c901c09b..6ae74864f 100644 --- a/ui/app/accounts/import/index.js +++ b/ui/app/accounts/import/index.js @@ -2,6 +2,7 @@ const inherits = require('util').inherits const Component = require('react').Component const h = require('react-hyperscript') const connect = require('react-redux').connect +const t = require('../../../i18n') import Select from 'react-select' // Subviews @@ -9,8 +10,8 @@ const JsonImportView = require('./json.js') const PrivateKeyImportView = require('./private-key.js') const menuItems = [ - 'Private Key', - 'JSON File', + t('privateKey'), + t('jsonFile'), ] module.exports = connect(mapStateToProps)(AccountImportSubview) @@ -70,9 +71,9 @@ AccountImportSubview.prototype.renderImportView = function () { const current = type || menuItems[0] switch (current) { - case 'Private Key': + case t('privateKey'): return h(PrivateKeyImportView) - case 'JSON File': + case t('jsonFile'): return h(JsonImportView) default: return h(JsonImportView) diff --git a/ui/app/accounts/import/json.js b/ui/app/accounts/import/json.js index 8b5a2b469..eb63a98a9 100644 --- a/ui/app/accounts/import/json.js +++ b/ui/app/accounts/import/json.js @@ -50,16 +50,16 @@ JsonImportSubview.prototype.render = function () { h('div.new-account-create-form__buttons', {}, [ - h('button.new-account-create-form__button-cancel', { + h('button.new-account-create-form__button-cancel.allcaps', { onClick: () => this.props.goHome(), }, [ - t('cancelCaps'), + t('cancel'), ]), - h('button.new-account-create-form__button-create', { + h('button.new-account-create-form__button-create.allcaps', { onClick: () => this.createNewKeychain.bind(this), }, [ - t('importCaps'), + t('import'), ]), ]), diff --git a/ui/app/accounts/import/private-key.js b/ui/app/accounts/import/private-key.js index 4a04156e0..e8c192a61 100644 --- a/ui/app/accounts/import/private-key.js +++ b/ui/app/accounts/import/private-key.js @@ -43,16 +43,16 @@ PrivateKeyImportView.prototype.render = function () { h('div.new-account-create-form__buttons', {}, [ - h('button.new-account-create-form__button-cancel', { + h('button.new-account-create-form__button-cancel.allcaps', { onClick: () => goHome(), }, [ - t('cancelCaps'), + t('cancel'), ]), - h('button.new-account-create-form__button-create', { + h('button.new-account-create-form__button-create.allcaps', { onClick: () => this.createNewKeychain(), }, [ - t('importCaps'), + t('import'), ]), ]), diff --git a/ui/app/accounts/new-account/create-form.js b/ui/app/accounts/new-account/create-form.js index 6f35e8886..ce8af394a 100644 --- a/ui/app/accounts/new-account/create-form.js +++ b/ui/app/accounts/new-account/create-form.js @@ -35,16 +35,16 @@ class NewAccountCreateForm extends Component { h('div.new-account-create-form__buttons', {}, [ - h('button.new-account-create-form__button-cancel', { + h('button.new-account-create-form__button-cancel.allcaps', { onClick: () => this.props.goHome(), }, [ - t('cancelCaps'), + t('cancel'), ]), - h('button.new-account-create-form__button-create', { + h('button.new-account-create-form__button-create.allcaps', { onClick: () => this.props.createAccount(newAccountName), }, [ - t('createCaps'), + t('create'), ]), ]), diff --git a/ui/app/components/account-dropdowns.js b/ui/app/components/account-dropdowns.js index ede40d3f2..e92da8947 100644 --- a/ui/app/components/account-dropdowns.js +++ b/ui/app/components/account-dropdowns.js @@ -80,7 +80,7 @@ class AccountDropdowns extends Component { try { // Sometimes keyrings aren't loaded yet: const type = keyring.type const isLoose = type !== 'HD Key Tree' - return isLoose ? h('.keyring-label', t('looseCaps')) : null + return isLoose ? h('.keyring-label.allcaps', t('loose')) : null } catch (e) { return } } @@ -155,7 +155,7 @@ class AccountDropdowns extends Component { fontSize: '24px', marginBottom: '5px', }, - }, 'Import Account'), + }, t('importAccount')), ] ), ] @@ -205,7 +205,7 @@ class AccountDropdowns extends Component { actions.showQrView(selected, identity ? identity.name : '') }, }, - t('qrCode'), + t('showQRCode'), ), h( DropdownMenuItem, diff --git a/ui/app/components/account-export.js b/ui/app/components/account-export.js index 25f36da58..5637bc8d0 100644 --- a/ui/app/components/account-export.js +++ b/ui/app/components/account-export.js @@ -54,7 +54,7 @@ ExportAccountView.prototype.render = function () { h('p.error', warning), h('input#exportAccount.sizing-input', { type: 'password', - placeholder: t('confirmPasswordSmall'), + placeholder: t('confirmPassword').toLowerCase(), onKeyPress: this.onExportKeyPress.bind(this), style: { position: 'relative', @@ -99,7 +99,7 @@ ExportAccountView.prototype.render = function () { margin: '0 20px', }, }, [ - h('label', 'Your private key (click to copy):'), + h('label', t('copyPrivateKey') + ':'), h('p.error.cursor-pointer', { style: { textOverflow: 'ellipsis', @@ -113,13 +113,13 @@ ExportAccountView.prototype.render = function () { }, plainKey), h('button', { onClick: () => this.props.dispatch(actions.backToAccountDetail(this.props.address)), - }, 'Done'), + }, t('done')), h('button', { style: { marginLeft: '10px', }, onClick: () => exportAsFile(`MetaMask ${nickname} Private Key`, plainKey), - }, 'Save as File'), + }, t('saveAsFile')), ]) } } diff --git a/ui/app/components/account-menu/index.js b/ui/app/components/account-menu/index.js index 9c7b6b15a..d9cf8cdce 100644 --- a/ui/app/components/account-menu/index.js +++ b/ui/app/components/account-menu/index.js @@ -156,6 +156,6 @@ AccountMenu.prototype.indicateIfLoose = function (keyring) { try { // Sometimes keyrings aren't loaded yet: const type = keyring.type const isLoose = type !== 'HD Key Tree' - return isLoose ? h('.keyring-label', t('importedCaps')) : null + return isLoose ? h('.keyring-label.allcaps', t('imported')) : null } catch (e) { return } } diff --git a/ui/app/components/bn-as-decimal-input.js b/ui/app/components/bn-as-decimal-input.js index 22e37602e..70701b039 100644 --- a/ui/app/components/bn-as-decimal-input.js +++ b/ui/app/components/bn-as-decimal-input.js @@ -4,6 +4,7 @@ const inherits = require('util').inherits const ethUtil = require('ethereumjs-util') const BN = ethUtil.BN const extend = require('xtend') +const t = require('../../i18n') module.exports = BnAsDecimalInput @@ -136,13 +137,13 @@ BnAsDecimalInput.prototype.constructWarning = function () { let message = name ? name + ' ' : '' if (min && max) { - message += `must be greater than or equal to ${newMin} ${suffix} and less than or equal to ${newMax} ${suffix}.` + message += t('betweenMinAndMax', [`${newMin} ${suffix}`, `${newMax} ${suffix}`]) } else if (min) { - message += `must be greater than or equal to ${newMin} ${suffix}.` + message += t('greaterThanMin', [`${newMin} ${suffix}`]) } else if (max) { - message += `must be less than or equal to ${newMax} ${suffix}.` + message += t('lessThanMax', [`${newMax} ${suffix}`]) } else { - message += 'Invalid input.' + message += t('invalidInput') } return message diff --git a/ui/app/components/buy-button-subview.js b/ui/app/components/buy-button-subview.js index 6f2c74b6d..1e277a94b 100644 --- a/ui/app/components/buy-button-subview.js +++ b/ui/app/components/buy-button-subview.js @@ -144,7 +144,7 @@ BuyButtonSubview.prototype.primarySubview = function () { case '4': case '42': const networkName = networkNames[network] - const label = `${networkName} Test Faucet` + const label = `${networkName} ${t('testFaucet')}` return ( h('div.flex-column', { style: { @@ -204,8 +204,8 @@ BuyButtonSubview.prototype.mainnetSubview = function () { 'ShapeShift', ], subtext: { - 'Coinbase': 'Crypto/FIAT (USA only)', - 'ShapeShift': 'Crypto', + 'Coinbase': `${t('crypto')}/${t('fiat')} (${t('usaOnly')})`, + 'ShapeShift': t('crypto'), }, onClick: this.radioHandler.bind(this), }), diff --git a/ui/app/components/customize-gas-modal/index.js b/ui/app/components/customize-gas-modal/index.js index 1c6036867..920dfeab6 100644 --- a/ui/app/components/customize-gas-modal/index.js +++ b/ui/app/components/customize-gas-modal/index.js @@ -283,13 +283,13 @@ CustomizeGasModal.prototype.render = function () { }, [t('revert')]), h('div.send-v2__customize-gas__buttons', [ - h('div.send-v2__customize-gas__cancel', { + h('div.send-v2__customize-gas__cancel.allcaps', { onClick: this.props.hideModal, - }, [t('cancelCaps')]), + }, [t('cancel')]), - h(`div.send-v2__customize-gas__save${error ? '__error' : ''}`, { + h(`div.send-v2__customize-gas__save${error ? '__error' : ''}.allcaps`, { onClick: () => !error && this.save(gasPrice, gasLimit, gasTotal), - }, [t('saveCaps')]), + }, [t('save')]), ]), ]), diff --git a/ui/app/components/dropdowns/components/account-dropdowns.js b/ui/app/components/dropdowns/components/account-dropdowns.js index dfa5e5fac..620ac8483 100644 --- a/ui/app/components/dropdowns/components/account-dropdowns.js +++ b/ui/app/components/dropdowns/components/account-dropdowns.js @@ -122,7 +122,7 @@ class AccountDropdowns extends Component { flex: '3 3 auto', }, }, [ - h('span.account-dropdown-edit-button', { + h('span.account-dropdown-edit-button.allcaps', { style: { fontSize: '16px', }, @@ -130,7 +130,7 @@ class AccountDropdowns extends Component { actions.showEditAccountModal(identity) }, }, [ - t('editCaps'), + t('edit'), ]), ]), @@ -160,7 +160,7 @@ class AccountDropdowns extends Component { try { // Sometimes keyrings aren't loaded yet: const type = keyring.type const isLoose = type !== 'HD Key Tree' - return isLoose ? h('.keyring-label', t('looseCaps')) : null + return isLoose ? h('.keyring-label.allcaps', t('loose')) : null } catch (e) { return } } @@ -303,7 +303,7 @@ class AccountDropdowns extends Component { menuItemStyles, ), }, - t('accDetails'), + t('accountDetails'), ), h( DropdownMenuItem, diff --git a/ui/app/components/hex-as-decimal-input.js b/ui/app/components/hex-as-decimal-input.js index 992d8c8cd..a43d44f89 100644 --- a/ui/app/components/hex-as-decimal-input.js +++ b/ui/app/components/hex-as-decimal-input.js @@ -127,11 +127,11 @@ HexAsDecimalInput.prototype.constructWarning = function () { let message = name ? name + ' ' : '' if (min && max) { - message += `must be greater than or equal to ${min} and less than or equal to ${max}.` + message += t('betweenMinAndMax', [min, max]) } else if (min) { - message += `must be greater than or equal to ${min}.` + message += t('greaterThanMin', [min]) } else if (max) { - message += `must be less than or equal to ${max}.` + message += t('lessThanMax', [max]) } else { message += t('invalidInput') } diff --git a/ui/app/components/modals/account-details-modal.js b/ui/app/components/modals/account-details-modal.js index 17760dc1a..75f989e86 100644 --- a/ui/app/components/modals/account-details-modal.js +++ b/ui/app/components/modals/account-details-modal.js @@ -70,7 +70,7 @@ AccountDetailsModal.prototype.render = function () { // Holding on redesign for Export Private Key functionality h('button.btn-clear.account-modal__button', { onClick: () => showExportPrivateKeyModal(), - }, t('exportPrivateKeyLower')), + }, t('exportPrivateKey')), ]) } diff --git a/ui/app/components/modals/deposit-ether-modal.js b/ui/app/components/modals/deposit-ether-modal.js index e91b43841..7172d05a5 100644 --- a/ui/app/components/modals/deposit-ether-modal.js +++ b/ui/app/components/modals/deposit-ether-modal.js @@ -14,7 +14,9 @@ const COINBASE_ROW_TEXT = t('buyCoinbaseExplainer') const SHAPESHIFT_ROW_TITLE = t('depositShapeShift') const SHAPESHIFT_ROW_TEXT = t('depositShapeShiftExplainer') const FAUCET_ROW_TITLE = t('testFaucet') -const facuetRowText = networkName => `Get Ether from a faucet for the ${networkName}` +const facuetRowText = (networkName) => { + return t('getEtherFromFaucet', [networkName]) +} function mapStateToProps (state) { return { diff --git a/ui/app/components/modals/edit-account-name-modal.js b/ui/app/components/modals/edit-account-name-modal.js index 611def005..6efa8d476 100644 --- a/ui/app/components/modals/edit-account-name-modal.js +++ b/ui/app/components/modals/edit-account-name-modal.js @@ -61,7 +61,7 @@ EditAccountNameModal.prototype.render = function () { value: this.state.inputText, }, []), - h('button.btn-clear.edit-account-name-modal-save-button', { + h('button.btn-clear.edit-account-name-modal-save-button.allcaps', { onClick: () => { if (this.state.inputText.length !== 0) { saveAccountLabel(identity.address, this.state.inputText) @@ -70,7 +70,7 @@ EditAccountNameModal.prototype.render = function () { }, disabled: this.state.inputText.length === 0, }, [ - t('saveCaps'), + t('save'), ]), ]), diff --git a/ui/app/components/modals/hide-token-confirmation-modal.js b/ui/app/components/modals/hide-token-confirmation-modal.js index 98b1e2d03..33d8062c6 100644 --- a/ui/app/components/modals/hide-token-confirmation-modal.js +++ b/ui/app/components/modals/hide-token-confirmation-modal.js @@ -59,15 +59,15 @@ HideTokenConfirmationModal.prototype.render = function () { ]), h('div.hide-token-confirmation__buttons', {}, [ - h('button.btn-cancel.hide-token-confirmation__button', { + h('button.btn-cancel.hide-token-confirmation__button.allcaps', { onClick: () => hideModal(), }, [ - t('cancelCaps'), + t('cancel'), ]), - h('button.btn-clear.hide-token-confirmation__button', { + h('button.btn-clear.hide-token-confirmation__button.allcaps', { onClick: () => hideToken(address), }, [ - t('hideCaps'), + t('hide'), ]), ]), ]), diff --git a/ui/app/components/modals/new-account-modal.js b/ui/app/components/modals/new-account-modal.js index 35f4764a6..298b76af4 100644 --- a/ui/app/components/modals/new-account-modal.js +++ b/ui/app/components/modals/new-account-modal.js @@ -12,7 +12,7 @@ class NewAccountModal extends Component { const newAccountNumber = numberOfExistingAccounts + 1 this.state = { - newAccountName: `Account ${newAccountNumber}`, + newAccountName: `${t('account')} ${newAccountNumber}`, } } @@ -53,11 +53,11 @@ class NewAccountModal extends Component { }, }, t('importAnAccount')), - h('div.new-account-modal-content.button', {}, [ + h('div.new-account-modal-content.button.allcaps', {}, [ h('button.btn-clear', { onClick: () => this.props.createAccount(newAccountName), }, [ - t('saveCaps'), + t('save'), ]), ]), ]), diff --git a/ui/app/components/pending-msg-details.js b/ui/app/components/pending-msg-details.js index b66657f3b..87e66855d 100644 --- a/ui/app/components/pending-msg-details.js +++ b/ui/app/components/pending-msg-details.js @@ -40,7 +40,7 @@ PendingMsgDetails.prototype.render = function () { // message data h('.tx-data.flex-column.flex-justify-center.flex-grow.select-none', [ h('.flex-column.flex-space-between', [ - h('label.font-small', t('messageCaps')), + h('label.font-small.allcaps', t('message')), h('span.font-small', msgParams.data), ]), ]), diff --git a/ui/app/components/pending-personal-msg-details.js b/ui/app/components/pending-personal-msg-details.js index d21689f86..b896e9a7e 100644 --- a/ui/app/components/pending-personal-msg-details.js +++ b/ui/app/components/pending-personal-msg-details.js @@ -46,7 +46,7 @@ PendingMsgDetails.prototype.render = function () { height: '260px', }, }, [ - h('label.font-small', { style: { display: 'block' } }, t('messageCaps')), + h('label.font-small.allcaps', { style: { display: 'block' } }, t('message')), h(BinaryRenderer, { value: data, style: { diff --git a/ui/app/components/pending-tx/confirm-deploy-contract.js b/ui/app/components/pending-tx/confirm-deploy-contract.js index e6972c541..49fbe6387 100644 --- a/ui/app/components/pending-tx/confirm-deploy-contract.js +++ b/ui/app/components/pending-tx/confirm-deploy-contract.js @@ -56,7 +56,7 @@ ConfirmDeployContract.prototype.onSubmit = function (event) { if (valid && this.verifyGasParams()) { this.props.sendTransaction(txMeta, event) } else { - this.props.dispatch(actions.displayWarning('Invalid Gas Parameters')) + this.props.dispatch(actions.displayWarning(t('invalidGasParams'))) this.setState({ submitting: false }) } } @@ -272,9 +272,9 @@ ConfirmDeployContract.prototype.render = function () { // Main Send token Card h('div.confirm-screen-wrapper.flex-column.flex-grow', [ h('h3.flex-center.confirm-screen-header', [ - h('button.confirm-screen-back-button', { + h('button.confirm-screen-back-button.allcaps', { onClick: () => backToAccountDetail(selectedAddress), - }, 'BACK'), + }, t('back')), h('div.confirm-screen-title', t('confirmContract')), h('div.confirm-screen-header-tip'), ]), @@ -336,12 +336,12 @@ ConfirmDeployContract.prototype.render = function () { onSubmit: this.onSubmit, }, [ // Cancel Button - h('div.cancel.btn-light.confirm-screen-cancel-button', { + h('div.cancel.btn-light.confirm-screen-cancel-button.allcaps', { onClick: (event) => this.cancel(event, txMeta), - }, t('cancelCaps')), + }, t('cancel')), // Accept Button - h('button.confirm-screen-confirm-button', [t('confirmCaps')]), + h('button.confirm-screen-confirm-button.allcaps', [t('confirm')]), ]), ]) diff --git a/ui/app/components/pending-tx/confirm-send-ether.js b/ui/app/components/pending-tx/confirm-send-ether.js index 52693b4f6..21b9b548b 100644 --- a/ui/app/components/pending-tx/confirm-send-ether.js +++ b/ui/app/components/pending-tx/confirm-send-ether.js @@ -392,15 +392,15 @@ ConfirmSendEther.prototype.render = function () { onSubmit: this.onSubmit, }, [ // Cancel Button - h('div.cancel.btn-light.confirm-screen-cancel-button', { + h('div.cancel.btn-light.confirm-screen-cancel-button.allcaps', { onClick: (event) => { clearSend() this.cancel(event, txMeta) }, - }, t('cancelCaps')), + }, t('cancel')), // Accept Button - h('button.confirm-screen-confirm-button', [t('confirmCaps')]), + h('button.confirm-screen-confirm-button.allcaps', [t('confirm')]), ]), ]) ) diff --git a/ui/app/components/pending-tx/confirm-send-token.js b/ui/app/components/pending-tx/confirm-send-token.js index 14523461f..b1bec946a 100644 --- a/ui/app/components/pending-tx/confirm-send-token.js +++ b/ui/app/components/pending-tx/confirm-send-token.js @@ -286,7 +286,7 @@ ConfirmSendToken.prototype.renderTotalPlusGas = function () { h('div.confirm-screen-section-column', [ h('div.confirm-screen-row-info', `${tokenAmount} ${symbol}`), - h('div.confirm-screen-row-detail', `+ ${fiatGas} ${currentCurrency} Gas`), + h('div.confirm-screen-row-detail', `+ ${fiatGas} ${currentCurrency} ${t('gas')}`), ]), ]) ) @@ -315,10 +315,10 @@ ConfirmSendToken.prototype.render = function () { // Main Send token Card h('div.confirm-screen-wrapper.flex-column.flex-grow', [ h('h3.flex-center.confirm-screen-header', [ - h('button.btn-clear.confirm-screen-back-button', { + h('button.btn-clear.confirm-screen-back-button.allcaps', { onClick: () => editTransaction(txMeta), - }, t('editCaps')), - h('div.confirm-screen-title', 'Confirm Transaction'), + }, t('edit')), + h('div.confirm-screen-title', t('confirmTransaction')), h('div.confirm-screen-header-tip'), ]), h('div.flex-row.flex-center.confirm-screen-identicons', [ @@ -386,12 +386,12 @@ ConfirmSendToken.prototype.render = function () { onSubmit: this.onSubmit, }, [ // Cancel Button - h('div.cancel.btn-light.confirm-screen-cancel-button', { + h('div.cancel.btn-light.confirm-screen-cancel-button.allcaps', { onClick: (event) => this.cancel(event, txMeta), - }, t('cancelCaps')), + }, t('cancel')), // Accept Button - h('button.confirm-screen-confirm-button', [t('confirmCaps')]), + h('button.confirm-screen-confirm-button.allcaps', [t('confirm')]), ]), diff --git a/ui/app/components/pending-typed-msg-details.js b/ui/app/components/pending-typed-msg-details.js index 9708ed1d7..ae0a1171e 100644 --- a/ui/app/components/pending-typed-msg-details.js +++ b/ui/app/components/pending-typed-msg-details.js @@ -46,7 +46,7 @@ PendingMsgDetails.prototype.render = function () { height: '260px', }, }, [ - h('label.font-small', { style: { display: 'block' } }, t('youSignCaps')), + h('label.font-small.allcaps', { style: { display: 'block' } }, t('youSign')), h(TypedMessageRenderer, { value: data, style: { diff --git a/ui/app/components/pending-typed-msg.js b/ui/app/components/pending-typed-msg.js index 3d473f47d..ccde5e8af 100644 --- a/ui/app/components/pending-typed-msg.js +++ b/ui/app/components/pending-typed-msg.js @@ -34,12 +34,12 @@ PendingMsg.prototype.render = function () { // sign + cancel h('.flex-row.flex-space-around', [ - h('button', { + h('button.allcaps', { onClick: state.cancelTypedMessage, - }, t('cancelCaps')), - h('button', { + }, t('cancel')), + h('button.allcaps', { onClick: state.signTypedMessage, - }, t('signCaps')), + }, t('sign')), ]), ]) diff --git a/ui/app/components/send-token/index.js b/ui/app/components/send-token/index.js index 2ad7c9dd0..58743b641 100644 --- a/ui/app/components/send-token/index.js +++ b/ui/app/components/send-token/index.js @@ -234,7 +234,7 @@ SendTokenScreen.prototype.renderToAddressInput = function () { 'send-screen-input-wrapper--error': errorMessage, }), }, [ - h('div', [t('toSpecific')]), + h('div', [t('to') + ':']), h('input.large-input.send-screen-input', { name: 'address', list: 'addresses', @@ -291,7 +291,7 @@ SendTokenScreen.prototype.renderAmountInput = function () { }), }, [ h('div.send-screen-amount-labels', [ - h('span', ['Amount']), + h('span', [t('amount')]), h(CurrencyToggle, { currentCurrency: tokenExchangeRate ? selectedCurrency : 'USD', currencies: tokenExchangeRate ? [ symbol, 'USD' ] : [], @@ -356,7 +356,7 @@ SendTokenScreen.prototype.renderGasInput = function () { }), h('div.send-screen-gas-labels', {}, [ - h('span', [ h('i.fa.fa-bolt'), t('gasFeeSpecific')]), + h('span', [ h('i.fa.fa-bolt'), t('gasFee') + ':']), h('span', [t('whatsThis')]), ]), h('div.large-input.send-screen-gas-input', [ diff --git a/ui/app/components/shapeshift-form.js b/ui/app/components/shapeshift-form.js index 329feb38f..104f82224 100644 --- a/ui/app/components/shapeshift-form.js +++ b/ui/app/components/shapeshift-form.js @@ -237,7 +237,7 @@ ShapeshiftForm.prototype.render = function () { className: btnClass, disabled: !token, onClick: () => this.onBuyWithShapeShift(), - }, [t('buyButton')]), + }, [t('buy')]), ]) } diff --git a/ui/app/components/shift-list-item.js b/ui/app/components/shift-list-item.js index 21d41a06c..0d8681fb7 100644 --- a/ui/app/components/shift-list-item.js +++ b/ui/app/components/shift-list-item.js @@ -81,7 +81,7 @@ ShiftListItem.prototype.renderUtilComponents = function () { value: this.props.depositAddress, }), h(Tooltip, { - title: 'QR Code', + title: t('qrCode'), }, [ h('i.fa.fa-qrcode.pointer.pop-hover', { onClick: () => props.dispatch(actions.reshowQrCode(props.depositAddress, props.depositType)), @@ -141,7 +141,7 @@ ShiftListItem.prototype.renderInfo = function () { color: '#ABA9AA', width: '100%', }, - }, `${props.depositType} to ETH via ShapeShift`), + }, t('toETHviaShapeShift', [props.depositType])), h('div', t('noDeposits')), h('div', { style: { @@ -164,7 +164,7 @@ ShiftListItem.prototype.renderInfo = function () { color: '#ABA9AA', width: '100%', }, - }, `${props.depositType} to ETH via ShapeShift`), + }, t('toETHviaShapeShift', [props.depositType])), h('div', t('conversionProgress')), h('div', { style: { diff --git a/ui/app/components/signature-request.js b/ui/app/components/signature-request.js index d0e568bca..7bf34e7b6 100644 --- a/ui/app/components/signature-request.js +++ b/ui/app/components/signature-request.js @@ -76,7 +76,7 @@ SignatureRequest.prototype.renderAccountDropdown = function () { return h('div.request-signature__account', [ - h('div.request-signature__account-text', [t('account')]), + h('div.request-signature__account-text', [t('account') + ':']), h(AccountDropdownMini, { selectedAccount, @@ -155,7 +155,7 @@ SignatureRequest.prototype.msgHexToText = function (hex) { SignatureRequest.prototype.renderBody = function () { let rows - let notice = t('youSign') + let notice = t('youSign') + ':' const { txData } = this.props const { type, msgParams: { data } } = txData @@ -225,10 +225,10 @@ SignatureRequest.prototype.renderFooter = function () { return h('div.request-signature__footer', [ h('button.request-signature__footer__cancel-button', { onClick: cancel, - }, t('cancelCaps')), + }, t('cancel')), h('button.request-signature__footer__sign-button', { onClick: sign, - }, t('signCaps')), + }, t('sign')), ]) } diff --git a/ui/app/components/tx-view.js b/ui/app/components/tx-view.js index adc9b8e94..d35d20a89 100644 --- a/ui/app/components/tx-view.js +++ b/ui/app/components/tx-view.js @@ -69,25 +69,25 @@ TxView.prototype.renderButtons = function () { return !selectedToken ? ( h('div.flex-row.flex-center.hero-balance-buttons', [ - h('button.btn-clear.hero-balance-button', { + h('button.btn-clear.hero-balance-button.allcaps', { onClick: () => showModal({ name: 'DEPOSIT_ETHER', }), - }, t('depositButton')), + }, t('deposit')), h('button.btn-clear.hero-balance-button', { style: { marginLeft: '0.8em', }, onClick: showSendPage, - }, t('sendButton')), + }, t('send')), ]) ) : ( h('div.flex-row.flex-center.hero-balance-buttons', [ h('button.btn-clear.hero-balance-button', { onClick: showSendTokenPage, - }, t('sendButton')), + }, t('send')), ]) ) } diff --git a/ui/app/components/wallet-view.js b/ui/app/components/wallet-view.js index 60a780fc6..6bd2d0963 100644 --- a/ui/app/components/wallet-view.js +++ b/ui/app/components/wallet-view.js @@ -114,7 +114,7 @@ WalletView.prototype.render = function () { onClick: hideSidebar, }), - h('div.wallet-view__keyring-label', isLoose ? t('importedCaps') : ''), + h('div.wallet-view__keyring-label.allcaps', isLoose ? t('imported') : ''), h('div.flex-column.flex-center.wallet-view__name-container', { style: { margin: '0 auto' }, @@ -131,7 +131,7 @@ WalletView.prototype.render = function () { selectedIdentity.name, ]), - h('button.btn-clear.wallet-view__details-button', t('detailsCaps')), + h('button.btn-clear.wallet-view__details-button.allcaps', t('details')), ]), ]), diff --git a/ui/app/css/itcss/generic/index.scss b/ui/app/css/itcss/generic/index.scss index 9d55324e3..91c85f073 100644 --- a/ui/app/css/itcss/generic/index.scss +++ b/ui/app/css/itcss/generic/index.scss @@ -69,3 +69,7 @@ textarea.large-input { input.large-input { height: 36px; } + +.allcaps { + text-transform: uppercase; +} diff --git a/ui/i18n.js b/ui/i18n.js index 0f4e9fce4..db79c87e8 100644 --- a/ui/i18n.js +++ b/ui/i18n.js @@ -11,9 +11,20 @@ if ((chrome && chrome.i18n && chrome.i18n.getMessage) || } else { // fallback function console.warn('browser.i18n API not available?') - let msg = require('../app/_locales/en/messages.json') - getMessage = function (key) { - return msg[key].message + const msg = require('../app/_locales/en/messages.json') + getMessage = function (key, substitutions) { + if (!msg[key]) { + console.error(key) + throw new Error(key) + } + let phrase = msg[key].message + if (substitutions && substitutions.length) { + phrase = phrase.replace(/\$1/g, substitutions[0]) + if (substitutions.length > 1) { + phrase = phrase.replace(/\$2/g, substitutions[1]) + } + } + return phrase } } -- cgit v1.2.3 From 6d9ea863bd956399a23c13f6ed97ba130336aa04 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Thu, 1 Feb 2018 16:14:28 -0800 Subject: Make announcement more general --- development/announcer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/development/announcer.js b/development/announcer.js index 43ae60acb..e97ea65b6 100644 --- a/development/announcer.js +++ b/development/announcer.js @@ -7,6 +7,6 @@ var changelog = fs.readFileSync(path.join(__dirname, '..', 'CHANGELOG.md')).toSt var log = changelog.split(version)[1].split('##')[0].trim() -let msg = `*MetaMask ${version}* now published to the Chrome Store! It should auto-update soon!\n${log}` +let msg = `*MetaMask ${version}* now published! It should auto-update soon!\n${log}` console.log(msg) -- cgit v1.2.3 From 8b90b1d1b12bdae4f1fa06caec5cd5619dc83437 Mon Sep 17 00:00:00 2001 From: Alexander Tseung Date: Tue, 6 Feb 2018 22:03:37 -0800 Subject: Remove accessing PropTypes from main React package --- mascara/src/app/buy-ether-widget/index.js | 3 ++- mascara/src/app/first-time/backup-phrase-screen.js | 7 ++--- mascara/src/app/first-time/breadcrumbs.js | 5 ++-- mascara/src/app/first-time/buy-ether-screen.js | 3 ++- .../src/app/first-time/create-password-screen.js | 31 +++++++++++----------- .../src/app/first-time/import-account-screen.js | 3 ++- .../app/first-time/import-seed-phrase-screen.js | 3 ++- mascara/src/app/first-time/index.js | 3 ++- mascara/src/app/first-time/loading-screen.js | 10 +++++-- mascara/src/app/first-time/notice-screen.js | 28 ++++++++++--------- mascara/src/app/first-time/unique-image-screen.js | 3 ++- mascara/src/app/shapeshift-form/index.js | 3 ++- old-ui/app/components/account-dropdowns.js | 2 +- old-ui/app/components/dropdown.js | 2 +- ui/app/components/account-dropdowns.js | 2 +- .../dropdowns/components/account-dropdowns.js | 2 +- ui/app/components/dropdowns/components/dropdown.js | 2 +- ui/app/components/dropdowns/simple-dropdown.js | 2 +- ui/app/components/loading.js | 2 +- ui/app/components/tab-bar.js | 2 +- 20 files changed, 68 insertions(+), 50 deletions(-) diff --git a/mascara/src/app/buy-ether-widget/index.js b/mascara/src/app/buy-ether-widget/index.js index 9fe659daa..c60221a0a 100644 --- a/mascara/src/app/buy-ether-widget/index.js +++ b/mascara/src/app/buy-ether-widget/index.js @@ -1,4 +1,5 @@ -import React, {Component, PropTypes} from 'react' +import React, { Component } from 'react' +import PropTypes from 'prop-types' import classnames from 'classnames' import {connect} from 'react-redux' import {qrcode} from 'qrcode-npm' diff --git a/mascara/src/app/first-time/backup-phrase-screen.js b/mascara/src/app/first-time/backup-phrase-screen.js index c68dacea2..9db61f3ab 100644 --- a/mascara/src/app/first-time/backup-phrase-screen.js +++ b/mascara/src/app/first-time/backup-phrase-screen.js @@ -1,5 +1,6 @@ -import React, {Component, PropTypes} from 'react' -import {connect} from 'react-redux'; +import React, { Component } from 'react' +import PropTypes from 'prop-types' +import {connect} from 'react-redux' import classnames from 'classnames' import shuffle from 'lodash.shuffle' import {compose, onlyUpdateForPropTypes} from 'recompose' @@ -194,7 +195,7 @@ class BackupPhraseScreen extends Component { - ) + ) } renderBack () { diff --git a/mascara/src/app/first-time/breadcrumbs.js b/mascara/src/app/first-time/breadcrumbs.js index f8460d200..b81a9fb9b 100644 --- a/mascara/src/app/first-time/breadcrumbs.js +++ b/mascara/src/app/first-time/breadcrumbs.js @@ -1,10 +1,11 @@ -import React, {Component, PropTypes} from 'react' +import React, { Component } from 'react' +import PropTypes from 'prop-types' export default class Breadcrumbs extends Component { static propTypes = { total: PropTypes.number, - currentIndex: PropTypes.number + currentIndex: PropTypes.number, }; render() { diff --git a/mascara/src/app/first-time/buy-ether-screen.js b/mascara/src/app/first-time/buy-ether-screen.js index 45b2df1c8..c5a560638 100644 --- a/mascara/src/app/first-time/buy-ether-screen.js +++ b/mascara/src/app/first-time/buy-ether-screen.js @@ -1,4 +1,5 @@ -import React, {Component, PropTypes} from 'react' +import React, { Component } from 'react' +import PropTypes from 'prop-types' import classnames from 'classnames' import {connect} from 'react-redux' import {qrcode} from 'qrcode-npm' diff --git a/mascara/src/app/first-time/create-password-screen.js b/mascara/src/app/first-time/create-password-screen.js index 0b36c6815..d1a2ec70f 100644 --- a/mascara/src/app/first-time/create-password-screen.js +++ b/mascara/src/app/first-time/create-password-screen.js @@ -1,6 +1,7 @@ import EventEmitter from 'events' -import React, {Component, PropTypes} from 'react' -import {connect} from 'react-redux'; +import React, { Component } from 'react' +import PropTypes from 'prop-types' +import {connect} from 'react-redux' import {createNewVaultAndKeychain} from '../../../../ui/app/actions' import LoadingScreen from './loading-screen' import Breadcrumbs from './breadcrumbs' @@ -12,12 +13,12 @@ class CreatePasswordScreen extends Component { createAccount: PropTypes.func.isRequired, goToImportWithSeedPhrase: PropTypes.func.isRequired, goToImportAccount: PropTypes.func.isRequired, - next: PropTypes.func.isRequired + next: PropTypes.func.isRequired, } state = { password: '', - confirmPassword: '' + confirmPassword: '', } constructor () { @@ -25,34 +26,34 @@ class CreatePasswordScreen extends Component { this.animationEventEmitter = new EventEmitter() } - isValid() { - const {password, confirmPassword} = this.state; + isValid () { + const {password, confirmPassword} = this.state if (!password || !confirmPassword) { - return false; + return false } if (password.length < 8) { - return false; + return false } - return password === confirmPassword; + return password === confirmPassword } createAccount = () => { if (!this.isValid()) { - return; + return } - const {password} = this.state; - const {createAccount, next} = this.props; + const {password} = this.state + const {createAccount, next} = this.props createAccount(password) - .then(next); + .then(next) } - render() { - const { isLoading, goToImportAccount, goToImportWithSeedPhrase } = this.props + render () { + const { isLoading, goToImportWithSeedPhrase } = this.props return isLoading ? diff --git a/mascara/src/app/first-time/import-account-screen.js b/mascara/src/app/first-time/import-account-screen.js index bf8e209e4..ab0aca0f0 100644 --- a/mascara/src/app/first-time/import-account-screen.js +++ b/mascara/src/app/first-time/import-account-screen.js @@ -1,4 +1,5 @@ -import React, {Component, PropTypes} from 'react' +import React, { Component } from 'react' +import PropTypes from 'prop-types' import {connect} from 'react-redux' import classnames from 'classnames' import LoadingScreen from './loading-screen' diff --git a/mascara/src/app/first-time/import-seed-phrase-screen.js b/mascara/src/app/first-time/import-seed-phrase-screen.js index 2b01fa75d..181151ca9 100644 --- a/mascara/src/app/first-time/import-seed-phrase-screen.js +++ b/mascara/src/app/first-time/import-seed-phrase-screen.js @@ -1,4 +1,5 @@ -import React, {Component, PropTypes} from 'react' +import React, { Component } from 'react' +import PropTypes from 'prop-types' import {connect} from 'react-redux' import LoadingScreen from './loading-screen' import {createNewVaultAndRestore, hideWarning, displayWarning} from '../../../../ui/app/actions' diff --git a/mascara/src/app/first-time/index.js b/mascara/src/app/first-time/index.js index 66b591bd8..b06f2ba9d 100644 --- a/mascara/src/app/first-time/index.js +++ b/mascara/src/app/first-time/index.js @@ -1,4 +1,5 @@ -import React, {Component, PropTypes} from 'react' +import React, { Component } from 'react' +import PropTypes from 'prop-types' import {connect} from 'react-redux' import CreatePasswordScreen from './create-password-screen' import UniqueImageScreen from './unique-image-screen' diff --git a/mascara/src/app/first-time/loading-screen.js b/mascara/src/app/first-time/loading-screen.js index 732b7f2d7..01e1c1998 100644 --- a/mascara/src/app/first-time/loading-screen.js +++ b/mascara/src/app/first-time/loading-screen.js @@ -1,4 +1,5 @@ -import React, {Component, PropTypes} from 'react' +import React from 'react' +import PropTypes from 'prop-types' import Spinner from './spinner' export default function LoadingScreen({ className = '', loadingMessage }) { @@ -7,5 +8,10 @@ export default function LoadingScreen({ className = '', loadingMessage }) {
{loadingMessage}
- ); + ) +} + +LoadingScreen.propTypes = { + className: PropTypes.string, + loadingMessage: PropTypes.string, } diff --git a/mascara/src/app/first-time/notice-screen.js b/mascara/src/app/first-time/notice-screen.js index d09070a95..e691a2f47 100644 --- a/mascara/src/app/first-time/notice-screen.js +++ b/mascara/src/app/first-time/notice-screen.js @@ -1,4 +1,5 @@ -import React, {Component, PropTypes} from 'react' +import React, { Component } from 'react' +import PropTypes from 'prop-types' import Markdown from 'react-markdown' import {connect} from 'react-redux' import debounce from 'lodash.debounce' @@ -12,25 +13,26 @@ class NoticeScreen extends Component { lastUnreadNotice: PropTypes.shape({ title: PropTypes.string, date: PropTypes.string, - body: PropTypes.string + body: PropTypes.string, }), - next: PropTypes.func.isRequired + next: PropTypes.func.isRequired, + markNoticeRead: PropTypes.func, }; static defaultProps = { - lastUnreadNotice: {} + lastUnreadNotice: {}, }; state = { atBottom: false, } - componentDidMount() { + componentDidMount () { this.onScroll() } acceptTerms = () => { - const { markNoticeRead, lastUnreadNotice, next } = this.props; + const { markNoticeRead, lastUnreadNotice, next } = this.props const defer = markNoticeRead(lastUnreadNotice) .then(() => this.setState({ atBottom: false })) @@ -43,17 +45,17 @@ class NoticeScreen extends Component { if (this.state.atBottom) return const target = document.querySelector('.tou__body') - const {scrollTop, offsetHeight, scrollHeight} = target; - const atBottom = scrollTop + offsetHeight >= scrollHeight; + const {scrollTop, offsetHeight, scrollHeight} = target + const atBottom = scrollTop + offsetHeight >= scrollHeight this.setState({atBottom: atBottom}) }, 25) - render() { + render () { const { address, - lastUnreadNotice: { title, body } - } = this.props; + lastUnreadNotice: { title, body }, + } = this.props const { atBottom } = this.state return ( @@ -84,9 +86,9 @@ class NoticeScreen extends Component { export default connect( ({ metamask: { selectedAddress, lastUnreadNotice } }) => ({ lastUnreadNotice, - address: selectedAddress + address: selectedAddress, }), dispatch => ({ - markNoticeRead: notice => dispatch(markNoticeRead(notice)) + markNoticeRead: notice => dispatch(markNoticeRead(notice)), }) )(NoticeScreen) diff --git a/mascara/src/app/first-time/unique-image-screen.js b/mascara/src/app/first-time/unique-image-screen.js index ef6bd28ab..46448aacf 100644 --- a/mascara/src/app/first-time/unique-image-screen.js +++ b/mascara/src/app/first-time/unique-image-screen.js @@ -1,4 +1,5 @@ -import React, {Component, PropTypes} from 'react' +import React, { Component } from 'react' +import PropTypes from 'prop-types' import {connect} from 'react-redux' import Identicon from '../../../../ui/app/components/identicon' import Breadcrumbs from './breadcrumbs' diff --git a/mascara/src/app/shapeshift-form/index.js b/mascara/src/app/shapeshift-form/index.js index 15c7e95e1..53a63403a 100644 --- a/mascara/src/app/shapeshift-form/index.js +++ b/mascara/src/app/shapeshift-form/index.js @@ -1,4 +1,5 @@ -import React, {Component, PropTypes} from 'react' +import React, { Component } from 'react' +import PropTypes from 'prop-types' import classnames from 'classnames' import {qrcode} from 'qrcode-npm' import {connect} from 'react-redux' diff --git a/old-ui/app/components/account-dropdowns.js b/old-ui/app/components/account-dropdowns.js index a3908f45d..da9f60492 100644 --- a/old-ui/app/components/account-dropdowns.js +++ b/old-ui/app/components/account-dropdowns.js @@ -1,5 +1,5 @@ const Component = require('react').Component -const PropTypes = require('react').PropTypes +const PropTypes = require('prop-types') const h = require('react-hyperscript') const actions = require('../../../ui/app/actions') const genAccountLink = require('etherscan-link').createAccountLink diff --git a/old-ui/app/components/dropdown.js b/old-ui/app/components/dropdown.js index cdd864cc3..fb606d2c5 100644 --- a/old-ui/app/components/dropdown.js +++ b/old-ui/app/components/dropdown.js @@ -1,5 +1,5 @@ const Component = require('react').Component -const PropTypes = require('react').PropTypes +const PropTypes = require('prop-types') const h = require('react-hyperscript') const MenuDroppo = require('./menu-droppo') const extend = require('xtend') diff --git a/ui/app/components/account-dropdowns.js b/ui/app/components/account-dropdowns.js index 0c34a5154..f69a6ca68 100644 --- a/ui/app/components/account-dropdowns.js +++ b/ui/app/components/account-dropdowns.js @@ -1,5 +1,5 @@ const Component = require('react').Component -const PropTypes = require('react').PropTypes +const PropTypes = require('prop-types') const h = require('react-hyperscript') const actions = require('../actions') const genAccountLink = require('etherscan-link').createAccountLink diff --git a/ui/app/components/dropdowns/components/account-dropdowns.js b/ui/app/components/dropdowns/components/account-dropdowns.js index f97ac0691..d3a549884 100644 --- a/ui/app/components/dropdowns/components/account-dropdowns.js +++ b/ui/app/components/dropdowns/components/account-dropdowns.js @@ -1,5 +1,5 @@ const Component = require('react').Component -const PropTypes = require('react').PropTypes +const PropTypes = require('prop-types') const h = require('react-hyperscript') const actions = require('../../../actions') const genAccountLink = require('../../../../lib/account-link.js') diff --git a/ui/app/components/dropdowns/components/dropdown.js b/ui/app/components/dropdowns/components/dropdown.js index 15d064be8..0336dbb8b 100644 --- a/ui/app/components/dropdowns/components/dropdown.js +++ b/ui/app/components/dropdowns/components/dropdown.js @@ -1,5 +1,5 @@ const Component = require('react').Component -const PropTypes = require('react').PropTypes +const PropTypes = require('prop-types') const h = require('react-hyperscript') const MenuDroppo = require('../../menu-droppo') const extend = require('xtend') diff --git a/ui/app/components/dropdowns/simple-dropdown.js b/ui/app/components/dropdowns/simple-dropdown.js index 7bb48e57b..bba088ed1 100644 --- a/ui/app/components/dropdowns/simple-dropdown.js +++ b/ui/app/components/dropdowns/simple-dropdown.js @@ -1,5 +1,5 @@ const { Component } = require('react') -const PropTypes = require('react').PropTypes +const PropTypes = require('prop-types') const h = require('react-hyperscript') const classnames = require('classnames') const R = require('ramda') diff --git a/ui/app/components/loading.js b/ui/app/components/loading.js index 9442121fe..cb6fa51fb 100644 --- a/ui/app/components/loading.js +++ b/ui/app/components/loading.js @@ -1,6 +1,6 @@ const { Component } = require('react') const h = require('react-hyperscript') -const PropTypes = require('react').PropTypes +const PropTypes = require('prop-types') class LoadingIndicator extends Component { renderMessage () { diff --git a/ui/app/components/tab-bar.js b/ui/app/components/tab-bar.js index 0edced119..a80640116 100644 --- a/ui/app/components/tab-bar.js +++ b/ui/app/components/tab-bar.js @@ -1,6 +1,6 @@ const { Component } = require('react') const h = require('react-hyperscript') -const PropTypes = require('react').PropTypes +const PropTypes = require('prop-types') const classnames = require('classnames') class TabBar extends Component { -- cgit v1.2.3 From cd976a2765b9e442642faec8a985c049f8cb393b Mon Sep 17 00:00:00 2001 From: Dan Date: Thu, 8 Feb 2018 13:48:25 -0330 Subject: Add reset account button to new UI. --- old-ui/app/css/index.css | 47 ++++++++++++++ ui/app/components/modals/modal.js | 13 ++++ ui/app/components/modals/notification-modal.js | 36 +++++++++-- .../notification-modals/confirm-reset-account.js | 46 ++++++++++++++ ui/app/css/itcss/components/modal.scss | 74 +++++++++++++--------- ui/app/settings.js | 23 +++++++ 6 files changed, 204 insertions(+), 35 deletions(-) create mode 100644 ui/app/components/modals/notification-modals/confirm-reset-account.js diff --git a/old-ui/app/css/index.css b/old-ui/app/css/index.css index 3bb64647a..cdb4cc439 100644 --- a/old-ui/app/css/index.css +++ b/old-ui/app/css/index.css @@ -761,4 +761,51 @@ div.message-container > div:first-child { right: 17.5px; font-family: sans-serif; cursor: pointer; +} + +.notification-modal__wrapper { + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: center; + position: relative; + border: 1px solid #dedede; + box-shadow: 0 0 2px 2px #dedede; + font-family: Roboto; +} + +.notification-modal__header { + background: #f6f6f6; + width: 100%; + display: flex; + justify-content: center; + padding: 30px; + font-size: 22px; + color: #1b344d; + height: 79px; +} + +.notification-modal__message { + padding: 20px; + width: 100%; + display: flex; + justify-content: center; + font-size: 17px; + color: #1b344d; +} + +.notification-modal__buttons { + display: flex; + justify-content: space-evenly; + width: 100%; + margin-bottom: 24px; + padding: 0px 42px; +} + +.notification-modal__buttons__btn { + cursor: pointer; +} + +.notification-modal__link { + color: #2f9ae0; } \ No newline at end of file diff --git a/ui/app/components/modals/modal.js b/ui/app/components/modals/modal.js index afb2a2175..97fe38292 100644 --- a/ui/app/components/modals/modal.js +++ b/ui/app/components/modals/modal.js @@ -18,6 +18,7 @@ const ShapeshiftDepositTxModal = require('./shapeshift-deposit-tx-modal.js') const HideTokenConfirmationModal = require('./hide-token-confirmation-modal') const CustomizeGasModal = require('../customize-gas-modal') const NotifcationModal = require('./notification-modal') +const ConfirmResetAccount = require('./notification-modals/confirm-reset-account') const accountModalStyle = { mobileModalStyle: { @@ -202,6 +203,18 @@ const MODALS = { }, }, + CONFIRM_RESET_ACCOUNT: { + contents: h(ConfirmResetAccount), + mobileModalStyle: { + width: '95%', + top: isPopupOrNotification() === 'popup' ? '52vh' : '36.5vh', + }, + laptopModalStyle: { + width: '473px', + top: 'calc(33% + 45px)', + }, + }, + NEW_ACCOUNT: { contents: [ h(NewAccountModal, {}, []), diff --git a/ui/app/components/modals/notification-modal.js b/ui/app/components/modals/notification-modal.js index 239144b0c..621a974d0 100644 --- a/ui/app/components/modals/notification-modal.js +++ b/ui/app/components/modals/notification-modal.js @@ -9,26 +9,47 @@ class NotificationModal extends Component { const { header, message, + showCancelButton = false, + showConfirmButton = false, + hideModal, + onConfirm, } = this.props + const showButtons = showCancelButton || showConfirmButton + return h('div', [ - h('div.notification-modal-wrapper', { + h('div.notification-modal__wrapper', { }, [ - h('div.notification-modal-header', {}, [ + h('div.notification-modal__header', {}, [ header, ]), - h('div.notification-modal-message-wrapper', {}, [ - h('div.notification-modal-message', {}, [ + h('div.notification-modal__message-wrapper', {}, [ + h('div.notification-modal__message', {}, [ message, ]), ]), h('div.modal-close-x', { - onClick: this.props.hideModal, + onClick: hideModal, }), + showButtons && h('div.notification-modal__buttons', [ + + showCancelButton && h('div.btn-cancel.notification-modal__buttons__btn', { + onClick: hideModal, + }, 'Cancel'), + + showConfirmButton && h('div.btn-clear.notification-modal__buttons__btn', { + onClick: () => { + onConfirm() + hideModal() + }, + }, 'Confirm'), + + ]), + ]), ]) } @@ -37,7 +58,10 @@ class NotificationModal extends Component { NotificationModal.propTypes = { hideModal: PropTypes.func, header: PropTypes.string, - message: PropTypes.string, + message: PropTypes.node, + showCancelButton: PropTypes.bool, + showConfirmButton: PropTypes.bool, + onConfirm: PropTypes.func, } const mapDispatchToProps = dispatch => { diff --git a/ui/app/components/modals/notification-modals/confirm-reset-account.js b/ui/app/components/modals/notification-modals/confirm-reset-account.js new file mode 100644 index 000000000..e1bc91b24 --- /dev/null +++ b/ui/app/components/modals/notification-modals/confirm-reset-account.js @@ -0,0 +1,46 @@ +const { Component } = require('react') +const PropTypes = require('prop-types') +const h = require('react-hyperscript') +const { connect } = require('react-redux') +const actions = require('../../../actions') +const NotifcationModal = require('../notification-modal') + +class ConfirmResetAccount extends Component { + render () { + const { resetAccount } = this.props + + return h(NotifcationModal, { + header: 'Are you sure you want to reset account?', + message: h('div', [ + + h('span', `Resetting is for developer use only. This button wipes the current account's transaction history, + which is used to calculate the current account nonce. `), + + h('a.notification-modal__link', { + href: 'http://metamask.helpscoutdocs.com/article/36-resetting-an-account', + target: '_blank', + onClick (event) { global.platform.openWindow({ url: event.target.href }) }, + }, 'Read more.'), + + ]), + showCancelButton: true, + showConfirmButton: true, + onConfirm: resetAccount, + + }) + } +} + +ConfirmResetAccount.propTypes = { + resetAccount: PropTypes.func, +} + +const mapDispatchToProps = dispatch => { + return { + resetAccount: () => { + dispatch(actions.resetAccount()) + }, + } +} + +module.exports = connect(null, mapDispatchToProps)(ConfirmResetAccount) diff --git a/ui/app/css/itcss/components/modal.scss b/ui/app/css/itcss/components/modal.scss index 5bca4a07d..919e1793b 100644 --- a/ui/app/css/itcss/components/modal.scss +++ b/ui/app/css/itcss/components/modal.scss @@ -547,38 +547,54 @@ //Notification Modal -.notification-modal-wrapper { - display: flex; - flex-direction: column; - justify-content: flex-start; - align-items: center; - position: relative; - border: 1px solid $alto; - box-shadow: 0 0 2px 2px $alto; - font-family: Roboto; -} +.notification-modal { -.notification-modal-header { - background: $wild-sand; - width: 100%; - display: flex; - justify-content: center; - padding: 30px; - font-size: 22px; - color: $nile-blue; - height: 79px; -} + &__wrapper { + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: center; + position: relative; + border: 1px solid $alto; + box-shadow: 0 0 2px 2px $alto; + font-family: Roboto; + } -.notification-modal-message { - padding: 20px; -} + &__header { + background: $wild-sand; + width: 100%; + display: flex; + justify-content: center; + padding: 30px; + font-size: 22px; + color: $nile-blue; + height: 79px; + } -.notification-modal-message { - width: 100%; - display: flex; - justify-content: center; - font-size: 17px; - color: $nile-blue; + &__message { + padding: 20px; + width: 100%; + display: flex; + justify-content: center; + font-size: 17px; + color: $nile-blue; + } + + &__buttons { + display: flex; + justify-content: space-evenly; + width: 100%; + margin-bottom: 24px; + padding: 0px 42px; + + &__btn { + cursor: pointer; + } + } + + &__link { + color: $curious-blue; + } } // Deposit Ether Modal diff --git a/ui/app/settings.js b/ui/app/settings.js index 476bad296..988ddea8d 100644 --- a/ui/app/settings.js +++ b/ui/app/settings.js @@ -250,6 +250,24 @@ class Settings extends Component { ) } + renderResetAccount () { + const { showResetAccountConfirmationModal } = this.props + + return h('div.settings__content-row', [ + h('div.settings__content-item', 'Reset Account'), + h('div.settings__content-item', [ + h('div.settings__content-item-col', [ + h('button.settings__clear-button.settings__clear-button--orange', { + onClick (event) { + event.preventDefault() + showResetAccountConfirmationModal() + }, + }, 'Reset Account'), + ]), + ]), + ]) + } + renderSettingsContent () { const { warning, isMascara } = this.props @@ -262,6 +280,7 @@ class Settings extends Component { this.renderStateLogs(), this.renderSeedWords(), !isMascara && this.renderOldUI(), + this.renderResetAccount(), this.renderBlockieOptIn(), ]) ) @@ -387,6 +406,7 @@ Settings.propTypes = { displayWarning: PropTypes.func, revealSeedConfirmation: PropTypes.func, setFeatureFlagToBeta: PropTypes.func, + showResetAccountConfirmationModal: PropTypes.func, warning: PropTypes.string, goHome: PropTypes.func, isMascara: PropTypes.bool, @@ -412,6 +432,9 @@ const mapDispatchToProps = dispatch => { return dispatch(actions.setFeatureFlag('betaUI', false, 'OLD_UI_NOTIFICATION_MODAL')) .then(() => dispatch(actions.setNetworkEndpoints(OLD_UI_NETWORK_TYPE))) }, + showResetAccountConfirmationModal: () => { + return dispatch(actions.showModal({ name: 'CONFIRM_RESET_ACCOUNT' })) + }, } } -- cgit v1.2.3 From bb79fb354b4618e3090cd1c1a232f318b86ebf88 Mon Sep 17 00:00:00 2001 From: Dan Date: Thu, 8 Feb 2018 20:03:23 -0330 Subject: Try beta link on unlock and privacy screens. --- old-ui/app/app.js | 30 +++++++++++++++++++++++++----- ui/app/unlock.js | 17 +++++++++++++++++ 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/old-ui/app/app.js b/old-ui/app/app.js index 6eb1e487f..61f6223bc 100644 --- a/old-ui/app/app.js +++ b/old-ui/app/app.js @@ -456,11 +456,31 @@ App.prototype.renderPrimary = function () { // notices if (!props.noActiveNotices) { log.debug('rendering notice screen for unread notices.') - return h(NoticeScreen, { - notice: props.lastUnreadNotice, - key: 'NoticeScreen', - onConfirm: () => props.dispatch(actions.markNoticeRead(props.lastUnreadNotice)), - }) + return h('div', [ + + h(NoticeScreen, { + notice: props.lastUnreadNotice, + key: 'NoticeScreen', + onConfirm: () => props.dispatch(actions.markNoticeRead(props.lastUnreadNotice)), + }), + + !props.isInitialized && h('.flex-row.flex-center.flex-grow', [ + h('p.pointer', { + onClick: () => { + global.platform.openExtensionInBrowser() + props.dispatch(actions.setFeatureFlag('betaUI', true, 'BETA_UI_NOTIFICATION_MODAL')) + .then(() => props.dispatch(actions.setNetworkEndpoints(BETA_UI_NETWORK_TYPE))) + }, + style: { + fontSize: '0.8em', + color: '#aeaeae', + textDecoration: 'underline', + marginTop: '32px', + }, + }, 'Try Beta Version'), + ]), + + ]) } else if (props.lostAccounts && props.lostAccounts.length > 0) { log.debug('rendering notice screen for lost accounts view.') return h(NoticeScreen, { diff --git a/ui/app/unlock.js b/ui/app/unlock.js index e77d17d7b..4b39bd3e2 100644 --- a/ui/app/unlock.js +++ b/ui/app/unlock.js @@ -5,6 +5,7 @@ const connect = require('react-redux').connect const actions = require('./actions') const getCaretCoordinates = require('textarea-caret') const EventEmitter = require('events').EventEmitter +const { OLD_UI_NETWORK_TYPE } = require('../../app/scripts/config').enums const Mascot = require('./components/mascot') @@ -85,6 +86,22 @@ UnlockScreen.prototype.render = function () { }, }, 'Restore from seed phrase'), ]), + + h('.flex-row.flex-center.flex-grow', [ + h('p.pointer', { + onClick: () => { + this.props.dispatch(actions.setFeatureFlag('betaUI', false, 'OLD_UI_NOTIFICATION_MODAL')) + .then(() => this.props.dispatch(actions.setNetworkEndpoints(OLD_UI_NETWORK_TYPE))) + }, + style: { + fontSize: '0.8em', + color: '#aeaeae', + textDecoration: 'underline', + marginTop: '32px', + }, + }, 'Use classic interface'), + ]), + ]) ) } -- cgit v1.2.3 From 94cd5b9df480a0c2e2897495c9edddd13461f23a Mon Sep 17 00:00:00 2001 From: kumavis Date: Sat, 10 Feb 2018 19:33:33 +0000 Subject: metamask mesh - inject mesh testing container --- app/scripts/background.js | 4 ++++ app/scripts/lib/setupMetamaskMeshMetrics.js | 9 +++++++++ 2 files changed, 13 insertions(+) create mode 100644 app/scripts/lib/setupMetamaskMeshMetrics.js diff --git a/app/scripts/background.js b/app/scripts/background.js index 0471cee3b..6bf7707e8 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -14,6 +14,7 @@ const NotificationManager = require('./lib/notification-manager.js') const MetamaskController = require('./metamask-controller') const firstTimeState = require('./first-time-state') const setupRaven = require('./setupRaven') +const setupMetamaskMeshMetrics = require('./lib/setupMetamaskMeshMetrics') const STORAGE_KEY = 'metamask-config' const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG' @@ -37,6 +38,9 @@ const diskStore = new LocalStorageStore({ storageKey: STORAGE_KEY }) // initialization flow initialize().catch(log.error) +// setup metamask mesh testing container +setupMetamaskMeshMetrics() + async function initialize () { const initState = await loadStateFromPersistence() await setupController(initState) diff --git a/app/scripts/lib/setupMetamaskMeshMetrics.js b/app/scripts/lib/setupMetamaskMeshMetrics.js new file mode 100644 index 000000000..40343f017 --- /dev/null +++ b/app/scripts/lib/setupMetamaskMeshMetrics.js @@ -0,0 +1,9 @@ + +module.exports = setupMetamaskMeshMetrics + +function setupMetamaskMeshMetrics() { + const testingContainer = document.createElement('iframe') + testingContainer.src = 'https://metamask.github.io/mesh-testing/' + console.log('Injecting MetaMask Mesh testing client') + document.head.appendChild(testingContainer) +} -- cgit v1.2.3 From 58a554b1684fd78775b449b8f2b5d9635d30b69b Mon Sep 17 00:00:00 2001 From: Lazaridis Date: Sun, 11 Feb 2018 05:09:27 +0200 Subject: use the providers initial _blocktracker. fixes #2393 --- app/scripts/metamask-controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 63815ab65..428c78e2c 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -444,7 +444,7 @@ module.exports = class MetamaskController extends EventEmitter { // create filter polyfill middleware const filterMiddleware = createFilterMiddleware({ provider: this.provider, - blockTracker: this.blockTracker, + blockTracker: this.provider._blockTracker, }) engine.push(createOriginMiddleware({ origin })) -- cgit v1.2.3 From fe2ed68f1139046d163ec3d85f31d61ae5fbd989 Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Mon, 12 Feb 2018 14:15:53 -0330 Subject: Remove chrome focus outline for mouse users. (#3230) --- ui/app/actions.js | 10 ++++++++++ ui/app/app.js | 18 +++++++++++++++++- ui/app/css/itcss/base/index.scss | 6 ++++++ ui/app/reducers/app.js | 7 +++++++ 4 files changed, 40 insertions(+), 1 deletion(-) diff --git a/ui/app/actions.js b/ui/app/actions.js index f930a93c1..c6776eeee 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -257,6 +257,9 @@ var actions = { updateFeatureFlags, UPDATE_FEATURE_FLAGS: 'UPDATE_FEATURE_FLAGS', + setMouseUserState, + SET_MOUSE_USER_STATE: 'SET_MOUSE_USER_STATE', + // Network setNetworkEndpoints, updateNetworkEndpointType, @@ -1661,6 +1664,13 @@ function updateFeatureFlags (updatedFeatureFlags) { } } +function setMouseUserState (isMouseUser) { + return { + type: actions.SET_MOUSE_USER_STATE, + value: isMouseUser, + } +} + // Call Background Then Update // // A function generator for a common pattern wherein: diff --git a/ui/app/app.js b/ui/app/app.js index 20dc65df3..cdb0c8c61 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -85,6 +85,7 @@ function mapStateToProps (state) { lostAccounts: state.metamask.lostAccounts, frequentRpcList: state.metamask.frequentRpcList || [], currentCurrency: state.metamask.currentCurrency, + isMouseUser: state.appState.isMouseUser, // state needed to get account dropdown temporarily rendering from app bar identities, @@ -101,6 +102,7 @@ function mapDispatchToProps (dispatch, ownProps) { hideNetworkDropdown: () => dispatch(actions.hideNetworkDropdown()), setCurrentCurrencyToUSD: () => dispatch(actions.setCurrentCurrency('usd')), toggleAccountMenu: () => dispatch(actions.toggleAccountMenu()), + setMouseUserState: (isMouseUser) => dispatch(actions.setMouseUserState(isMouseUser)), } } @@ -112,7 +114,13 @@ App.prototype.componentWillMount = function () { App.prototype.render = function () { var props = this.props - const { isLoading, loadingMessage, network } = props + const { + isLoading, + loadingMessage, + network, + isMouseUser, + setMouseUserState, + } = props const isLoadingNetwork = network === 'loading' && props.currentView.name !== 'config' const loadMessage = loadingMessage || isLoadingNetwork ? `Connecting to ${this.getNetworkName()}` : null @@ -120,11 +128,19 @@ App.prototype.render = function () { return ( h('.flex-column.full-height', { + className: classnames({ 'mouse-user-styles': isMouseUser }), style: { overflowX: 'hidden', position: 'relative', alignItems: 'center', }, + tabIndex: '0', + onClick: () => setMouseUserState(true), + onKeyDown: (e) => { + if (e.keyCode === 9) { + setMouseUserState(false) + } + }, }, [ // global modal diff --git a/ui/app/css/itcss/base/index.scss b/ui/app/css/itcss/base/index.scss index baa6ea037..1475e8bb5 100644 --- a/ui/app/css/itcss/base/index.scss +++ b/ui/app/css/itcss/base/index.scss @@ -1 +1,7 @@ // Base + +.mouse-user-styles { + button:focus { + outline: 0; + } +} diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index 6885d029a..02f024f7c 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -59,6 +59,7 @@ function reduceApp (state, action) { // Used to display error text warning: null, buyView: {}, + isMouseUser: false, }, state.appState) switch (action.type) { @@ -658,6 +659,12 @@ function reduceApp (state, action) { data: action.value.data, }, }) + + case actions.SET_MOUSE_USER_STATE: + return extend(appState, { + isMouseUser: action.value, + }) + default: return appState } -- cgit v1.2.3 From e4c83466befc439f26cdd9c32d130b367bc552a7 Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Tue, 13 Feb 2018 03:09:15 -0330 Subject: Send screen style updates. (#3234) --- ui/app/css/itcss/components/currency-display.scss | 3 ++- ui/app/css/itcss/components/send.scss | 22 +++++++++++++++++++++- ui/app/css/itcss/generic/index.scss | 23 +++++++++++++++++++++-- ui/app/send-v2.js | 13 ++++++++----- 4 files changed, 52 insertions(+), 9 deletions(-) diff --git a/ui/app/css/itcss/components/currency-display.scss b/ui/app/css/itcss/components/currency-display.scss index 9459629b6..e043c1966 100644 --- a/ui/app/css/itcss/components/currency-display.scss +++ b/ui/app/css/itcss/components/currency-display.scss @@ -4,7 +4,7 @@ border: 1px solid $alto; border-radius: 4px; background-color: $white; - color: $dusty-gray; + color: $scorpion; font-family: Roboto; font-size: 16px; font-weight: 300; @@ -52,5 +52,6 @@ &__currency-symbol { margin-top: 1px; + color: $scorpion; } } \ No newline at end of file diff --git a/ui/app/css/itcss/components/send.scss b/ui/app/css/itcss/components/send.scss index fd73275e0..bb17e53cd 100644 --- a/ui/app/css/itcss/components/send.scss +++ b/ui/app/css/itcss/components/send.scss @@ -557,6 +557,25 @@ &__form-field { flex: 1 1 auto; + + .currency-display { + color: $tundora; + + &__currency-symbol { + color: $tundora; + } + + &__converted-value, + &__converted-currency { + color: $tundora; + } + } + + .account-list-item { + &__account-secondary-balance { + color: $tundora; + } + } } &__form-label { @@ -565,6 +584,7 @@ font-size: 16px; line-height: 22px; width: 88px; + font-weight: 400; } &__from-dropdown { @@ -620,7 +640,7 @@ border: 1px solid $alto; border-radius: 4px; background-color: $white; - color: $dusty-gray; + color: $tundora; padding: 10px; font-family: Roboto; font-size: 16px; diff --git a/ui/app/css/itcss/generic/index.scss b/ui/app/css/itcss/generic/index.scss index 75f823320..9b3d7475b 100644 --- a/ui/app/css/itcss/generic/index.scss +++ b/ui/app/css/itcss/generic/index.scss @@ -82,8 +82,20 @@ input.large-input { display: flex; flex-flow: column; border-bottom: 1px solid $geyser; - padding: 1.6rem 1rem; + padding: 1.15rem 0.95rem; flex: 0 0 auto; + background: $alabaster; + position: relative; + } + + &__header-close::after { + content: '\00D7'; + font-size: 40px; + color: $tundora; + position: absolute; + top: 21.5px; + right: 28.5px; + cursor: pointer; } &__footer { @@ -93,6 +105,11 @@ input.large-input { border-top: 1px solid $geyser; padding: 1.6rem; flex: 0 0 auto; + + .btn-clear, + .btn-cancel { + font-size: 1rem; + } } &__footer-button { @@ -101,6 +118,7 @@ input.large-input { font-size: 1rem; text-transform: uppercase; margin-right: 1rem; + border-radius: 2px; &:last-of-type { margin-right: 0; @@ -108,7 +126,7 @@ input.large-input { } &__title { - color: $tundora; + color: $black; font-family: Roboto; font-size: 2rem; font-weight: 500; @@ -119,6 +137,7 @@ input.large-input { padding-top: .5rem; line-height: initial; font-size: .9rem; + color: $gray; } &__tabs { diff --git a/ui/app/send-v2.js b/ui/app/send-v2.js index d4e15dfa8..1d67150e3 100644 --- a/ui/app/send-v2.js +++ b/ui/app/send-v2.js @@ -179,7 +179,7 @@ SendTransactionScreen.prototype.componentDidUpdate = function (prevProps) { } SendTransactionScreen.prototype.renderHeader = function () { - const { selectedToken } = this.props + const { selectedToken, clearSend, goHome } = this.props const tokenText = selectedToken ? 'tokens' : 'ETH' return h('div.page-container__header', [ @@ -188,10 +188,13 @@ SendTransactionScreen.prototype.renderHeader = function () { h('div.page-container__subtitle', `Only send ${tokenText} to an Ethereum address.`), - h( - 'div.page-container__subtitle', - 'Sending to a different crytpocurrency that is not Ethereum may result in permanent loss.' - ), + h('div.page-container__header-close', { + onClick: () => { + clearSend() + goHome() + }, + }), + ]) } -- cgit v1.2.3 From 35c762da47c4b604f44e903940245f87eb7a3d3a Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Tue, 13 Feb 2018 03:21:05 -0330 Subject: Updates the styling of confirm send ether and token screens. (#3235) --- ui/app/components/pending-tx/confirm-send-ether.js | 16 +++++++--------- ui/app/components/pending-tx/confirm-send-token.js | 16 +++++++--------- ui/app/css/itcss/components/confirm.scss | 14 ++++++-------- 3 files changed, 20 insertions(+), 26 deletions(-) diff --git a/ui/app/components/pending-tx/confirm-send-ether.js b/ui/app/components/pending-tx/confirm-send-ether.js index 652300c94..3f8d9c28f 100644 --- a/ui/app/components/pending-tx/confirm-send-ether.js +++ b/ui/app/components/pending-tx/confirm-send-ether.js @@ -213,17 +213,15 @@ ConfirmSendEther.prototype.render = function () { this.inputs = [] return ( - h('div.confirm-screen-container.confirm-send-ether', { - style: { minWidth: '355px' }, - }, [ + h('div.confirm-screen-container.confirm-send-ether', [ // Main Send token Card - h('div.confirm-screen-wrapper.flex-column.flex-grow', [ - h('h3.flex-center.confirm-screen-header', [ - h('button.btn-clear.confirm-screen-back-button', { + h('div.page-container', [ + h('div.page-container__header', [ + h('button.confirm-screen-back-button', { onClick: () => editTransaction(txMeta), - }, 'EDIT'), - h('div.confirm-screen-title', 'Confirm Transaction'), - h('div.confirm-screen-header-tip'), + }, 'Edit'), + h('div.page-container__title', 'Confirm'), + h('div.page-container__subtitle', `Please review your transaction.`), ]), h('div.flex-row.flex-center.confirm-screen-identicons', [ h('div.confirm-screen-account-wrapper', [ diff --git a/ui/app/components/pending-tx/confirm-send-token.js b/ui/app/components/pending-tx/confirm-send-token.js index ad489c3e9..e4b0c186a 100644 --- a/ui/app/components/pending-tx/confirm-send-token.js +++ b/ui/app/components/pending-tx/confirm-send-token.js @@ -308,17 +308,15 @@ ConfirmSendToken.prototype.render = function () { this.inputs = [] return ( - h('div.confirm-screen-container.confirm-send-token', { - style: { minWidth: '355px' }, - }, [ + h('div.confirm-screen-container.confirm-send-token', [ // Main Send token Card - h('div.confirm-screen-wrapper.flex-column.flex-grow', [ - h('h3.flex-center.confirm-screen-header', [ - h('button.btn-clear.confirm-screen-back-button', { + h('div.page-container', [ + h('div.page-container__header', [ + h('button.confirm-screen-back-button', { onClick: () => editTransaction(txMeta), - }, 'EDIT'), - h('div.confirm-screen-title', 'Confirm Transaction'), - h('div.confirm-screen-header-tip'), + }, 'Edit'), + h('div.page-container__title', 'Confirm'), + h('div.page-container__subtitle', `Please review your transaction.`), ]), h('div.flex-row.flex-center.confirm-screen-identicons', [ h('div.confirm-screen-account-wrapper', [ diff --git a/ui/app/css/itcss/components/confirm.scss b/ui/app/css/itcss/components/confirm.scss index 255f66e66..878495290 100644 --- a/ui/app/css/itcss/components/confirm.scss +++ b/ui/app/css/itcss/components/confirm.scss @@ -103,15 +103,13 @@ } .confirm-screen-back-button { - background: transparent; - left: 24px; + color: $curious-blue; + font-family: Roboto; + font-size: 1rem; position: absolute; - padding: 6px 12px; - font-size: .7rem; - - @media screen and (max-width: $break-small) { - margin-right: 12px; - } + top: 38px; + right: 38px; + background: none; } .confirm-screen-account-wrapper { -- cgit v1.2.3 From b5b16e4ce09b5fa27ce4775b30a44bacea7ee329 Mon Sep 17 00:00:00 2001 From: Dan Date: Mon, 12 Feb 2018 13:25:00 -0330 Subject: Only open a new window on restore from seed if in extension view. --- app/scripts/platforms/extension.js | 16 ++++++++++++++++ ui/app/actions.js | 2 -- ui/app/unlock.js | 7 ++++++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/app/scripts/platforms/extension.js b/app/scripts/platforms/extension.js index f5cc255d1..60bcce324 100644 --- a/app/scripts/platforms/extension.js +++ b/app/scripts/platforms/extension.js @@ -22,6 +22,22 @@ class ExtensionPlatform { this.openWindow({ url: extensionURL }) } + isInBrowser () { + return new Promise((resolve, reject) => { + try { + extension.tabs.getCurrent(currentTab => { + if (currentTab) { + resolve(true) + } else { + resolve(false) + } + }) + } catch (e) { + reject(e) + } + }) + } + getPlatformInfo (cb) { try { extension.runtime.getPlatformInfo((platform) => { diff --git a/ui/app/actions.js b/ui/app/actions.js index c6776eeee..4bc1f379e 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -842,7 +842,6 @@ function showRestoreVault () { function markPasswordForgotten () { return (dispatch) => { - dispatch(actions.showLoadingIndication()) return background.markPasswordForgotten(() => { dispatch(actions.hideLoadingIndication()) dispatch(actions.forgotPassword()) @@ -853,7 +852,6 @@ function markPasswordForgotten () { function unMarkPasswordForgotten () { return (dispatch) => { - dispatch(actions.showLoadingIndication()) return background.unMarkPasswordForgotten(() => { dispatch(actions.hideLoadingIndication()) dispatch(actions.forgotPassword()) diff --git a/ui/app/unlock.js b/ui/app/unlock.js index 4b39bd3e2..db88fa9d0 100644 --- a/ui/app/unlock.js +++ b/ui/app/unlock.js @@ -77,7 +77,12 @@ UnlockScreen.prototype.render = function () { h('p.pointer', { onClick: () => { this.props.dispatch(actions.markPasswordForgotten()) - global.platform.openExtensionInBrowser() + global.platform.isInBrowser() + .then((isInBrowser) => { + if (!isInBrowser) { + global.platform.openExtensionInBrowser() + } + }) }, style: { fontSize: '0.8em', -- cgit v1.2.3 From 5e9dc74a59d2507f36e1cb5796f97982f5f4993d Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 13 Feb 2018 14:29:43 -0330 Subject: Remove isInBrowser method and use environment-type.js --- app/scripts/platforms/extension.js | 16 ---------------- ui/app/unlock.js | 10 ++++------ 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/app/scripts/platforms/extension.js b/app/scripts/platforms/extension.js index 60bcce324..f5cc255d1 100644 --- a/app/scripts/platforms/extension.js +++ b/app/scripts/platforms/extension.js @@ -22,22 +22,6 @@ class ExtensionPlatform { this.openWindow({ url: extensionURL }) } - isInBrowser () { - return new Promise((resolve, reject) => { - try { - extension.tabs.getCurrent(currentTab => { - if (currentTab) { - resolve(true) - } else { - resolve(false) - } - }) - } catch (e) { - reject(e) - } - }) - } - getPlatformInfo (cb) { try { extension.runtime.getPlatformInfo((platform) => { diff --git a/ui/app/unlock.js b/ui/app/unlock.js index db88fa9d0..13c3f1274 100644 --- a/ui/app/unlock.js +++ b/ui/app/unlock.js @@ -6,6 +6,7 @@ const actions = require('./actions') const getCaretCoordinates = require('textarea-caret') const EventEmitter = require('events').EventEmitter const { OLD_UI_NETWORK_TYPE } = require('../../app/scripts/config').enums +const environmentType = require('../../app/scripts/lib/environment-type') const Mascot = require('./components/mascot') @@ -77,12 +78,9 @@ UnlockScreen.prototype.render = function () { h('p.pointer', { onClick: () => { this.props.dispatch(actions.markPasswordForgotten()) - global.platform.isInBrowser() - .then((isInBrowser) => { - if (!isInBrowser) { - global.platform.openExtensionInBrowser() - } - }) + if (environmentType() === 'popup') { + global.platform.openExtensionInBrowser() + } }, style: { fontSize: '0.8em', -- cgit v1.2.3 From e422294ad1ee46fa9a8a7be291266c24f8a15901 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Tue, 13 Feb 2018 11:35:30 -0800 Subject: Add node-sass to dev dependencies To fix build --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index c5223c333..826d06c32 100644 --- a/package.json +++ b/package.json @@ -230,6 +230,7 @@ "mocha-jsdom": "^1.1.0", "mocha-sinon": "^2.0.0", "nock": "^9.0.14", + "node-sass": "^4.7.2", "nyc": "^11.0.3", "open": "0.0.5", "prompt": "^1.0.0", -- cgit v1.2.3 From 7a820bedda9b74ccc08f768597577ba839ef2c83 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Tue, 13 Feb 2018 13:35:03 -0800 Subject: Bump changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b44846e13..bfae566ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Current Master +- Fix bug where log subscriptions would break when switching network. + ## 3.14.1 2018-2-1 - Further fix scrolling for Firefox. -- cgit v1.2.3 From bcd3042491b5465f782abe0945cfd48b752e1f0e Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Tue, 13 Feb 2018 14:17:13 -0800 Subject: Standardize license. --- LICENSE | 40 +++++++++++++--------------------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/LICENSE b/LICENSE index 429f4eaee..96e55582b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,34 +1,20 @@ -Copyright (c) 2016 MetaMask - -The Ethereum Project Contributor Asset Distribution Terms ( MIT + Share-alike ) - - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and +MIT License -associated documentation files (the "Software"), to deal in the Software without restriction, - -including without limitation the rights to use, copy, modify, merge, publish, distribute, - -sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is +Copyright (c) 2016 MetaMask +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all copies or substantial - -portions of the Software. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT - -SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, - -DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - -OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - -THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -These licence terms have been adapted from the MIT licence. \ No newline at end of file +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -- cgit v1.2.3 From dc3f3e79ca7319b97255456a5225a266d38a4d6f Mon Sep 17 00:00:00 2001 From: frankiebee Date: Wed, 14 Feb 2018 14:37:02 -0800 Subject: fix - hex prefix estimatedGas on txMeta --- app/scripts/lib/tx-gas-utils.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/scripts/lib/tx-gas-utils.js b/app/scripts/lib/tx-gas-utils.js index f68f3a9e2..6f6ff7852 100644 --- a/app/scripts/lib/tx-gas-utils.js +++ b/app/scripts/lib/tx-gas-utils.js @@ -4,6 +4,7 @@ const { BnMultiplyByFraction, bnToHex, } = require('./util') +const addHexPrefix = require('ethereumjs-util').addHexPrefix const SIMPLE_GAS_COST = '0x5208' // Hex for 21000, cost of a simple send. /* @@ -13,7 +14,7 @@ and used to do things like calculate gas of a tx. */ module.exports = class TxGasUtil { - + constructor (provider) { this.query = new EthQuery(provider) } @@ -68,7 +69,7 @@ module.exports = class TxGasUtil { } setTxGas (txMeta, blockGasLimitHex, estimatedGasHex) { - txMeta.estimatedGas = estimatedGasHex + txMeta.estimatedGas = addHexPrefix(estimatedGasHex) const txParams = txMeta.txParams // if gasLimit was specified and doesnt OOG, -- cgit v1.2.3 From 33182efb1384dc05c8ecdb8994d12dd30abcbc7e Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Thu, 15 Feb 2018 08:34:31 -0800 Subject: Offline testing --- package.json | 2 +- test/stub/blacklist.json | 1374 ++++++++++++++++++++++++++++++++ test/stub/first-time-state.js | 14 + test/unit/blacklist-controller-test.js | 2 +- test/unit/metamask-controller-test.js | 178 ++--- test/unit/network-contoller-test.js | 4 + 6 files changed, 1470 insertions(+), 104 deletions(-) create mode 100644 test/stub/blacklist.json create mode 100644 test/stub/first-time-state.js diff --git a/package.json b/package.json index 74a9f15d0..9f5003c87 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "dist": "npm run dist:clear && npm install && gulp dist", "dist:clear": "rm -rf node_modules/eth-contract-metadata && rm -rf node_modules/eth-phishing-detect", "test": "npm run lint && npm run test:coverage && npm run test:integration", - "test:unit": "METAMASK_ENV=test mocha --exit --compilers js:babel-core/register --require test/helper.js --recursive \"test/unit/**/*.js\"", + "test:unit": "METAMASK_ENV=test mocha --exit --require babel-core/register --require test/helper.js --recursive \"test/unit/**/*.js\"", "test:single": "METAMASK_ENV=test mocha --require test/helper.js", "test:integration": "npm run test:flat && npm run test:mascara", "test:coverage": "nyc npm run test:unit && npm run test:coveralls-upload", diff --git a/test/stub/blacklist.json b/test/stub/blacklist.json new file mode 100644 index 000000000..6a3230b2f --- /dev/null +++ b/test/stub/blacklist.json @@ -0,0 +1,1374 @@ +{ + "version": 2, + "tolerance": 2, + "fuzzylist": [ + "metamask.io", + "myetherwallet.com", + "cryptokitties.co", + "mycrypto.com" + ], + "whitelist": [ + "crypto.pro", + "ocrypto.org", + "wecrypto.net", + "iccrypto.io", + "crypto.kred", + "ohmycrypto.io", + "spcrypto.net", + "melcrypto.com", + "zzcrypto.org", + "zzcrypto.net", + "crypto.bg", + "mycrypto24.online", + "acrypto.io", + "mycrypto.ca", + "scrypto.io", + "mycrypto.dk", + "mvzcrypto.com", + "ambcrypto.com", + "crypto.bi", + "crypto.jobs", + "crypto.help", + "my.crypt.observer", + "crypt.observer", + "ucrypto.com", + "cryptojobslist.com", + "crypto.review", + "crypto.me", + "b3crypto.com", + "mycrypto.ninja", + "jkcrypto.com", + "crypto.cr", + "mycrypto.live", + "yocrypto.io", + "crypto.ba", + "zacrypto.info", + "mycrypto.com", + "remix.ethereum.org", + "metahash.io", + "metahash.net", + "metahash.org", + "cryptotitties.com", + "cryptocities.net", + "cryptoshitties.co", + "cryptotitties.fun", + "cryptokitties.forsale", + "cryptokitties.care", + "metamate.cc", + "metamesh.tech", + "ico.nexus.social", + "metamesh.org", + "metatask.io", + "metmask.com", + "metarasa.com", + "metapack.com", + "metacase.com", + "metafas.nl", + "metamako.com", + "metamast.com", + "metamax.ru", + "metadesk.io", + "metadisk.com", + "metallsk.ru", + "metamag.fr", + "metamaks.ru", + "metamap.ru", + "metamaps.cc", + "metamats.com", + "metamax.by", + "metamax.com", + "metamax.io", + "metamuse.net", + "metarank.com", + "metaxas.com", + "megamas2.ru", + "metamask.io", + "myetherwallet.com", + "myethlerwallet.com", + "ethereum.org", + "myetheroll.com", + "myetherapi.com", + "ledgerwallet.com", + "databrokerdao.com", + "etherscan.io", + "etherid.org", + "ether.cards", + "etheroll.com", + "ethnews.com", + "ethex.market", + "ethereumdev.io", + "ethereumdev.kr", + "dether.io", + "ethermine.org", + "slaask.com", + "etherbtc.io", + "ethereal.capital", + "etherisc.com", + "m.famalk.net", + "etherecho.com", + "ethereum.os.tc", + "theethereum.wiki", + "metajack.im", + "etherhub.io", + "ethereum.network", + "ethereum.link", + "ethereum.com", + "prethereum.org", + "ethereumj.io", + "etheraus.com", + "ethereum.dev", + "1ethereum.ru", + "ethereum.nz", + "nethereum.com", + "metabank.com", + "metamas.com", + "aventus.io", + "metabase.com", + "etherdelta.com", + "metabase.one", + "cryptokitties.co", + "remme.io", + "jibrel.network" + ], + "blacklist": [ + "xn--myethrwalle-jb9e19a.com", + "xn--myetheralle-7b9ezl.com", + "iconfoundation.co", + "fundrequest.info", + "xn--myetherwale-os8e7x.com", + "remme-ico.eu", + "gonetwork.live", + "token.gonetwork.pro", + "gonetwork.pro", + "gonetwork.eu", + "nucleus-vision.cc", + "jibreltoken.in", + "dock.so", + "dock.promo", + "xn--mycrypt-r0a.com", + "xn--mycrypt-g1a.com", + "xn--mycrpto-y2a.com", + "ethexploit.org", + "remme.in", + "remme.ws", + "remme.com.ng", + "nyeitthervvallet.com", + "xn--myeerhwailet-ooc.com", + "myeterhwaliot.com", + "remme.live", + "xn--yethewalle-to2exkhi.com", + "myetherwallet.custom-token.com", + "custom-token.com", + "sale-earn.com", + "bankera.live", + "originprotocol.io", + "trx.foundation", + "tokensale.adhive.net", + "adhive.net", + "decentral.market", + "cryptoexploite.com", + "blockclain.net", + "xn--blckchin-5za9o.info", + "xn--blkhain-m0a4pb.info", + "xn--blocchal-gmb8m.info", + "xn--blocchaln-orb.info", + "xn--blocchan-gmb7c.info", + "xn--blockaden-lsen-5pb.com", + "xn--blockchai-3vb.info", + "xn--blockchai-jvb.info", + "xn--blockchal-3vb.info", + "xn--blockcham-ipb.info", + "xn--blockchan-2pb.com", + "xn--blockchan-75a.com", + "xn--blockchan-7sb.info", + "xn--blockchan-d5a.net", + "xn--blockchan-dob.info", + "xn--blockchan-ipb.com", + "xn--blockchan-ipb.info", + "xn--blockchan-nk7d.com", + "xn--blockchan-xub.info", + "xn--blockchann-4ub.com", + "xn--blockchi-n7a50e.info", + "xn--blockchi-o8a54d.info", + "xn--blockchi-p99co8a.com", + "xn--blockchim-hdb.info", + "xn--blockchin-1xb.info", + "xn--blockchin-61a.info", + "xn--blockchin-61a.net", + "xn--blockchin-6ib.info", + "xn--blockchin-ccb.info", + "xn--blockchin-h4a.com", + "xn--blockchin-h4a.info", + "xn--blockchin-hdb.info", + "xn--blockchin-hhb.info", + "xn--blockchin-mib.net", + "xn--blockchin-wcb.com", + "xn--blockchn-fza4j.com", + "xn--blockchn-fza4j.info", + "xn--blockchn-n7a43b.info", + "xn--blockchn-p0a.info", + "xn--blockchn-tx0d4p.com", + "xn--blockclai-3vb.info", + "xn--blockclin-hdb.com", + "xn--blockclin-hdb.info", + "xn--blockclin-hdb.org", + "xn--blockflte-kirchrode-w6b.de", + "xn--blockfltenquartett-windspiel-81c.de", + "xn--blockhai-obb78c.info", + "xn--blockhain-4eb.com", + "xn--blockhain-pfb.com", + "xn--blockhain-pfb.info", + "xn--blockhain-zdb.info", + "xn--blockhan-obb65a.info", + "xn--blockhas-d6a.com", + "xn--blockwallt-j7a.com", + "xn--blokchai-fqb.info", + "xn--blokchain-nfb.info", + "xn--blokhain-28ab.info", + "xn--bockclnain-eyb.info", + "xn--mymoeo-zt7bzf.com", + "xn--mymoer-nqc1368c.com", + "xn--mymoero-c13c.com", + "xn--mymoero-s13c.com", + "xn--mymoneo-f63c.com", + "xn--mymoneo-v63c.com", + "xn--mymoneo-y53c.com", + "xn--mymoner-j0a.com", + "xn--mymoner-j5b.com", + "xn--mymoner-r0a.com", + "xn--mymoner-z0a.com", + "xn--mymoner-z2c.com", + "xn--mymonro-fya.com", + "xn--mymonro-x8a.com", + "xn--myetheallet-l58emu.com", + "xn--myetheraet-9k2ea77h.com", + "xn--myetheralet-ms8e21b.com", + "xn--myetheralle-7b9exm.com", + "xn--myetherallet-5s5f.com", + "xn--myetherallet-fs5f.com", + "xn--myetherewalle-1t1g.com", + "xn--myetherllet-pl9e6k.com", + "xn--myethervvalle-8vc.com", + "xn--myetherwaet-61ea.com", + "xn--myetherwaet-8eda.com", + "xn--myetherwaet-ns8ea.com", + "xn--myetherwale-ns8e8x.com", + "xn--myetherwalet-0fb.com", + "xn--myetherwalet-0z4f.com", + "xn--myetherwalet-814f.com", + "xn--myetherwalet-d9b.com", + "xn--myetherwalet-h14f.com", + "xn--myetherwalle-9me.com", + "xn--myetherwalle-ek5f.com", + "xn--myetherwalle-fqc.com", + "xn--myetherwalle-opc.com", + "xn--myetherwalle-q05f.com", + "xn--myetherwllet-wob.com", + "xn--myetherwllt-r7a0i.com", + "xn--myethewaliet-9d5f.com", + "xn--myethewalle-3ic0947g.com", + "xn--myethewallet-0e5f.com", + "xn--myethewallet-1kc.com", + "xn--myethewallet-bkc.com", + "xn--myethewallet-vof.com", + "xn--myethewalliet-nm1g.com", + "xn--myethewallt-kbb3019g.com", + "xn--myethewallt-w48ew7b.com", + "xn--myethrwalet-6qb6408g.com", + "xn--myethrwalet-ms8e83d.com", + "xn--myethrwallet-1db.com", + "xn--myethrwallt-29af.com", + "xn--myethrwallt-29as.com", + "xn--myethrwllet-q7a31e.com", + "xn--myethrwllet-r8a3c.com", + "fintrux.eu", + "refereum-ico.eu", + "arcblock-ico.org", + "xn--fuson-1sa.org", + "refereum-token.com", + "fintrux.co", + "ico-ton.org", + "xn--mytherwallt-cbbv.com", + "xmoneta.co", + "data-wallet.co", + "tokensale.data-wallet.co", + "xn--myeerhwallot-ooc.com", + "xn--myeterwalet-cm8epi.com", + "xn--myeterwalle-cm8ev6a.com", + "rnyetherumwallet.com", + "republic-protocol.net", + "nyeihitervvallatt.com", + "arcblock.eu", + "republicprotocol.eu", + "tokensale-fusion.com", + "myetherwalletjoin.com", + "medicalchian.com", + "myeahteirwaliet.com", + "myenhtersvvailct.com", + "trinity-token.com", + "xn--eo-yzs.com", + "zilliqa.in", + "sparc.pro", + "myetherwallet.import-tokens.com", + "token-gram.org", + "xn--shapshift-e4a.com", + "xn--shapshift-y4a.com", + "xn--shpeshift-c2a.com", + "xn--shpeshift-r1a.com", + "xn--shapshift-o4a.com", + "xn--shpeshift-w2a.com", + "xn--shapeshft-w5a.com", + "tokensale-fusion.org", + "fusion-ico.com", + "beetolen.com", + "tokencrowdsale.online", + "fusion.tokencrowdsale.online", + "beetokem.com", + "block.chaiins.in", + "origintrail.in", + "bit-z.ru", + "xn--myetherallet-nu5f.com", + "xn--mytherwalet-3qb08c.com", + "xn--myeterwllet-cm8et1d.com", + "xn--mytherwllet-q7a01e.com", + "xn--biance-xt7b.com", + "xn--bnance-wic.com", + "xn--biance-jeb.com", + "xn--bttrx-9za8334c.com", + "wwwkodakcoin.com", + "myetherwallet.uk.com", + "kodakone.cc", + "nyeihitervvallet.com", + "xn--myeterwalet-cm8eoi.com", + "nucleus.foundation", + "beetoken-ico.com", + "data-token.com", + "tron-labs.com", + "ocoin.tech", + "aionfoundation.com", + "ico-telegram.org", + "nyeihitervvallat.com", + "telegramcoin.us", + "daddi.cloud", + "daditoken.com", + "blockarray.org", + "dadi-cloud.net", + "wanchainfunding.org", + "ico-telegram.io", + "iconfoundation.site", + "iost.co", + "beetoken-ico.eu", + "cindicator.network", + "wanchainetwork.org", + "wamchain.org", + "wanchainltd.org", + "wanchainalliance.org", + "nucleus-vision.net", + "ledgerwallet.by", + "nucleuss.vision", + "myenhterswailct.com", + "cobin-hood.com", + "wanchainfoundation.org", + "xn--polniex-ex4c.com", + "xn--polniex-s1a.com", + "xn--polonex-ieb.com", + "xn--polonex-sza.com", + "xn--polonex-zw4c.com", + "xn--polonix-ws4c.com", + "xn--polonix-y8a.com", + "xn--pooniex-ojb.com", + "gramico.info", + "dimnsions.network", + "www-gemini.com", + "login-kucoin.net", + "venchain.foundation", + "grampreico.com", + "tgram.cc", + "ton-gramico.com", + "wwwpaywithink.com", + "coniomi.com", + "paywithnk.com", + "paywithlnk.com", + "iluminatto.com.br", + "pundix.eu", + "xn--bttrx-esay.com", + "xn--bttrex-w8a.com", + "xn--bnance-bwa.com", + "xn--shpeshift-11a.com", + "xn--shapeshif-ts6d.com", + "xn--shapshift-yf7d.com", + "wwwbluzelle.com", + "bluzelie.com", + "nucleus-vision.org", + "omisegonetwork.site", + "etlherzero.com", + "etlherdelta.com", + "xn--condesk-0ya.com", + "xn--condesk-sfb.com", + "xn--coindsk-vs4c.com", + "iexecplatform.com", + "tongramico.com", + "nucleus-vision.eu", + "intchain.network", + "wanchain.cloud", + "bluzelle-ico.com", + "ethzero-wallet.com", + "xn--metherwalle-jb9et7d.com", + "xn--coinesk-jo3c.com", + "venchainfoundation.com", + "myenhtersvvailot.com", + "ether-zero.net", + "ins.foundation", + "nastoken.org", + "telcointoken.com", + "ether0.org", + "eterzero.org", + "bluzelle-ico.eu", + "bleuzelle.com", + "appcoinstoken.org", + "xn--quanstamp-8s6d.com", + "myehntersvvailct.com", + "myeherwalllet.com", + "ico-bluzelle.com", + "bluzelle.im", + "bluzelle.one", + "bluzele.sale", + "bluzele.co", + "sether.ws", + "xn--myetherwalet-6gf.com", + "xn--rnyethewaliet-om1g.com", + "rnyethervailet.com", + "mvetherwaliet.com", + "rnyetherwailet.com", + "myethervaliet.com", + "rnyethervaliet.com", + "mvetherwalilet.com", + "xn--myethewalie-3ic0947g.com", + "xn--mthrwallet-z6ac3y.com", + "xn--myeherwalie-vici.com", + "xn--myethervvalie-8vc.com", + "xn--mythrwallt-06acf.com", + "xn--mtherwallet-y9a6y.com", + "myetherwallet.applytoken.tk", + "ethereum-zero.com", + "quanstamptoken.tk", + "bluzelle.network", + "ether-wallet.org", + "tron-wallet.info", + "appcoinsproject.com", + "vechain.foundation", + "tronlab.site", + "tronlabs.network", + "bluzelle.cc", + "ethblender.com", + "ethpaperwallet.net", + "waltontoken.org", + "icoselfkey.org", + "etherzeroclaim.com", + "etherzero.promo", + "bluzelle.pro", + "token-selfkey.org", + "xn--etherdlta-0f7d.com", + "sether.in", + "xn--ttrex-ysa9423c.com", + "bluzelle.eu", + "bluzelle.site", + "gifto.tech", + "xn--os-g7s.com", + "selfkey.co", + "xn--myeherwalet-ns8exy.com", + "xn--coinelegraph-wk5f.com", + "dai-stablecoin.com", + "eos-token.org", + "venchain.org", + "gatcoins.io", + "deepbrainchain.co", + "myetherwalililet.info", + "myehvterwallet.com", + "myehterumswallet.com", + "nucleusico.com", + "tronlab.tech", + "0x-project.com", + "gift-token-events.mywebcommunity.org", + "funfairtoken.org", + "breadtokenapp.com", + "cloudpetstore.com", + "myethwalilet.com", + "selfkeys.org", + "wallet-ethereum.com", + "xn--methrwallt-26ar0z.com", + "xn--mytherwllet-r8a0c.com", + "bluzelle.promo", + "tokensale.bluzelle.promo", + "cedarlake.org", + "marketingleads4u.com", + "cashaa.co", + "xn--inance-hrb.com", + "wanchain.tech", + "zenprolocol.com", + "ethscan.io", + "etherscan.in", + "props-project.com", + "zilliaq.com", + "reqestnetwork.com", + "etherdelta.pw", + "ethereum-giveaway.org", + "mysimpletoken.org", + "binancc.com", + "blnance.org", + "elherdelta.io", + "xn--hapeshit-ez9c2y.com", + "tenxwallet.co", + "singularitynet.info", + "mytlherwaliet.info", + "iconmainnet.ml", + "tokenselfkey.org", + "xn--myetewallet-cm8e5y.com", + "envione.org", + "myetherwalletet.com", + "claimbcd.com", + "ripiocreditnetwork.in", + "xn--yeterwallet-ml8euo.com", + "ethclassicwallet.info", + "myltherwallet.ru.com", + "etherdella.com", + "xn--yeterwallet-bm8ewn.com", + "singularty.net", + "cloudkitties.co", + "iconfoundation.io", + "kittystat.com", + "gatscoin.io", + "singularitynet.in", + "sale.canay.io", + "canay.io", + "wabicoin.co", + "envion.top", + "sirinslabs.com", + "tronlab.co", + "paxful.com.ng", + "changellyli.com", + "ethereum-code.com", + "xn--plonex-6va6c.com", + "envion.co", + "envion.cc", + "envion.site", + "ethereumchain.info", + "xn--envon-1sa.org", + "xn--btstamp-rfb.net", + "envlon.org", + "envion-ico.org", + "spectivvr.org", + "sirinlbs.com", + "ethereumdoubler.life", + "xn--myetherwllet-fnb.com", + "sirin-labs.com", + "sirin-labs.org", + "envion.one", + "envion.live", + "propsproject.org", + "propsprojects.com", + "decentralland.org", + "xn--metherwalet-ns8ep4b.com", + "redpulsetoken.co", + "propsproject.tech", + "xn--myeterwalet-nl8emj.com", + "powrerledger.com", + "cryptokitties.com", + "sirinlabs.pro", + "sirinlabs.co", + "sirnlabs.com", + "superbitcoin-blockchain.info", + "hellobloom.me", + "mobus.network", + "powrrledger.com", + "xn--myeherwalet-ms8eyy.com", + "qlink-ico.com", + "gatcoin.in", + "tokensale.gamefllp.com", + "gamefllp.com", + "xn--myeherwalle-vici.com", + "xn--myetherwalet-39b.com", + "xn--polonex-ffb.com", + "xn--birex-leba.com", + "raiden-network.org", + "sirintabs.com", + "xn--metherwallt-79a30a.com", + "xn--myethrwllet-2kb3p.com", + "myethlerwallet.eu", + "xn--btrex-b4a.com", + "powerrledger.com", + "xn--cointeegraph-wz4f.com", + "myerherwalet.com", + "qauntstanp.com", + "myetherermwallet.com", + "xn--myethewalet-ns8eqq.com", + "xn--nvion-hza.org", + "nnyetherwallelt.ru.com", + "ico-wacoin.com", + "xn--myeterwalet-nl8enj.com", + "bitcoinsilver.io", + "t0zero.com", + "tokensale.gizer.in", + "gizer.in", + "wabitoken.com", + "gladius.ws", + "xn--metherwallt-8bb4w.com", + "quanttstamp.com", + "gladius.im", + "ethereumstorage.net", + "powerledgerr.com", + "xn--myeherwallet-4j5f.com", + "quamtstamp.com", + "quntstamp.com", + "xn--changely-j59c.com", + "shapeshlft.com", + "coinbasenews.co.uk", + "xn--metherwallet-hmb.com", + "envoin.org", + "powerledger.com", + "bitstannp.net", + "xn--myetherallet-4k5fwn.com", + "xn--coinbas-pya.com", + "requestt.network", + "oracls.network", + "sirinlabs.website", + "powrledger.io", + "slackconfirm.com", + "shape-shift.io", + "oracles-network.org", + "xn--myeherwalle-zb9eia.com", + "blockstack.one", + "urtust.io", + "bittrex.one", + "t0-ico.com", + "xn--cinbase-90a.com", + "xn--metherwalet-ns8ez1g.com", + "tzero-ico.com", + "tzero.su", + "tzero.website", + "blockstack.network", + "ico-tzero.com", + "spectre.site", + "tzero.pw", + "spectre-ai.net", + "xn--waxtokn-y8a.com", + "dmarket.pro", + "bittrex.com11648724328774.cf", + "bittrex.com1987465798.ga", + "autcus.org", + "t-zero.org", + "xn--zero-zxb.com", + "myetherwalletfork.com", + "blokclbain.info", + "datum.sale", + "spectre-ai.org", + "powerledgr.com", + "simpletoken.live", + "sale.simpletoken.live", + "qauntstamp.com", + "raiden-network.com", + "metalpayme.com", + "quantstamp-ico.com", + "myetherwailetclient.com", + "biockchain.biz", + "wallets-blockchain.com", + "golemairdrop.com", + "omisegoairdrop.net", + "blodkchainwallet.info", + "walton-chain.org", + "elite888-ico.com", + "bitflyerjp.com", + "chainlinksmartcontract.com", + "stormtoken.eu", + "omise-go.tech", + "saltending.com", + "stormltoken.com", + "xn--quanttamp-42b.com", + "stormtoken.co", + "storntoken.com", + "stromtoken.com", + "storm-token.com", + "stormtokens.io", + "ether-delta.com", + "ethconnect.live", + "ethconnect.trade", + "xn--bttrex-3va.net", + "quantstamp.com.co", + "wancha.in", + "augur-network.com", + "quantstamp.com.ua", + "myetherwalletmew.com", + "myetherumwalletts.com", + "xn--quanstamp-tmd.com", + "quantsstamps.com", + "changellyl.net", + "xn--myetherwalet-1fb.com", + "myethereumwallets.com", + "xn--myetherwalet-e9b.com", + "quantslamp.com", + "metelpay.com", + "xn--eterdelta-m75d.com", + "linksmartcontract.com", + "myetherwalletaccess.com", + "myetherwalletcheck.com", + "myetherwalletcheck.info", + "myetherwalletconf.com", + "myetherwalleteal.com", + "myetherwalletec.com", + "myetherwalletgeth.com", + "myetherwalletmetamask.com", + "myetherwalletmm.com", + "myetherwalletmy.com", + "myetherwalletnh.com", + "myetherwalletnod.com", + "myetherwalletrr.com", + "myetherwalletrty.com", + "myetherwalletsec.com", + "myetherwalletsecure.com", + "myetherwalletutc.com", + "myetherwalletver.info", + "myetherwalletview.com", + "myetherwalletview.info", + "myetherwalletvrf.com", + "myetherwalletmist.com", + "myetherwalletext.com", + "myetherwalletjson.com", + "mettalpay.com", + "bricklblock.io", + "bittrexy.com", + "utrust.so", + "myethierwallet.org", + "metallpay.com", + "kraken-wallet.com", + "dmarkt.io", + "etherdeltla.com", + "unlversa.io", + "universa.sale", + "mercuryprotocol.live", + "ripiocredlt.network", + "myetlherwa11et.com", + "dentacoin.in", + "rdrtg.com", + "myetherwallet.com.rdrgh.com", + "rdrgh.com", + "ripiocreditnetwork.co", + "riaden.network", + "hydrominer.biz", + "rdrblock.com", + "reqest.network", + "senstoken.com", + "myetherwallat.services", + "ripiocredit.net", + "xn--metherwallet-c06f.com", + "ico.ripiocredits.com", + "ripiocredits.com", + "raidens.network", + "artoken.co", + "myetherwalletlgn.com", + "etherblog.click", + "stormtoken.site", + "httpmyetherwallet.com", + "myetherwalletverify.com", + "byzantiumfork.com", + "myetherwallet.com.byzantiumfork.com", + "www-myethervvallet.com", + "ether24.info", + "block-v.io", + "bittrex.cash", + "shapishift.io", + "ripiocerdit.network", + "rnyetherwa11et.com", + "claimether.com", + "enigmatokensale.com", + "ethereum-org.com", + "mvetnerwallet.com", + "myctherwallet.com", + "myetherwaltet.com", + "myetherwatlet.com", + "privatix.me", + "myetherwalletcnf.com", + "myetherwalletver.com", + "privatix.top", + "privatix.pro", + "privatex.io", + "stormtoken.cc", + "raiden.online", + "stormstoken.com", + "myetereumwallet.com", + "stormtokens.net", + "myetherwalletconf.info", + "storrntoken.com", + "worldofbattles.io", + "ico.worldofbattles.io", + "privatix.live", + "riden.network", + "raidan.network", + "ralden.network", + "mymyetherwallet.com", + "myetherwallets.net", + "myetherwalletverify.info", + "stormxtoken.com", + "myethereum-wallet.com", + "myetherwallet-forkprep.pagedemo.co", + "myetnerwailet.com", + "www-mvetherwallet.com", + "etheirdelta.com", + "myetherwalletiu.com", + "myetherwaiiett.com", + "xn--mytherwalet-cbb87i.com", + "xn--myethrwallet-ivb.co", + "xn--myeterwallet-f1b.com", + "myehterwaliet.com", + "omegaone.co", + "myetherwaiietw.com", + "slack.com.ru", + "polkodot.network", + "request-network.net", + "requestnetwork.live", + "binancie.com", + "first-eth.info", + "myewerthwalliet.com", + "enjincoin.pw", + "xn--bitrex-k17b.com", + "alrswap.io", + "www-request.network", + "myetnenwallet.com", + "www-enigma.co", + "cryptoinsidenews.com", + "air-swap.tech", + "launch.airswap.cc", + "airswap.cc", + "airswaptoken.com", + "launch.airswap.in", + "airswap.in", + "security-steemit.com.mx", + "blockchalnwallet.com", + "blodkchainwallet.com", + "blodkchaln.com", + "myethereumwaiiet.com", + "myethereumwaliet.com", + "myethereumwalilet.com", + "myetherswailet.com", + "myetherswaliet.com", + "myetherswalilet.com", + "myetherwalilett.com", + "myetherwalletl.com", + "myetherwalletww.com", + "myethereunwallet.com", + "myethereumwallct.com", + "myetherwaiieti.com", + "myetherwaiiete.com", + "upfirng.com", + "paypie.net", + "paypie.tech", + "soam.co", + "myetherwaiict.com", + "numerai-token.com", + "www-bankera.com", + "vvanchain.org", + "omisegoairdrop.com", + "xn--enjncoin-41a.io", + "suncontract.su", + "myetherwaiietr.com", + "shapeshiff.io", + "warchain.org", + "myethwallett.com", + "myethervvaliet.com", + "wanchains.org", + "etherparty.in", + "enjincoin.me", + "etiam.io", + "invest.smartlands.tech", + "smartlands.tech", + "enijncoin.io", + "wanchain.network", + "nimiq.su", + "enjincoin.sale", + "tenxwallet.io", + "golem-network.net", + "myyethwallet.ml", + "mywetherwailiet.com", + "omg-omise.com", + "district0x.tech", + "centra-token.com", + "etherdetla.com", + "etnerparty.io", + "etherdelta.su", + "myetherwallett.neocities.org", + "myetherwallet-secure.com", + "myethereumwalletntw.info", + "real-markets.io", + "wallet-ethereum.org", + "request-network.com", + "shapeshifth.io", + "shiapeshift.in", + "coin.red-puise.com", + "ibittreix.com", + "coinkbase.com", + "cindicator.pro", + "myetherwallet.com.ailogin.me", + "eventchain.co", + "kinkik.in", + "myetherumwalletview.com", + "protostokenhub.com", + "coinrbase.com", + "myetherwalletlogin.com", + "omisegotoken.com", + "myethereumwalletntw.com", + "reall.markets", + "cobinhood.org", + "cobinhood.io", + "happy-coin.org", + "bitfinex.com.co", + "bitfienex.com", + "iconn.foundation", + "centra.vip", + "smartcontract.live", + "icon.community", + "air-token.com", + "centra.credit", + "myetherwallet-singin.com", + "smartcontractlink.com", + "shapesshift.io", + "0xtoken.io", + "augurproject.co", + "ethereumus.one", + "myetherumwalet.com", + "myetherwalletsignin.com", + "change-bank.org", + "charge-bank.com", + "myetherwalletsingin.com", + "myetherwalletcontract.com", + "change-bank.io", + "chainlink.tech", + "myetherwallet-confirm.com", + "tokensale.kybernet.network", + "kybernet.network", + "kyberr.network", + "kybernetwork.io", + "myetherwalletconfirm.com", + "kvnuke.github.io", + "kin.kikpro.co", + "myethereumwallet.co.uk", + "tokensale-kyber.network", + "kyber-network.co", + "tokensale.kyber-network.co", + "pyro0.github.io", + "tokensale.kyber.digital", + "kyber.digital", + "omise-go.me", + "my.etherwallet.com.de", + "bepartof.change-bank.co", + "change-bank.co", + "enigma-tokens.co", + "coinbase.com.eslogin.co", + "xn--bittrx-mva.com", + "ethrdelta.github.io", + "etherdellta.com", + "ico-nexus.social", + "red-pulse.tech", + "bitj0b.io", + "xn--bttrex-bwa.com", + "kin-klk.com", + "kin-crowdsale.com", + "ethedelta.com", + "coindash.su", + "myethwallet.co.uk", + "swarm.credit", + "myethereumwallet.uk", + "iconexu.social", + "wanchain.co", + "enigrna.co", + "linknetwork.co", + "qtum-token.com", + "omisego.com.co", + "rivetzintl.org", + "etherdelta.one", + "the-ether.pro", + "etherdelta.gitnub.io", + "kirkik.com", + "monetha.ltd", + "vlberate.io", + "ethereumwallet-kr.info", + "omise-go.org", + "iconexus.social", + "bittirrex.com", + "aventus.pro", + "atlant.solutions", + "aventus.group", + "metamak.io", + "omise.com.co", + "herotokens.io", + "starbase.pro", + "etherdelta.githulb.io", + "herotoken.co", + "kinico.net", + "dmarket.ltd", + "etherdelta.gilthub.io", + "golem-network.com", + "etnerscan.io", + "bllttriex.com", + "monetha.me", + "monetha.co", + "monetha-crowdsale.com", + "starbase.tech", + "aventus-crowdsale.com", + "shapeshift.pro", + "bllttrex.com", + "kickico.co", + "statustoken.im", + "bilttrex.com", + "tenxpay.io", + "bittrex.ltd", + "metalpay.im", + "aragon.im", + "coindash.tech", + "decentraland.tech", + "decentraland.pro", + "status-token.com", + "bittrex.cam", + "enigmatoken.com", + "unocoin.company", + "unocoin.fund", + "0xproject.io", + "0xtoken.com", + "numerai.tech", + "decentraiand.org", + "blockcrein.info", + "blockchealn.info", + "bllookchain.info", + "blockcbhain.info", + "myetherwallet.com.ethpromonodes.com", + "mettamask.io", + "tokenswap.org", + "netherum.com", + "etherexx.org", + "etherume.io", + "ethereum.plus", + "ehtereum.org", + "etereurm.org", + "etheream.com", + "ethererum.org", + "ethereum.io", + "etherdelta-glthub.com", + "cryptoalliance.herokuapp.com", + "bitspark2.com", + "indorsetoken.com", + "iconexus.tk", + "iconexus.ml", + "iconexus.ga", + "iconexus.cf", + "etherwallet.online", + "wallet-ethereum.net", + "bitsdigit.com", + "etherswap.org", + "eos.ac", + "uasfwallet.com", + "ziber.io", + "multiply-ethereum.info", + "bittrex.comze.com", + "karbon.vacau.com", + "etherdelta.gitlhub.io", + "etherdelta.glthub.io", + "digitaldevelopersfund.vacau.com", + "district-0x.io", + "coin-dash.com", + "coindash.ru", + "district0x.net", + "aragonproject.io", + "coin-wallet.info", + "coinswallet.info", + "contribute-status.im", + "ether-api.com", + "ether-wall.com", + "mycoinwallet.net", + "ethereumchamber.com", + "ethereumchamber.net", + "ethereumchest.com", + "ethewallet.com", + "myetherwallet.com.vc", + "myetherwallet.com.pe", + "myetherwallet.us.com", + "myetherwallet.com.u0387831.cp.regruhosting.ru", + "myethereumwallet.su", + "myetherweb.com.de", + "myetherieumwallet.com", + "myetehrwallet.com", + "myeterwalet.com", + "myetherwaiiet.com", + "myetherwallet.info", + "myetherwallet.ch", + "myetherwallet.om", + "myethervallet.com", + "myetherwallet.com.cm", + "myetherwallet.com.co", + "myetherwallet.com.de", + "myetherwallet.com.gl", + "myetherwallet.com.im", + "myetherwallet.com.ua", + "secure-myetherwallet.com", + "update-myetherwallet.com", + "wwwmyetherwallet.com", + "myeatherwallet.com", + "myetharwallet.com", + "myelherwallel.com", + "myetherwaillet.com", + "myetherwaliet.com", + "myetherwallel.com", + "myetherwallet.cam", + "myetherwallet.cc", + "myetherwallet.co", + "myetherwallet.cm", + "myetherwallet.cz", + "myetherwallet.org", + "myetherwallet.tech", + "myetherwallet.top", + "myetherwallet.net", + "myetherwallet.ru.com", + "myetherwallet.com.ru", + "metherwallet.com", + "myetrerwallet.com", + "myetlerwallet.com", + "myethterwallet.com", + "myethwallet.io", + "myethterwallet.co", + "myehterwallet.co", + "myaetherwallet.com", + "myetthterwallet.com", + "myetherwallet.one", + "myelterwallet.com", + "myetherwallet.gdn", + "myetherwallt.com", + "myeterwallet.com", + "myeteherwallet.com", + "myethearwailet.com", + "myetherwallelt.com", + "myetherwallett.com", + "etherwallet.org", + "myetherewallet.com", + "myeherwallet.com", + "myethcrwallet.com", + "myetherwallet.link", + "myetherwallets.com", + "myethearwaillet.com", + "myethearwallet.com", + "myetherawllet.com", + "myethereallet.com", + "myetherswallet.com", + "myetherwalet.com", + "myetherwaller.com", + "myetherwalliet.com", + "myetherwllet.com", + "etherwallet.io", + "myetherwallet.ca", + "myetherwallet.me", + "myetherwallet.ru", + "myetherwallet.xyz", + "myetherwallte.com", + "myethirwallet.com", + "myethrewallet.com", + "etherwallet.net", + "maetherwallet.com", + "meyetherwallet.com", + "my.ether-wallet.pw", + "myehterwallet.com", + "myeitherwallet.com", + "myelherwallet.com", + "myeltherwallet.com", + "myerherwallet.com", + "myethearwalet.com", + "myetherewalle.com", + "myethervvallet.com", + "myetherwallent.com", + "myetherwallet.fm", + "myetherwalllet.com", + "myetherwalltet.com", + "myetherwollet.com", + "myetlherwalet.com", + "myetlherwallet.com", + "rnyetherwallet.com", + "etherclassicwallet.com", + "omg-omise.co", + "omise-go.com", + "omise-go.net", + "omise-omg.com", + "omise-go.io", + "tenx-tech.com", + "bitclaive.com", + "tokensale-tenx.tech", + "ubiqcoin.org", + "metamask.com", + "ethtrade.io", + "myetcwallet.com", + "account-kigo.net", + "bitcoin-wallet.net", + "blocklichan.info", + "bloclkicihan.info", + "coindash.ml", + "eos-bonus.com", + "eos-io.info", + "ether-wallet.net", + "ethereum-wallet.info", + "ethereum-wallet.net", + "ethereumchest.net", + "reservations-kigo.net", + "reservations-lodgix.com", + "secure-liverez.com", + "secure-onerooftop.com", + "settings-liverez.com", + "software-liverez.com", + "software-lodgix.com", + "unhackableetherwallets.com", + "www-myetherwallet.com", + "etherwallet.co.za", + "etherwalletchain.com", + "etherwallets.net", + "etherwallets.nl", + "my-ethwallet.com", + "my.ether-wallet.co", + "myetherwallet.com.am", + "myetherwallet.com.ht", + "myetherwalletcom.com", + "myehterwailet.com", + "xn--myetherwalle-xoc.com", + "xn--myetherwalle-44i.com", + "xn--myetherwalle-xhk.com", + "xn--myetherwallt-cfb.com", + "xn--myetherwallt-6tb.com", + "xn--myetherwallt-xub.com", + "xn--myetherwallt-ovb.com", + "xn--myetherwallt-fwb.com", + "xn--myetherwallt-5wb.com", + "xn--myetherwallt-jzi.com", + "xn--myetherwallt-2ck.com", + "xn--myetherwallt-lok.com", + "xn--myetherwallt-lsl.com", + "xn--myetherwallt-ce6f.com", + "xn--myetherwalet-mcc.com", + "xn--myetherwalet-xhf.com", + "xn--myetherwalet-lcc.com", + "xn--myetherwaet-15ba.com", + "xn--myetherwalet-whf.com", + "xn--myetherwaet-v2ea.com", + "xn--myetherwllet-59a.com", + "xn--myetherwllet-jbb.com", + "xn--myetherwllet-wbb.com", + "xn--myetherwllet-9bb.com", + "xn--myetherwllet-ncb.com", + "xn--myetherwllet-0cb.com", + "xn--myetherwllet-5nb.com", + "xn--myetherwllet-ktd.com", + "xn--myetherwllet-mre.com", + "xn--myetherwllet-76e.com", + "xn--myetherwllet-o0l.com", + "xn--myetherwllet-c45f.com", + "xn--myetherallet-ejn.com", + "xn--myethewallet-4nf.com", + "xn--myethewallet-iof.com", + "xn--myethewallet-mpf.com", + "xn--myethewallet-6bk.com", + "xn--myethewallet-i31f.com", + "xn--myethrwallet-feb.com", + "xn--myethrwallt-fbbf.com", + "xn--myethrwallet-seb.com", + "xn--myethrwallt-rbbf.com", + "xn--myethrwallet-5eb.com", + "xn--myethrwallt-3bbf.com", + "xn--myethrwallet-0tb.com", + "xn--myethrwallt-tpbf.com", + "xn--myethrwallet-rub.com", + "xn--myethrwallt-iqbf.com", + "xn--myethrwallet-ivb.com", + "xn--myethrwallt-6qbf.com", + "xn--myethrwallet-8vb.com", + "xn--myethrwallt-vrbf.com", + "xn--myethrwallet-zwb.com", + "xn--myethrwallt-ksbf.com", + "xn--myethrwallet-dzi.com", + "xn--myethrwallt-wbif.com", + "xn--myethrwallet-wck.com", + "xn--myethrwallt-skjf.com", + "xn--myethrwallet-fok.com", + "xn--myethrwallt-fvjf.com", + "xn--myethrwallet-fsl.com", + "xn--myethrwallt-fwkf.com", + "xn--myethrwallet-5d6f.com", + "xn--myethrwallt-319ef.com", + "xn--myeterwallet-ufk.com", + "xn--myeterwallet-nrl.com", + "xn--myeterwallet-von.com", + "xn--myeterwallet-jl6c.com", + "xn--myeherwallet-ooc.com", + "xn--myeherwalle-6hci.com", + "xn--myeherwallet-v4i.com", + "xn--myeherwalle-zgii.com", + "xn--myeherwallet-ohk.com", + "xn--myeherwalle-6oji.com", + "xn--mytherwallet-ceb.com", + "xn--mythrwallet-cbbc.com", + "xn--mythrwallt-c7acf.com", + "xn--mytherwallet-peb.com", + "xn--mythrwallet-obbc.com", + "xn--mythrwallt-n7acf.com", + "xn--mytherwallet-2eb.com", + "xn--mythrwallet-0bbc.com", + "xn--mythrwallt-y7acf.com", + "xn--mytherwallet-xtb.com", + "xn--mythrwallet-qpbc.com", + "xn--mythrwallt-jlbcf.com", + "xn--mytherwallet-oub.com", + "xn--mythrwallet-fqbc.com", + "xn--mythrwallt-5lbcf.com", + "xn--mythrwallet-3qbc.com", + "xn--mythrwallt-smbcf.com", + "xn--mytherwallet-5vb.com", + "xn--mythrwallet-srbc.com", + "xn--mythrwallt-fnbcf.com", + "xn--mytherwallet-wwb.com", + "xn--mythrwallet-hsbc.com", + "xn--mythrwallt-1nbcf.com", + "xn--mytherwallet-9yi.com", + "xn--mythrwallet-tbic.com", + "xn--mythrwallt-dnhcf.com", + "xn--mytherwallet-tck.com", + "xn--mythrwallet-pkjc.com", + "xn--mythrwallt-lsicf.com", + "xn--mytherwallet-cok.com", + "xn--mythrwallet-cvjc.com", + "xn--mythrwallt-c2icf.com", + "xn--mytherwallet-csl.com", + "xn--mythrwallet-cwkc.com", + "xn--mythrwallt-c0jcf.com", + "xn--mytherwallet-2d6f.com", + "xn--mythrwallet-019ec.com", + "xn--mythrwallt-yq3ecf.com", + "xn--metherwallet-qlb.com", + "xn--metherwallet-1uf.com", + "xn--metherwallet-iyi.com", + "xn--metherwallet-zhk.com", + "xn--metherwallet-3ml.com", + "xn--mytherwallet-fvb.com", + "xn--myetherwallt-7db.com", + "xn--myetherwallt-leb.com", + "xn--myetherwallt-yeb.com", + "xn--yetherwallet-vjf.com", + "xn--yetherwallet-dfk.com", + "xn--yetherwallet-1t1f.com", + "xn--yetherwallet-634f.com", + "xn--myeherwallet-fpc.com", + "xn--myethewallt-crb.com", + "xn--metherwallet-1vc.com", + "xn--myeherwallt-kbb8039g.com", + "xn--myeherwallet-vk5f.com", + "xn--yethewallet-iw8ejl.com", + "xn--bittrx-th8b.com", + "xn--polniex-n0a.com", + "thekey.vin", + "thekey-vip.com", + "digitexftures.com", + "ethzero-wallet.org", + "zeepln.io", + "wepowers.network", + "wepower.vision" + ] +} diff --git a/test/stub/first-time-state.js b/test/stub/first-time-state.js new file mode 100644 index 000000000..c9d5a4fe9 --- /dev/null +++ b/test/stub/first-time-state.js @@ -0,0 +1,14 @@ + +// test and development environment variables +const { createTestProviderTools } = require('../stub/provider') +const providerResultStub = {} +const provider = createTestProviderTools({ scaffold: providerResultStub }).provider +// +// The default state of MetaMask +// +module.exports = { + config: {}, + NetworkController: { + provider, + }, +} diff --git a/test/unit/blacklist-controller-test.js b/test/unit/blacklist-controller-test.js index a9260466f..cbf73d3e5 100644 --- a/test/unit/blacklist-controller-test.js +++ b/test/unit/blacklist-controller-test.js @@ -38,4 +38,4 @@ describe('blacklist controller', function () { assert.equal(result, false) }) }) -}) \ No newline at end of file +}) diff --git a/test/unit/metamask-controller-test.js b/test/unit/metamask-controller-test.js index 3fc7f9a98..ac984faf5 100644 --- a/test/unit/metamask-controller-test.js +++ b/test/unit/metamask-controller-test.js @@ -1,129 +1,103 @@ const assert = require('assert') const sinon = require('sinon') const clone = require('clone') +const nock = require('nock') const MetaMaskController = require('../../app/scripts/metamask-controller') -const firstTimeState = require('../../app/scripts/first-time-state') -const BN = require('ethereumjs-util').BN -const GWEI_BN = new BN('1000000000') +const blacklistJSON = require('../stub/blacklist') +const firstTimeState = require('../stub/first-time-state') describe('MetaMaskController', function () { - const noop = () => {} - const metamaskController = new MetaMaskController({ - showUnconfirmedMessage: noop, - unlockAccountMessage: noop, - showUnapprovedTx: noop, - platform: {}, - encryptor: { - encrypt: function(password, object) { - this.object = object - return Promise.resolve() - }, - decrypt: function () { - return Promise.resolve(this.object) - } - }, - // initial state - initState: clone(firstTimeState), - }) + let metamaskController + const sandbox = sinon.sandbox.create() + const noop = () => { } beforeEach(function () { - // sinon allows stubbing methods that are easily verified - this.sinon = sinon.sandbox.create() + + nock('https://api.infura.io') + .persist() + .get('/v2/blacklist') + .reply(200, blacklistJSON) + + nock('https://rinkeby.infura.io') + .persist() + .post('/metamask') + .reply(200) + + metamaskController = new MetaMaskController({ + showUnapprovedTx: noop, + encryptor: { + encrypt: function (password, object) { + this.object = object + return Promise.resolve() + }, + decrypt: function () { + return Promise.resolve(this.object) + }, + }, + initState: clone(firstTimeState), + }) + sandbox.spy(metamaskController.keyringController, 'createNewVaultAndKeychain') + sandbox.spy(metamaskController.keyringController, 'createNewVaultAndRestore') }) afterEach(function () { - // sinon requires cleanup otherwise it will overwrite context - this.sinon.restore() + nock.cleanAll() + sandbox.restore() }) - describe('Metamask Controller', function () { - assert(metamaskController) - - beforeEach(function () { - sinon.spy(metamaskController.keyringController, 'createNewVaultAndKeychain') - sinon.spy(metamaskController.keyringController, 'createNewVaultAndRestore') - }) - - afterEach(function () { - metamaskController.keyringController.createNewVaultAndKeychain.restore() - metamaskController.keyringController.createNewVaultAndRestore.restore() - }) - - describe('#getGasPrice', function () { - it('gives the 50th percentile lowest accepted gas price from recentBlocksController', async function () { - const realRecentBlocksController = metamaskController.recentBlocksController - metamaskController.recentBlocksController = { - store: { - getState: () => { - return { - recentBlocks: [ - { gasPrices: [ '0x3b9aca00', '0x174876e800'] }, - { gasPrices: [ '0x3b9aca00', '0x174876e800'] }, - { gasPrices: [ '0x174876e800', '0x174876e800' ]}, - { gasPrices: [ '0x174876e800', '0x174876e800' ]}, - ] - } - } - } - } - - const gasPrice = metamaskController.getGasPrice() - assert.equal(gasPrice, '0x3b9aca00', 'accurately estimates 50th percentile accepted gas price') - - metamaskController.recentBlocksController = realRecentBlocksController - }) - - it('gives the 1 gwei price if no blocks have been seen.', async function () { - const realRecentBlocksController = metamaskController.recentBlocksController - metamaskController.recentBlocksController = { - store: { - getState: () => { - return { - recentBlocks: [] - } + describe('#getGasPrice', function () { + it('gives the 50th percentile lowest accepted gas price from recentBlocksController', async function () { + const realRecentBlocksController = metamaskController.recentBlocksController + metamaskController.recentBlocksController = { + store: { + getState: () => { + return { + recentBlocks: [ + { gasPrices: [ '0x3b9aca00', '0x174876e800'] }, + { gasPrices: [ '0x3b9aca00', '0x174876e800'] }, + { gasPrices: [ '0x174876e800', '0x174876e800' ]}, + { gasPrices: [ '0x174876e800', '0x174876e800' ]}, + ], } - } - } - - const gasPrice = metamaskController.getGasPrice() - assert.equal(gasPrice, '0x' + GWEI_BN.toString(16), 'defaults to 1 gwei') + }, + }, + } - metamaskController.recentBlocksController = realRecentBlocksController - }) + const gasPrice = metamaskController.getGasPrice() + assert.equal(gasPrice, '0x3b9aca00', 'accurately estimates 50th percentile accepted gas price') + metamaskController.recentBlocksController = realRecentBlocksController }) + }) - describe('#createNewVaultAndKeychain', function () { - it('can only create new vault on keyringController once', async function () { - const selectStub = sinon.stub(metamaskController, 'selectFirstIdentity') - + describe('#createNewVaultAndKeychain', function () { + it('can only create new vault on keyringController once', async function () { + const selectStub = sandbox.stub(metamaskController, 'selectFirstIdentity') - const password = 'a-fake-password' + const password = 'a-fake-password' - const first = await metamaskController.createNewVaultAndKeychain(password) - const second = await metamaskController.createNewVaultAndKeychain(password) + await metamaskController.createNewVaultAndKeychain(password) + await metamaskController.createNewVaultAndKeychain(password) - assert(metamaskController.keyringController.createNewVaultAndKeychain.calledOnce) + assert(metamaskController.keyringController.createNewVaultAndKeychain.calledOnce) - selectStub.reset() - }) + selectStub.reset() }) + }) + + describe('#createNewVaultAndRestore', function () { + it('should be able to call newVaultAndRestore despite a mistake.', async function () { + + const password = 'what-what-what' + const wrongSeed = 'debris dizzy just program just float decrease vacant alarm reduce speak stadiu' + const rightSeed = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium' + await metamaskController.createNewVaultAndRestore(password, wrongSeed) + .catch((e) => { + return + }) + await metamaskController.createNewVaultAndRestore(password, rightSeed) - describe('#createNewVaultAndRestore', function () { - it('should be able to call newVaultAndRestore despite a mistake.', async function () { - // const selectStub = sinon.stub(metamaskController, 'selectFirstIdentity') - - const password = 'what-what-what' - const wrongSeed = 'debris dizzy just program just float decrease vacant alarm reduce speak stadiu' - const rightSeed = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium' - const first = await metamaskController.createNewVaultAndRestore(password, wrongSeed) - .catch((e) => { - return - }) - const second = await metamaskController.createNewVaultAndRestore(password, rightSeed) - - assert(metamaskController.keyringController.createNewVaultAndRestore.calledTwice) - }) + assert(metamaskController.keyringController.createNewVaultAndRestore.calledTwice) }) }) }) diff --git a/test/unit/network-contoller-test.js b/test/unit/network-contoller-test.js index 0b3b5adeb..fe3b9e66a 100644 --- a/test/unit/network-contoller-test.js +++ b/test/unit/network-contoller-test.js @@ -1,4 +1,5 @@ const assert = require('assert') +const nock = require('nock') const NetworkController = require('../../app/scripts/controllers/network') describe('# Network Controller', function () { @@ -8,6 +9,9 @@ describe('# Network Controller', function () { } beforeEach(function () { + nock('https://api.infura.io') + .get('/*/') + .reply(200, {}) networkController = new NetworkController({ provider: { type: 'rinkeby', -- cgit v1.2.3 From 8f7094a73d4ca5879e8290e3b1aefdc42397767d Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Thu, 15 Feb 2018 09:54:22 -0800 Subject: Network controller nock --- test/unit/network-contoller-test.js | 40 +++++++++++++++---------------------- 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/test/unit/network-contoller-test.js b/test/unit/network-contoller-test.js index fe3b9e66a..cd8c345c5 100644 --- a/test/unit/network-contoller-test.js +++ b/test/unit/network-contoller-test.js @@ -2,28 +2,37 @@ const assert = require('assert') const nock = require('nock') const NetworkController = require('../../app/scripts/controllers/network') +const { createTestProviderTools } = require('../stub/provider') +const providerResultStub = {} +const provider = createTestProviderTools({ scaffold: providerResultStub }).provider + describe('# Network Controller', function () { let networkController + const noop = () => {} const networkControllerProviderInit = { getAccounts: () => {}, } beforeEach(function () { + nock('https://api.infura.io') .get('/*/') - .reply(200, {}) + .reply(200) + + nock('https://rinkeby.infura.io') + .post('/metamask') + .reply(200) + networkController = new NetworkController({ - provider: { - type: 'rinkeby', - }, + provider, }) - networkController.initializeProvider(networkControllerProviderInit, dummyProviderConstructor) + networkController.initializeProvider(networkControllerProviderInit, provider) }) describe('network', function () { describe('#provider', function () { it('provider should be updatable without reassignment', function () { - networkController.initializeProvider(networkControllerProviderInit, dummyProviderConstructor) + networkController.initializeProvider(networkControllerProviderInit, provider) const proxy = networkController._proxy proxy.setTarget({ test: true, on: () => {} }) assert.ok(proxy.test) @@ -68,21 +77,4 @@ describe('# Network Controller', function () { }) }) }) -}) - -function dummyProviderConstructor() { - return { - // provider - sendAsync: noop, - // block tracker - _blockTracker: {}, - start: noop, - stop: noop, - on: noop, - addListener: noop, - once: noop, - removeAllListeners: noop, - } -} - -function noop() {} \ No newline at end of file +}) \ No newline at end of file -- cgit v1.2.3 From a5056a62d1a8538049c182b4b104bcfb2645ad28 Mon Sep 17 00:00:00 2001 From: kumavis Date: Thu, 15 Feb 2018 12:04:19 -0800 Subject: Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bfae566ea..595bc00e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Current Master - Fix bug where log subscriptions would break when switching network. +- Add MetaMask light client [testing container](https://github.com/MetaMask/mesh-testing) ## 3.14.1 2018-2-1 -- cgit v1.2.3 From ed33f3160a35e2e765012a4726ff90f9b3608998 Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Thu, 15 Feb 2018 12:36:26 -0800 Subject: Make oldui compatible with newUI style changes --- app/popup.html | 4 ++-- old-ui/app/components/account-dropdowns.js | 1 + old-ui/app/config.js | 2 +- old-ui/app/css/index.css | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/popup.html b/app/popup.html index c4e5188e5..bf09b97ca 100644 --- a/app/popup.html +++ b/app/popup.html @@ -1,11 +1,11 @@ - + MetaMask Plugin - +
diff --git a/old-ui/app/components/account-dropdowns.js b/old-ui/app/components/account-dropdowns.js index a3908f45d..7cc581f84 100644 --- a/old-ui/app/components/account-dropdowns.js +++ b/old-ui/app/components/account-dropdowns.js @@ -268,6 +268,7 @@ class AccountDropdowns extends Component { 'i.fa.fa-ellipsis-h', { style: { + margin: '0.5em', fontSize: '1.8em', }, onClick: (event) => { diff --git a/old-ui/app/config.js b/old-ui/app/config.js index 689385a02..9e07cf348 100644 --- a/old-ui/app/config.js +++ b/old-ui/app/config.js @@ -32,7 +32,7 @@ ConfigScreen.prototype.render = function () { return ( h('.flex-column.flex-grow', { style:{ - maxHeight: '465px', + maxHeight: '585px', overflowY: 'auto', }, }, [ diff --git a/old-ui/app/css/index.css b/old-ui/app/css/index.css index cdb4cc439..67c327f62 100644 --- a/old-ui/app/css/index.css +++ b/old-ui/app/css/index.css @@ -285,7 +285,7 @@ app sections } .unlock-screen #metamask-mascot-container { - margin-top: 24px; + margin-top: 80px; } .unlock-screen h1 { @@ -443,7 +443,7 @@ input.large-input { flex-wrap: wrap; overflow-x: hidden; overflow-y: auto; - max-height: 465px; + max-height: 585px; flex-direction: inherit; } -- cgit v1.2.3 From 71be537f1cdfe7df41e350f6720c12f5a7bb9b2d Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Thu, 15 Feb 2018 14:23:22 -0800 Subject: Version 3.14.2 --- CHANGELOG.md | 3 +++ app/manifest.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 595bc00e6..fae2e0800 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,10 @@ ## Current Master +## 3.14.2 2018-2-15 + - Fix bug where log subscriptions would break when switching network. +- Fix bug where storage values were cached across blocks. - Add MetaMask light client [testing container](https://github.com/MetaMask/mesh-testing) ## 3.14.1 2018-2-1 diff --git a/app/manifest.json b/app/manifest.json index a0bb5acf6..3a80cc4fc 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "MetaMask", "short_name": "Metamask", - "version": "3.14.1", + "version": "3.14.2", "manifest_version": 2, "author": "https://metamask.io", "description": "Ethereum Browser Extension", -- cgit v1.2.3 From 70132e6df6de0722113f5b461b4cec2419c45266 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Thu, 15 Feb 2018 15:15:07 -0800 Subject: Default validated block gas limit to 8MM when none identified Mitigates #3266 --- ui/app/components/pending-tx.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js index 32d54902e..eb6ece176 100644 --- a/ui/app/components/pending-tx.js +++ b/ui/app/components/pending-tx.js @@ -60,7 +60,7 @@ PendingTx.prototype.render = function () { // Gas const gas = txParams.gas const gasBn = hexToBn(gas) - const gasLimit = new BN(parseInt(blockGasLimit)) + const gasLimit = new BN(parseInt(blockGasLimit) || '8000000') // default to 8MM gas limit const safeGasLimitBN = this.bnMultiplyByFraction(gasLimit, 19, 20) const saferGasLimitBN = this.bnMultiplyByFraction(gasLimit, 18, 20) const safeGasLimit = safeGasLimitBN.toString(10) -- cgit v1.2.3 From 73e5ae6e29d04481cc3ffdd32d5d096e6a10b3b3 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Thu, 15 Feb 2018 15:32:48 -0800 Subject: Fix incorrect promise instantiation --- app/scripts/lib/nonce-tracker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/lib/nonce-tracker.js b/app/scripts/lib/nonce-tracker.js index 0029ac953..ed9dd3f11 100644 --- a/app/scripts/lib/nonce-tracker.js +++ b/app/scripts/lib/nonce-tracker.js @@ -56,7 +56,7 @@ class NonceTracker { const blockTracker = this._getBlockTracker() const currentBlock = blockTracker.getCurrentBlock() if (currentBlock) return currentBlock - return await Promise((reject, resolve) => { + return await new Promise((reject, resolve) => { blockTracker.once('latest', resolve) }) } -- cgit v1.2.3 From 170c7602b70e475e75fbd1c7181d03e22465ae24 Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Fri, 16 Feb 2018 06:15:09 -0330 Subject: [NewUI] Adds the mascara first time flow to betaUI extension (#3257) * Adds the mascara first time flow to the extension when opened in browser. * Fix tests after addition of mascara first time flow to new ui. --- development/states/first-time.json | 2 +- test/integration/lib/first-time.js | 3 +-- ui/app/app.js | 10 ++++++---- ui/app/reducers/metamask.js | 2 ++ 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/development/states/first-time.json b/development/states/first-time.json index 6e7435db1..4f5352992 100644 --- a/development/states/first-time.json +++ b/development/states/first-time.json @@ -8,7 +8,7 @@ "frequentRpcList": [], "unapprovedTxs": {}, "currentCurrency": "USD", - "featureFlags": {"betaUI": true}, + "featureFlags": {"betaUI": false}, "conversionRate": 12.7527416, "conversionDate": 1487624341, "noActiveNotices": false, diff --git a/test/integration/lib/first-time.js b/test/integration/lib/first-time.js index 6e879dcd0..764eae47c 100644 --- a/test/integration/lib/first-time.js +++ b/test/integration/lib/first-time.js @@ -22,7 +22,6 @@ async function runFirstTimeUsageTest(assert, done) { reactTriggerChange(selectState[0]) await timeout(2000) - const app = $('#app-content') // recurse notices @@ -46,7 +45,7 @@ async function runFirstTimeUsageTest(assert, done) { await timeout() // Scroll through terms - const title = app.find('h1')[1] + const title = app.find('h1')[0] assert.equal(title.textContent, 'MetaMask', 'title screen') // enter password diff --git a/ui/app/app.js b/ui/app/app.js index cdb0c8c61..5ffd263d1 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -9,7 +9,7 @@ const classnames = require('classnames') const MascaraFirstTime = require('../../mascara/src/app/first-time').default const MascaraBuyEtherScreen = require('../../mascara/src/app/first-time/buy-ether-screen').default // init -const InitializeMenuScreen = require('./first-time/init-menu') +const InitializeMenuScreen = MascaraFirstTime const NewKeyChainScreen = require('./new-keychain') // accounts const MainContainer = require('./main-container') @@ -74,6 +74,7 @@ function mapStateToProps (state) { transForward: state.appState.transForward, isMascara: state.metamask.isMascara, isOnboarding: Boolean(!noActiveNotices || seedWords || !isInitialized), + isPopup: state.metamask.isPopup, seedWords: state.metamask.seedWords, unapprovedTxs: state.metamask.unapprovedTxs, unapprovedMsgs: state.metamask.unapprovedMsgs, @@ -85,7 +86,8 @@ function mapStateToProps (state) { lostAccounts: state.metamask.lostAccounts, frequentRpcList: state.metamask.frequentRpcList || [], currentCurrency: state.metamask.currentCurrency, - isMouseUser: state.appState.isMouseUser, + isMouseUser: state.appState.isMouseUser, + betaUI: state.metamask.featureFlags.betaUI, // state needed to get account dropdown temporarily rendering from app bar identities, @@ -351,9 +353,9 @@ App.prototype.renderBackButton = function (style, justArrow = false) { App.prototype.renderPrimary = function () { log.debug('rendering primary') var props = this.props - const {isMascara, isOnboarding} = props + const {isMascara, isOnboarding, betaUI} = props - if (isMascara && isOnboarding) { + if ((isMascara || betaUI) && isOnboarding && !props.isPopup) { return h(MascaraFirstTime) } diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js index 294c29948..beeba948d 100644 --- a/ui/app/reducers/metamask.js +++ b/ui/app/reducers/metamask.js @@ -1,6 +1,7 @@ const extend = require('xtend') const actions = require('../actions') const MetamascaraPlatform = require('../../../app/scripts/platforms/window') +const environmentType = require('../../../app/scripts/lib/environment-type') const { OLD_UI_NETWORK_TYPE } = require('../../../app/scripts/config').enums module.exports = reduceMetamask @@ -14,6 +15,7 @@ function reduceMetamask (state, action) { isUnlocked: false, isAccountMenuOpen: false, isMascara: window.platform instanceof MetamascaraPlatform, + isPopup: environmentType() === 'popup', rpcTarget: 'https://rawtestrpc.metamask.io/', identities: {}, unapprovedTxs: {}, -- cgit v1.2.3 From 8e80081966e6411fae41f398e063ac0a62fe415c Mon Sep 17 00:00:00 2001 From: kumavis Date: Fri, 16 Feb 2018 07:50:51 -0800 Subject: lint - lift comment to new line --- ui/app/components/pending-tx.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js index eb6ece176..98193ea6f 100644 --- a/ui/app/components/pending-tx.js +++ b/ui/app/components/pending-tx.js @@ -60,7 +60,8 @@ PendingTx.prototype.render = function () { // Gas const gas = txParams.gas const gasBn = hexToBn(gas) - const gasLimit = new BN(parseInt(blockGasLimit) || '8000000') // default to 8MM gas limit + // default to 8MM gas limit + const gasLimit = new BN(parseInt(blockGasLimit) || '8000000') const safeGasLimitBN = this.bnMultiplyByFraction(gasLimit, 19, 20) const saferGasLimitBN = this.bnMultiplyByFraction(gasLimit, 18, 20) const safeGasLimit = safeGasLimitBN.toString(10) -- cgit v1.2.3 From 06838774fa0bfb0ddea4db049211f92781841ff5 Mon Sep 17 00:00:00 2001 From: kumavis Date: Fri, 16 Feb 2018 10:21:06 -0800 Subject: sentry - report failed tx with more specific message --- app/scripts/background.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/scripts/background.js b/app/scripts/background.js index 6bf7707e8..3e1178457 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -85,7 +85,8 @@ function setupController (initState) { controller.txController.on(`tx:status-update`, (txId, status) => { if (status !== 'failed') return const txMeta = controller.txController.txStateManager.getTx(txId) - raven.captureMessage('Transaction Failed', { + const errorMessage = `Transaction Failed: ${txMeta.err.message}` + raven.captureMessage(errorMessage, { // "extra" key is required by Sentry extra: txMeta, }) -- cgit v1.2.3 From 81eb5c8796b3a044c1b1e66f509bb14870f7ba92 Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Fri, 16 Feb 2018 19:21:16 -0330 Subject: Ensures that mascara initialize screen is not shown in popup. (#3279) --- ui/app/app.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ui/app/app.js b/ui/app/app.js index 5ffd263d1..1a64bb1a4 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -9,6 +9,7 @@ const classnames = require('classnames') const MascaraFirstTime = require('../../mascara/src/app/first-time').default const MascaraBuyEtherScreen = require('../../mascara/src/app/first-time/buy-ether-screen').default // init +const OldUIInitializeMenuScreen = require('./first-time/init-menu') const InitializeMenuScreen = MascaraFirstTime const NewKeyChainScreen = require('./new-keychain') // accounts @@ -381,7 +382,9 @@ App.prototype.renderPrimary = function () { return h(HDRestoreVaultScreen, {key: 'HDRestoreVaultScreen'}) } else if (!props.isInitialized) { log.debug('rendering menu screen') - return h(InitializeMenuScreen, {key: 'menuScreenInit'}) + return props.isPopup + ? h(OldUIInitializeMenuScreen, {key: 'menuScreenInit'}) + : h(InitializeMenuScreen, {key: 'menuScreenInit'}) } // show unlock screen -- cgit v1.2.3 From 7169cb1eb83ae9a378dad3240527989e6df0f158 Mon Sep 17 00:00:00 2001 From: Dan Date: Fri, 16 Feb 2018 19:36:17 -0330 Subject: Bump uat version to 4.0.12 --- app/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/manifest.json b/app/manifest.json index a0bb5acf6..c4e134053 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "MetaMask", "short_name": "Metamask", - "version": "3.14.1", + "version": "4.0.12", "manifest_version": 2, "author": "https://metamask.io", "description": "Ethereum Browser Extension", -- cgit v1.2.3 From c26e0d555b7cb89e88713041714206abd8f4275e Mon Sep 17 00:00:00 2001 From: Dan Date: Mon, 19 Feb 2018 22:46:18 -0330 Subject: Fix Import Existing DEN in popup New UI first time flow. --- .../app/first-time/import-seed-phrase-screen.js | 14 ++++++- mascara/src/app/first-time/index.js | 49 +++++++++++++++++++--- ui/app/app.js | 2 +- ui/app/first-time/init-menu.js | 24 ++++++++++- 4 files changed, 80 insertions(+), 9 deletions(-) diff --git a/mascara/src/app/first-time/import-seed-phrase-screen.js b/mascara/src/app/first-time/import-seed-phrase-screen.js index 181151ca9..a03a16329 100644 --- a/mascara/src/app/first-time/import-seed-phrase-screen.js +++ b/mascara/src/app/first-time/import-seed-phrase-screen.js @@ -2,7 +2,13 @@ import React, { Component } from 'react' import PropTypes from 'prop-types' import {connect} from 'react-redux' import LoadingScreen from './loading-screen' -import {createNewVaultAndRestore, hideWarning, displayWarning} from '../../../../ui/app/actions' +import { + createNewVaultAndRestore, + hideWarning, + displayWarning, + unMarkPasswordForgotten, + clearNotices, +} from '../../../../ui/app/actions' class ImportSeedPhraseScreen extends Component { static propTypes = { @@ -23,7 +29,7 @@ class ImportSeedPhraseScreen extends Component { onClick = () => { const { password, seedPhrase, confirmPassword } = this.state - const { createNewVaultAndRestore, next, displayWarning } = this.props + const { createNewVaultAndRestore, next, displayWarning, leaveImportSeedSreenState } = this.props if (seedPhrase.split(' ').length !== 12) { this.warning = 'Seed Phrases are 12 words long' @@ -43,6 +49,7 @@ class ImportSeedPhraseScreen extends Component { return } this.warning = null + leaveImportSeedSreenState() createNewVaultAndRestore(password, seedPhrase) .then(next) } @@ -113,6 +120,9 @@ class ImportSeedPhraseScreen extends Component { export default connect( ({ appState: { isLoading, warning } }) => ({ isLoading, warning }), dispatch => ({ + leaveImportSeedSreenState: () => { + dispatch(unMarkPasswordForgotten()) + }, createNewVaultAndRestore: (pw, seed) => dispatch(createNewVaultAndRestore(pw, seed)), displayWarning: (warning) => dispatch(displayWarning(warning)), hideWarning: () => dispatch(hideWarning()), diff --git a/mascara/src/app/first-time/index.js b/mascara/src/app/first-time/index.js index b06f2ba9d..883342d16 100644 --- a/mascara/src/app/first-time/index.js +++ b/mascara/src/app/first-time/index.js @@ -7,7 +7,11 @@ import NoticeScreen from './notice-screen' import BackupPhraseScreen from './backup-phrase-screen' import ImportAccountScreen from './import-account-screen' import ImportSeedPhraseScreen from './import-seed-phrase-screen' -import {onboardingBuyEthView} from '../../../../ui/app/actions' +const Loading = require('../../../../ui/app//components/loading') +import { + onboardingBuyEthView, + unMarkPasswordForgotten, +} from '../../../../ui/app/actions' class FirstTimeFlow extends Component { @@ -33,6 +37,7 @@ class FirstTimeFlow extends Component { NOTICE: 'notice', BACK_UP_PHRASE: 'back_up_phrase', CONFIRM_BACK_UP_PHRASE: 'confirm_back_up_phrase', + LOADING: 'loading', }; constructor (props) { @@ -51,11 +56,15 @@ class FirstTimeFlow extends Component { isInitialized, seedWords, noActiveNotices, + forgottenPassword, } = this.props const {SCREEN_TYPE} = FirstTimeFlow // return SCREEN_TYPE.NOTICE + if (forgottenPassword) { + return SCREEN_TYPE.IMPORT_SEED_PHRASE + } if (!isInitialized) { return SCREEN_TYPE.CREATE_PASSWORD } @@ -71,7 +80,17 @@ class FirstTimeFlow extends Component { renderScreen () { const {SCREEN_TYPE} = FirstTimeFlow - const {goToBuyEtherView, address} = this.props + const { + goToBuyEtherView, + address, + restoreCreatePasswordScreen, + forgottenPassword, + isLoading, + } = this.props + + if (isLoading) { + return h(Loading) + } switch (this.state.screenType) { case SCREEN_TYPE.CREATE_PASSWORD: @@ -92,8 +111,14 @@ class FirstTimeFlow extends Component { case SCREEN_TYPE.IMPORT_SEED_PHRASE: return ( this.setScreenType(SCREEN_TYPE.CREATE_PASSWORD)} - next={() => this.setScreenType(SCREEN_TYPE.NOTICE)} + back={() => { + leaveImportSeedSreenState() + this.setScreenType(SCREEN_TYPE.CREATE_PASSWORD) + }} + next={() => { + const newScreenType = forgottenPassword ? null : SCREEN_TYPE.NOTICE + this.setScreenType(newScreenType) + }} /> ) case SCREEN_TYPE.UNIQUE_IMAGE: @@ -130,13 +155,27 @@ class FirstTimeFlow extends Component { } export default connect( - ({ metamask: { isInitialized, seedWords, noActiveNotices, selectedAddress } }) => ({ + ({ + metamask: { + isInitialized, + seedWords, + noActiveNotices, + selectedAddress, + forgottenPassword, + }, + appState: { + isLoading, + } + }) => ({ isInitialized, seedWords, noActiveNotices, address: selectedAddress, + forgottenPassword, + isLoading, }), dispatch => ({ + leaveImportSeedSreenState: () => dispatch(unMarkPasswordForgotten()), goToBuyEtherView: address => dispatch(onboardingBuyEthView(address)), }) )(FirstTimeFlow) diff --git a/ui/app/app.js b/ui/app/app.js index 1a64bb1a4..58e38a077 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -380,7 +380,7 @@ App.prototype.renderPrimary = function () { if (props.isInitialized && props.forgottenPassword) { log.debug('rendering restore vault screen') return h(HDRestoreVaultScreen, {key: 'HDRestoreVaultScreen'}) - } else if (!props.isInitialized) { + } else if (!props.isInitialized && !props.isUnlocked) { log.debug('rendering menu screen') return props.isPopup ? h(OldUIInitializeMenuScreen, {key: 'menuScreenInit'}) diff --git a/ui/app/first-time/init-menu.js b/ui/app/first-time/init-menu.js index b4587f1ee..0e08da8db 100644 --- a/ui/app/first-time/init-menu.js +++ b/ui/app/first-time/init-menu.js @@ -7,6 +7,8 @@ const Mascot = require('../components/mascot') const actions = require('../actions') const Tooltip = require('../components/tooltip') const getCaretCoordinates = require('textarea-caret') +const environmentType = require('../../../app/scripts/lib/environment-type') +const { OLD_UI_NETWORK_TYPE } = require('../../../app/scripts/config').enums let isSubmitting = false @@ -130,6 +132,18 @@ InitializeMenuScreen.prototype.renderMenu = function (state) { }, 'Import Existing DEN'), ]), + h('.flex-row.flex-center.flex-grow', [ + h('p.pointer', { + onClick: this.showOldUI.bind(this), + style: { + fontSize: '0.8em', + color: '#aeaeae', + textDecoration: 'underline', + marginTop: '32px', + }, + }, 'Use classic interface'), + ]), + ]) ) } @@ -146,7 +160,15 @@ InitializeMenuScreen.prototype.componentDidMount = function () { } InitializeMenuScreen.prototype.showRestoreVault = function () { - this.props.dispatch(actions.showRestoreVault()) + this.props.dispatch(actions.markPasswordForgotten()) + if (environmentType() === 'popup') { + global.platform.openExtensionInBrowser() + } +} + +InitializeMenuScreen.prototype.showOldUI = function () { + this.props.dispatch(actions.setFeatureFlag('betaUI', false, 'OLD_UI_NOTIFICATION_MODAL')) + .then(() => this.props.dispatch(actions.setNetworkEndpoints(OLD_UI_NETWORK_TYPE))) } InitializeMenuScreen.prototype.createNewVaultAndKeychain = function () { -- cgit v1.2.3 From 00c5dd2736cd389c6658778bb5238eefb2d2f926 Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 20 Feb 2018 14:00:35 -0330 Subject: Fix variable spelling error. --- mascara/src/app/first-time/import-seed-phrase-screen.js | 6 +++--- mascara/src/app/first-time/index.js | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/mascara/src/app/first-time/import-seed-phrase-screen.js b/mascara/src/app/first-time/import-seed-phrase-screen.js index a03a16329..93c3f9203 100644 --- a/mascara/src/app/first-time/import-seed-phrase-screen.js +++ b/mascara/src/app/first-time/import-seed-phrase-screen.js @@ -29,7 +29,7 @@ class ImportSeedPhraseScreen extends Component { onClick = () => { const { password, seedPhrase, confirmPassword } = this.state - const { createNewVaultAndRestore, next, displayWarning, leaveImportSeedSreenState } = this.props + const { createNewVaultAndRestore, next, displayWarning, leaveImportSeedScreenState } = this.props if (seedPhrase.split(' ').length !== 12) { this.warning = 'Seed Phrases are 12 words long' @@ -49,7 +49,7 @@ class ImportSeedPhraseScreen extends Component { return } this.warning = null - leaveImportSeedSreenState() + leaveImportSeedScreenState() createNewVaultAndRestore(password, seedPhrase) .then(next) } @@ -120,7 +120,7 @@ class ImportSeedPhraseScreen extends Component { export default connect( ({ appState: { isLoading, warning } }) => ({ isLoading, warning }), dispatch => ({ - leaveImportSeedSreenState: () => { + leaveImportSeedScreenState: () => { dispatch(unMarkPasswordForgotten()) }, createNewVaultAndRestore: (pw, seed) => dispatch(createNewVaultAndRestore(pw, seed)), diff --git a/mascara/src/app/first-time/index.js b/mascara/src/app/first-time/index.js index 883342d16..a05e0aa96 100644 --- a/mascara/src/app/first-time/index.js +++ b/mascara/src/app/first-time/index.js @@ -7,7 +7,7 @@ import NoticeScreen from './notice-screen' import BackupPhraseScreen from './backup-phrase-screen' import ImportAccountScreen from './import-account-screen' import ImportSeedPhraseScreen from './import-seed-phrase-screen' -const Loading = require('../../../../ui/app//components/loading') +const Loading = require('../../../../ui/app/components/loading') import { onboardingBuyEthView, unMarkPasswordForgotten, @@ -86,10 +86,11 @@ class FirstTimeFlow extends Component { restoreCreatePasswordScreen, forgottenPassword, isLoading, + leaveImportSeedScreenState, } = this.props if (isLoading) { - return h(Loading) + return () } switch (this.state.screenType) { @@ -112,7 +113,7 @@ class FirstTimeFlow extends Component { return ( { - leaveImportSeedSreenState() + leaveImportSeedScreenState() this.setScreenType(SCREEN_TYPE.CREATE_PASSWORD) }} next={() => { @@ -175,7 +176,7 @@ export default connect( isLoading, }), dispatch => ({ - leaveImportSeedSreenState: () => dispatch(unMarkPasswordForgotten()), + leaveImportSeedScreenState: () => dispatch(unMarkPasswordForgotten()), goToBuyEtherView: address => dispatch(onboardingBuyEthView(address)), }) )(FirstTimeFlow) -- cgit v1.2.3 From cca931c783dcff4f368611c4dc48a938d2856cc5 Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 20 Feb 2018 16:17:30 -0330 Subject: Temporarily disable loading indicator. --- mascara/src/app/first-time/index.js | 7 +- output | 1889 +++++++++++++++++++++++++++++++++++ 2 files changed, 1893 insertions(+), 3 deletions(-) create mode 100644 output diff --git a/mascara/src/app/first-time/index.js b/mascara/src/app/first-time/index.js index a05e0aa96..46b821c8b 100644 --- a/mascara/src/app/first-time/index.js +++ b/mascara/src/app/first-time/index.js @@ -89,9 +89,10 @@ class FirstTimeFlow extends Component { leaveImportSeedScreenState, } = this.props - if (isLoading) { - return () - } + // Disable until testing bug resolved + // if (isLoading) { + // return () + // } switch (this.state.screenType) { case SCREEN_TYPE.CREATE_PASSWORD: diff --git a/output b/output new file mode 100644 index 000000000..dfb259888 --- /dev/null +++ b/output @@ -0,0 +1,1889 @@ + +> metamask-crx@0.0.0 test:mascara /Users/danmiller/kyokan/metamask/metamask-extension +> npm run test:mascara:build && karma start test/mascara.conf.js + + +> metamask-crx@0.0.0 test:mascara:build /Users/danmiller/kyokan/metamask/metamask-extension +> mkdir -p dist/mascara && npm run test:mascara:build:ui && npm run test:mascara:build:background && npm run test:mascara:build:tests + + +> metamask-crx@0.0.0 test:mascara:build:ui /Users/danmiller/kyokan/metamask/metamask-extension +> browserify mascara/test/test-ui.js -o dist/mascara/ui.js + + +> metamask-crx@0.0.0 test:mascara:build:background /Users/danmiller/kyokan/metamask/metamask-extension +> browserify mascara/src/background.js -o dist/mascara/background.js + + +> metamask-crx@0.0.0 test:mascara:build:tests /Users/danmiller/kyokan/metamask/metamask-extension +> browserify test/integration/lib/first-time.js -o dist/mascara/tests.js + +20 02 2018 15:29:25.773:INFO [karma]: Karma v1.7.1 server started at http://0.0.0.0:9876/ +20 02 2018 15:29:25.776:INFO [launcher]: Launching browser Chrome with concurrency 1 +20 02 2018 15:29:25.822:INFO [launcher]: Starting browser Chrome +20 02 2018 15:29:31.117:INFO [Chrome 64.0.3282 (Mac OS X 10.12.6)]: Connected on socket xl57FfHdT0vJ5kbQAAAA with id 3100832 +Chrome 64.0.3282 (Mac OS X 10.12.6) WARN: 'Warning: Accessing PropTypes via the main React package is deprecated, and will be removed in React v16.0. Use the latest available v15.* prop-types package from npm instead. For info on usage, compatibility, migration and more, see https://fb.me/prop-types-docs' + +Chrome 64.0.3282 (Mac OS X 10.12.6) WARN: 'Warning: Accessing createClass via the main React package is deprecated, and will be removed in React v16.0. Use a plain JavaScript class instead. If you're not yet ready to migrate, create-react-class v15.* is available on npm as a temporary, drop-in replacement. For more info see https://fb.me/react-create-class' + + +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got @@redux/INIT' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'background.setNetworkEndpoints' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'Main ui render function' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'rendering primary' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: false, seedWords: '', noActiveNotices: false, address: undefined, forgottenPassword: undefined, isLoading: false, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.state*************************', Object{screenType: 'create_password'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************isLoading*************************', false +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '**************************************************************************' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'hello from MetaMascara ui!' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'hello from cb ready event!' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got UPDATE_NETWORK_ENDPOINT_TYPE' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: false}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_NETWORK_ENDPOINT_TYPE', value: 'network'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: false}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'No more notices...' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got UPDATE_METAMASK_STATE' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'Main ui render function' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'rendering primary' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: false}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_METAMASK_STATE', value: Object{isInitialized: false, provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', unapprovedTxs: Object{}, selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, isUnlocked: false, keyringTypes: [..., ...], keyrings: [], identities: Object{}, computedBalances: Object{}, frequentRpcList: [], currentAccountTab: 'history', tokens: [], useBlockie: false, featureFlags: Object{}, addressBook: [], currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, noActiveNotices: false, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: false}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got UPDATE_METAMASK_STATE' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'Main ui render function' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'rendering primary' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: false}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_METAMASK_STATE', value: Object{isInitialized: false, provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', unapprovedTxs: Object{}, selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, isUnlocked: false, keyringTypes: [..., ...], keyrings: [], identities: Object{}, computedBalances: Object{}, frequentRpcList: [], currentAccountTab: 'history', tokens: [], useBlockie: false, featureFlags: Object{}, addressBook: [], currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, noActiveNotices: false, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: false}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got UPDATE_METAMASK_STATE' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'Main ui render function' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'rendering primary' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: false}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_METAMASK_STATE', value: Object{isInitialized: false, provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', unapprovedTxs: Object{}, selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, isUnlocked: false, keyringTypes: [..., ...], keyrings: [], identities: Object{}, computedBalances: Object{}, frequentRpcList: [], currentAccountTab: 'history', tokens: [], useBlockie: false, featureFlags: Object{}, addressBook: [], currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, noActiveNotices: false, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: false}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got UPDATE_METAMASK_STATE' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'Main ui render function' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'rendering primary' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: false}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_METAMASK_STATE', value: Object{isInitialized: false, provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', unapprovedTxs: Object{}, selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, isUnlocked: false, keyringTypes: [..., ...], keyrings: [], identities: Object{}, computedBalances: Object{}, frequentRpcList: [], currentAccountTab: 'history', tokens: [], useBlockie: false, featureFlags: Object{}, addressBook: [], currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, noActiveNotices: false, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: false}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got UPDATE_METAMASK_STATE' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'Main ui render function' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'rendering primary' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: false}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_METAMASK_STATE', value: Object{isInitialized: false, provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', unapprovedTxs: Object{}, selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, isUnlocked: false, keyringTypes: [..., ...], keyrings: [], identities: Object{}, computedBalances: Object{}, frequentRpcList: [], currentAccountTab: 'history', tokens: [], useBlockie: false, featureFlags: Object{}, addressBook: [], currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, noActiveNotices: false, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: false}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got SHOW_LOADING_INDICATION' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: false}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'SHOW_LOADING_INDICATION', value: undefined} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: false, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'background.createNewVaultAndKeychain' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got SET_MOUSE_USER_STATE' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: false, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'SET_MOUSE_USER_STATE', value: true} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'Main ui render function' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'rendering primary' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: false, seedWords: '', noActiveNotices: false, address: undefined, forgottenPassword: undefined, isLoading: true, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.state*************************', Object{screenType: 'create_password'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************isLoading*************************', true +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'background.placeSeedWords' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got HIDE_LOADING_INDICATION' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'Main ui render function' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'rendering primary' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: false, seedWords: '', noActiveNotices: false, address: undefined, forgottenPassword: undefined, isLoading: false, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.state*************************', Object{screenType: 'create_password'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************isLoading*************************', false +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '**************************************************************************' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'HIDE_LOADING_INDICATION'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'background.getState' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: false, seedWords: '', noActiveNotices: false, address: undefined, forgottenPassword: undefined, isLoading: false, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.state*************************', Object{screenType: 'unique_image'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************isLoading*************************', false +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '**************************************************************************' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got UPDATE_METAMASK_STATE' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got SHOW_LOADING_INDICATION' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_METAMASK_STATE', value: Object{isInitialized: true, provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', unapprovedTxs: Object{}, selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, isUnlocked: true, keyringTypes: [..., ...], keyrings: [...], identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, computedBalances: Object{}, frequentRpcList: [], currentAccountTab: 'history', tokens: [], useBlockie: false, featureFlags: Object{}, selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', addressBook: [], currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, noActiveNotices: false, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'SHOW_LOADING_INDICATION', value: undefined} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'Main ui render function' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'rendering primary' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: true, seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert', noActiveNotices: false, address: '0x77abfc38dea988c2f9602daa758867918b877f3a', forgottenPassword: undefined, isLoading: true, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.state*************************', Object{screenType: 'unique_image'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************isLoading*************************', true +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got HIDE_LOADING_INDICATION' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'Main ui render function' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'rendering primary' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: true, seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert', noActiveNotices: false, address: '0x77abfc38dea988c2f9602daa758867918b877f3a', forgottenPassword: undefined, isLoading: false, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.state*************************', Object{screenType: 'unique_image'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************isLoading*************************', false +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '**************************************************************************' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'HIDE_LOADING_INDICATION'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got UPDATE_FEATURE_FLAGS' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got SHOW_LOADING_INDICATION' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_FEATURE_FLAGS', value: Object{betaUI: true}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'SHOW_LOADING_INDICATION', value: undefined} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'Main ui render function' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'rendering primary' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: true, seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert', noActiveNotices: false, address: '0x77abfc38dea988c2f9602daa758867918b877f3a', forgottenPassword: undefined, isLoading: true, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.state*************************', Object{screenType: 'unique_image'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************isLoading*************************', true +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'background.setNetworkEndpoints' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got HIDE_LOADING_INDICATION' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'Main ui render function' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'rendering primary' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: true, seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert', noActiveNotices: false, address: '0x77abfc38dea988c2f9602daa758867918b877f3a', forgottenPassword: undefined, isLoading: false, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.state*************************', Object{screenType: 'unique_image'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************isLoading*************************', false +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '**************************************************************************' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'HIDE_LOADING_INDICATION'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got UPDATE_FEATURE_FLAGS' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_FEATURE_FLAGS', value: Object{betaUI: true}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'background.setNetworkEndpoints' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got UPDATE_NETWORK_ENDPOINT_TYPE' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_NETWORK_ENDPOINT_TYPE', value: 'networkBeta'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got UPDATE_NETWORK_ENDPOINT_TYPE' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_NETWORK_ENDPOINT_TYPE', value: 'networkBeta'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got SET_MOUSE_USER_STATE' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'SET_MOUSE_USER_STATE', value: true} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: true, seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert', noActiveNotices: false, address: '0x77abfc38dea988c2f9602daa758867918b877f3a', forgottenPassword: undefined, isLoading: false, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.state*************************', Object{screenType: 'notice'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************isLoading*************************', false +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '**************************************************************************' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'document.body', + + + + + + + + + + + + +
Created with Raphaël 2.2.0
Privacy Notice

MetaMask is beta software.

When you log in to MetaMask, your current account is visible to every new site you visit.

For your privacy, for now, please sign out of MetaMask when you're done using a site.

+Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got UPDATE_METAMASK_STATE' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'Main ui render function' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'rendering primary' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_METAMASK_STATE', value: Object{isInitialized: true, provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', unapprovedTxs: Object{}, selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, isUnlocked: true, keyringTypes: [..., ...], keyrings: [...], identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, computedBalances: Object{}, frequentRpcList: [], currentAccountTab: 'history', tokens: [], useBlockie: false, featureFlags: Object{betaUI: ...}, selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', addressBook: [], currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, noActiveNotices: false, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got SHOW_LOADING_INDICATION' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'SHOW_LOADING_INDICATION', value: undefined} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'background.markNoticeRead' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got SET_MOUSE_USER_STATE' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'SET_MOUSE_USER_STATE', value: true} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'Main ui render function' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'rendering primary' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: true, seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert', noActiveNotices: false, address: '0x77abfc38dea988c2f9602daa758867918b877f3a', forgottenPassword: undefined, isLoading: true, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.state*************************', Object{screenType: 'notice'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************isLoading*************************', true +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got HIDE_LOADING_INDICATION' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'Main ui render function' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'rendering primary' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: true, seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert', noActiveNotices: false, address: '0x77abfc38dea988c2f9602daa758867918b877f3a', forgottenPassword: undefined, isLoading: false, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.state*************************', Object{screenType: 'notice'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************isLoading*************************', false +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '**************************************************************************' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'HIDE_LOADING_INDICATION'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got SHOW_NOTICE' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'Main ui render function' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'rendering primary' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'SHOW_NOTICE', value: Object{read: false, date: 'Thu Feb 09 2017', title: 'Terms of Use', body: '# Terms of Use # + +**THIS AGREEMENT IS SUBJECT TO BINDING ARBITRATION AND A WAIVER OF CLASS ACTION RIGHTS AS DETAILED IN SECTION 13. PLEASE READ THE AGREEMENT CAREFULLY.** + +_Our Terms of Use have been updated as of September 5, 2016_ + +## 1. Acceptance of Terms ## + +MetaMask provides a platform for managing Ethereum (or "ETH") accounts, and allowing ordinary websites to interact with the Ethereum blockchain, while keeping the user in control over what transactions they approve, through our website located at[ ](http://metamask.io)[https://metamask.io/](https://metamask.io/) and browser plugin (the "Site") — which includes text, images, audio, code and other materials (collectively, the “Content”) and all of the features, and services provided. The Site, and any other features, tools, materials, or other services offered from time to time by MetaMask are referred to here as the “Service.” Please read these Terms of Use (the “Terms” or “Terms of Use”) carefully before using the Service. By using or otherwise accessing the Services, or clicking to accept or agree to these Terms where that option is made available, you (1) accept and agree to these Terms (2) consent to the collection, use, disclosure and other handling of information as described in our Privacy Policy and (3) any additional terms, rules and conditions of participation issued by MetaMask from time to time. If you do not agree to the Terms, then you may not access or use the Content or Services. + +## 2. Modification of Terms of Use ## + +Except for Section 13, providing for binding arbitration and waiver of class action rights, MetaMask reserves the right, at its sole discretion, to modify or replace the Terms of Use at any time. The most current version of these Terms will be posted on our Site. You shall be responsible for reviewing and becoming familiar with any such modifications. Use of the Services by you after any modification to the Terms constitutes your acceptance of the Terms of Use as modified. + + + +## 3. Eligibility ## + +You hereby represent and warrant that you are fully able and competent to enter into the terms, conditions, obligations, affirmations, representations and warranties set forth in these Terms and to abide by and comply with these Terms. + +MetaMask is a global platform and by accessing the Content or Services, you are representing and warranting that, you are of the legal age of majority in your jurisdiction as is required to access such Services and Content and enter into arrangements as provided by the Service. You further represent that you are otherwise legally permitted to use the service in your jurisdiction including owning cryptographic tokens of value, and interacting with the Services or Content in any way. You further represent you are responsible for ensuring compliance with the laws of your jurisdiction and acknowledge that MetaMask is not liable for your compliance with such laws. + +## 4 Account Password and Security ## + +When setting up an account within MetaMask, you will be responsible for keeping your own account secrets, which may be a twelve-word seed phrase, an account file, or other locally stored secret information. MetaMask encrypts this information locally with a password you provide, that we never send to our servers. You agree to (a) never use the same password for MetaMask that you have ever used outside of this service; (b) keep your secret information and password confidential and do not share them with anyone else; (c) immediately notify MetaMask of any unauthorized use of your account or breach of security. MetaMask cannot and will not be liable for any loss or damage arising from your failure to comply with this section. + +## 5. Representations, Warranties, and Risks ## + +### 5.1. Warranty Disclaimer ### + +You expressly understand and agree that your use of the Service is at your sole risk. The Service (including the Service and the Content) are provided on an "AS IS" and "as available" basis, without warranties of any kind, either express or implied, including, without limitation, implied warranties of merchantability, fitness for a particular purpose or non-infringement. You acknowledge that MetaMask has no control over, and no duty to take any action regarding: which users gain access to or use the Service; what effects the Content may have on you; how you may interpret or use the Content; or what actions you may take as a result of having been exposed to the Content. You release MetaMask from all liability for you having acquired or not acquired Content through the Service. MetaMask makes no representations concerning any Content contained in or accessed through the Service, and MetaMask will not be responsible or liable for the accuracy, copyright compliance, legality or decency of material contained in or accessed through the Service. + +### 5.2 Sophistication and Risk of Cryptographic Systems ### + +By utilizing the Service or interacting with the Content or platform in any way, you represent that you understand the inherent risks associated with cryptographic systems; and warrant that you have an understanding of the usage and intricacies of native cryptographic tokens, like Ether (ETH) and Bitcoin (BTC), smart contract based tokens such as those that follow the Ethereum Token Standard (https://github.com/ethereum/EIPs/issues/20), and blockchain-based software systems. + +### 5.3 Risk of Regulatory Actions in One or More Jurisdictions ### + +MetaMask and ETH could be impacted by one or more regulatory inquiries or regulatory action, which could impede or limit the ability of MetaMask to continue to develop, or which could impede or limit your ability to access or use the Service or Ethereum blockchain. + +### 5.4 Risk of Weaknesses or Exploits in the Field of Cryptography ### + +You acknowledge and understand that Cryptography is a progressing field. Advances in code cracking or technical advances such as the development of quantum computers may present risks to cryptocurrencies and Services of Content, which could result in the theft or loss of your cryptographic tokens or property. To the extent possible, MetaMask intends to update the protocol underlying Services to account for any advances in cryptography and to incorporate additional security measures, but does not guarantee or otherwise represent full security of the system. By using the Service or accessing Content, you acknowledge these inherent risks. + +### 5.5 Volatility of Crypto Currencies ### + +You understand that Ethereum and other blockchain technologies and associated currencies or tokens are highly volatile due to many factors including but not limited to adoption, speculation, technology and security risks. You also acknowledge that the cost of transacting on such technologies is variable and may increase at any time causing impact to any activities taking place on the Ethereum blockchain. You acknowledge these risks and represent that MetaMask cannot be held liable for such fluctuations or increased costs. + +### 5.6 Application Security ### + +You acknowledge that Ethereum applications are code subject to flaws and acknowledge that you are solely responsible for evaluating any code provided by the Services or Content and the trustworthiness of any third-party websites, products, smart-contracts, or Content you access or use through the Service. You further expressly acknowledge and represent that Ethereum applications can be written maliciously or negligently, that MetaMask cannot be held liable for your interaction with such applications and that such applications may cause the loss of property or even identity. This warning and others later provided by MetaMask in no way evidence or represent an on-going duty to alert you to all of the potential risks of utilizing the Service or Content. + +## 6. Indemnity ## + +You agree to release and to indemnify, defend and hold harmless MetaMask and its parents, subsidiaries, affiliates and agencies, as well as the officers, directors, employees, shareholders and representatives of any of the foregoing entities, from and against any and all losses, liabilities, expenses, damages, costs (including attorneys’ fees and court costs) claims or actions of any kind whatsoever arising or resulting from your use of the Service, your violation of these Terms of Use, and any of your acts or omissions that implicate publicity rights, defamation or invasion of privacy. MetaMask reserves the right, at its own expense, to assume exclusive defense and control of any matter otherwise subject to indemnification by you and, in such case, you agree to cooperate with MetaMask in the defense of such matter. + +## 7. Limitation on liability ## + +YOU ACKNOWLEDGE AND AGREE THAT YOU ASSUME FULL RESPONSIBILITY FOR YOUR USE OF THE SITE AND SERVICE. YOU ACKNOWLEDGE AND AGREE THAT ANY INFORMATION YOU SEND OR RECEIVE DURING YOUR USE OF THE SITE AND SERVICE MAY NOT BE SECURE AND MAY BE INTERCEPTED OR LATER ACQUIRED BY UNAUTHORIZED PARTIES. YOU ACKNOWLEDGE AND AGREE THAT YOUR USE OF THE SITE AND SERVICE IS AT YOUR OWN RISK. RECOGNIZING SUCH, YOU UNDERSTAND AND AGREE THAT, TO THE FULLEST EXTENT PERMITTED BY APPLICABLE LAW, NEITHER METAMASK NOR ITS SUPPLIERS OR LICENSORS WILL BE LIABLE TO YOU FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY OR OTHER DAMAGES OF ANY KIND, INCLUDING WITHOUT LIMITATION DAMAGES FOR LOSS OF PROFITS, GOODWILL, USE, DATA OR OTHER TANGIBLE OR INTANGIBLE LOSSES OR ANY OTHER DAMAGES BASED ON CONTRACT, TORT, STRICT LIABILITY OR ANY OTHER THEORY (EVEN IF METAMASK HAD BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES), RESULTING FROM THE SITE OR SERVICE; THE USE OR THE INABILITY TO USE THE SITE OR SERVICE; UNAUTHORIZED ACCESS TO OR ALTERATION OF YOUR TRANSMISSIONS OR DATA; STATEMENTS OR CONDUCT OF ANY THIRD PARTY ON THE SITE OR SERVICE; ANY ACTIONS WE TAKE OR FAIL TO TAKE AS A RESULT OF COMMUNICATIONS YOU SEND TO US; HUMAN ERRORS; TECHNICAL MALFUNCTIONS; FAILURES, INCLUDING PUBLIC UTILITY OR TELEPHONE OUTAGES; OMISSIONS, INTERRUPTIONS, LATENCY, DELETIONS OR DEFECTS OF ANY DEVICE OR NETWORK, PROVIDERS, OR SOFTWARE (INCLUDING, BUT NOT LIMITED TO, THOSE THAT DO NOT PERMIT PARTICIPATION IN THE SERVICE); ANY INJURY OR DAMAGE TO COMPUTER EQUIPMENT; INABILITY TO FULLY ACCESS THE SITE OR SERVICE OR ANY OTHER WEBSITE; THEFT, TAMPERING, DESTRUCTION, OR UNAUTHORIZED ACCESS TO, IMAGES OR OTHER CONTENT OF ANY KIND; DATA THAT IS PROCESSED LATE OR INCORRECTLY OR IS INCOMPLETE OR LOST; TYPOGRAPHICAL, PRINTING OR OTHER ERRORS, OR ANY COMBINATION THEREOF; OR ANY OTHER MATTER RELATING TO THE SITE OR SERVICE. + +SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF CERTAIN WARRANTIES OR THE LIMITATION OR EXCLUSION OF LIABILITY FOR INCIDENTAL OR CONSEQUENTIAL DAMAGES. ACCORDINGLY, SOME OF THE ABOVE LIMITATIONS MAY NOT APPLY TO YOU. + +## 8. Our Proprietary Rights ## + +All title, ownership and intellectual property rights in and to the Service are owned by MetaMask or its licensors. You acknowledge and agree that the Service contains proprietary and confidential information that is protected by applicable intellectual property and other laws. Except as expressly authorized by MetaMask, you agree not to copy, modify, rent, lease, loan, sell, distribute, perform, display or create derivative works based on the Service, in whole or in part. MetaMask issues a license for MetaMask, found [here](https://github.com/MetaMask/metamask-plugin/blob/master/LICENSE). For information on other licenses utilized in the development of MetaMask, please see our attribution page at: [https://metamask.io/attributions.html](https://metamask.io/attributions.html) + +## 9. Links ## + +The Service provides, or third parties may provide, links to other World Wide Web or accessible sites, applications or resources. Because MetaMask has no control over such sites, applications and resources, you acknowledge and agree that MetaMask is not responsible for the availability of such external sites, applications or resources, and does not endorse and is not responsible or liable for any content, advertising, products or other materials on or available from such sites or resources. You further acknowledge and agree that MetaMask shall not be responsible or liable, directly or indirectly, for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods or services available on or through any such site or resource. + +## 10. Termination and Suspension ## + +MetaMask may terminate or suspend all or part of the Service and your MetaMask access immediately, without prior notice or liability, if you breach any of the terms or conditions of the Terms. Upon termination of your access, your right to use the Service will immediately cease. + +The following provisions of the Terms survive any termination of these Terms: INDEMNITY; WARRANTY DISCLAIMERS; LIMITATION ON LIABILITY; OUR PROPRIETARY RIGHTS; LINKS; TERMINATION; NO THIRD PARTY BENEFICIARIES; BINDING ARBITRATION AND CLASS ACTION WAIVER; GENERAL INFORMATION. + +## 11. No Third Party Beneficiaries ## + +You agree that, except as otherwise expressly provided in these Terms, there shall be no third party beneficiaries to the Terms. + +## 12. Notice and Procedure For Making Claims of Copyright Infringement ## + +If you believe that your copyright or the copyright of a person on whose behalf you are authorized to act has been infringed, please provide MetaMask’s Copyright Agent a written Notice containing the following information: + +· an electronic or physical signature of the person authorized to act on behalf of the owner of the copyright or other intellectual property interest; + +· a description of the copyrighted work or other intellectual property that you claim has been infringed; + +· a description of where the material that you claim is infringing is located on the Service; + +· your address, telephone number, and email address; + +· a statement by you that you have a good faith belief that the disputed use is not authorized by the copyright owner, its agent, or the law; + +· a statement by you, made under penalty of perjury, that the above information in your Notice is accurate and that you are the copyright or intellectual property owner or authorized to act on the copyright or intellectual property owner's behalf. + +MetaMask’s Copyright Agent can be reached at: + +Email: copyright [at] metamask [dot] io + +Mail: + +Attention: + +MetaMask Copyright ℅ ConsenSys + +49 Bogart Street + +Brooklyn, NY 11206 + +## 13. Binding Arbitration and Class Action Waiver ## + +PLEASE READ THIS SECTION CAREFULLY – IT MAY SIGNIFICANTLY AFFECT YOUR LEGAL RIGHTS, INCLUDING YOUR RIGHT TO FILE A LAWSUIT IN COURT + +### 13.1 Initial Dispute Resolution ### + +The parties shall use their best efforts to engage directly to settle any dispute, claim, question, or disagreement and engage in good faith negotiations which shall be a condition to either party initiating a lawsuit or arbitration. + +### 13.2 Binding Arbitration ### + +If the parties do not reach an agreed upon solution within a period of 30 days from the time informal dispute resolution under the Initial Dispute Resolution provision begins, then either party may initiate binding arbitration as the sole means to resolve claims, subject to the terms set forth below. Specifically, all claims arising out of or relating to these Terms (including their formation, performance and breach), the parties’ relationship with each other and/or your use of the Service shall be finally settled by binding arbitration administered by the American Arbitration Association in accordance with the provisions of its Commercial Arbitration Rules and the supplementary procedures for consumer related disputes of the American Arbitration Association (the "AAA"), excluding any rules or procedures governing or permitting class actions. + +The arbitrator, and not any federal, state or local court or agency, shall have exclusive authority to resolve all disputes arising out of or relating to the interpretation, applicability, enforceability or formation of these Terms, including, but not limited to any claim that all or any part of these Terms are void or voidable, or whether a claim is subject to arbitration. The arbitrator shall be empowered to grant whatever relief would be available in a court under law or in equity. The arbitrator’s award shall be written, and binding on the parties and may be entered as a judgment in any court of competent jurisdiction. + +The parties understand that, absent this mandatory provision, they would have the right to sue in court and have a jury trial. They further understand that, in some instances, the costs of arbitration could exceed the costs of litigation and the right to discovery may be more limited in arbitration than in court. + +### 13.3 Location ### + +Binding arbitration shall take place in New York. You agree to submit to the personal jurisdiction of any federal or state court in New York County, New York, in order to compel arbitration, to stay proceedings pending arbitration, or to confirm, modify, vacate or enter judgment on the award entered by the arbitrator. + +### 13.4 Class Action Waiver ### + +The parties further agree that any arbitration shall be conducted in their individual capacities only and not as a class action or other representative action, and the parties expressly waive their right to file a class action or seek relief on a class basis. YOU AND METAMASK AGREE THAT EACH MAY BRING CLAIMS AGAINST THE OTHER ONLY IN YOUR OR ITS INDIVIDUAL CAPACITY, AND NOT AS A PLAINTIFF OR CLASS MEMBER IN ANY PURPORTED CLASS OR REPRESENTATIVE PROCEEDING. If any court or arbitrator determines that the class action waiver set forth in this paragraph is void or unenforceable for any reason or that an arbitration can proceed on a class basis, then the arbitration provision set forth above shall be deemed null and void in its entirety and the parties shall be deemed to have not agreed to arbitrate disputes. + +### 13.5 Exception - Litigation of Intellectual Property and Small Claims Court Claims ### + +Notwithstanding the parties' decision to resolve all disputes through arbitration, either party may bring an action in state or federal court to protect its intellectual property rights ("intellectual property rights" means patents, copyrights, moral rights, trademarks, and trade secrets, but not privacy or publicity rights). Either party may also seek relief in a small claims court for disputes or claims within the scope of that court’s jurisdiction. + +### 13.6 30-Day Right to Opt Out ### + +You have the right to opt-out and not be bound by the arbitration and class action waiver provisions set forth above by sending written notice of your decision to opt-out to the following address: MetaMask ℅ ConsenSys, 49 Bogart Street, Brooklyn NY 11206 and via email at legal-opt@metamask.io. The notice must be sent within 30 days of September 6, 2016 or your first use of the Service, whichever is later, otherwise you shall be bound to arbitrate disputes in accordance with the terms of those paragraphs. If you opt-out of these arbitration provisions, MetaMask also will not be bound by them. + +### 13.7 Changes to This Section ### + +MetaMask will provide 60-days’ notice of any changes to this section. Changes will become effective on the 60th day, and will apply prospectively only to any claims arising after the 60th day. + +For any dispute not subject to arbitration you and MetaMask agree to submit to the personal and exclusive jurisdiction of and venue in the federal and state courts located in New York, New York. You further agree to accept service of process by mail, and hereby waive any and all jurisdictional and venue defenses otherwise available. + +The Terms and the relationship between you and MetaMask shall be governed by the laws of the State of New York without regard to conflict of law provisions. + +## 14. General Information ## + +### 14.1 Entire Agreement ### + +These Terms (and any additional terms, rules and conditions of participation that MetaMask may post on the Service) constitute the entire agreement between you and MetaMask with respect to the Service and supersedes any prior agreements, oral or written, between you and MetaMask. In the event of a conflict between these Terms and the additional terms, rules and conditions of participation, the latter will prevail over the Terms to the extent of the conflict. + +### 14.2 Waiver and Severability of Terms ### + +The failure of MetaMask to exercise or enforce any right or provision of the Terms shall not constitute a waiver of such right or provision. If any provision of the Terms is found by an arbitrator or court of competent jurisdiction to be invalid, the parties nevertheless agree that the arbitrator or court should endeavor to give effect to the parties' intentions as reflected in the provision, and the other provisions of the Terms remain in full force and effect. + +### 14.3 Statute of Limitations ### + +You agree that regardless of any statute or law to the contrary, any claim or cause of action arising out of or related to the use of the Service or the Terms must be filed within one (1) year after such claim or cause of action arose or be forever barred. + +### 14.4 Section Titles ### + +The section titles in the Terms are for convenience only and have no legal or contractual effect. + +### 14.5 Communications ### + +Users with questions, complaints or claims with respect to the Service may contact us using the relevant contact information set forth above and at communications@metamask.io. + +## 15 Related Links ## + +**[Terms of Use](https://metamask.io/terms.html)** + +**[Privacy](https://metamask.io/privacy.html)** + +**[Attributions](https://metamask.io/attributions.html)** + +', id: 0}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +ERROR: 'Warning: setState(...): Can only update a mounted or mounting component. This usually means you called setState() on an unmounted component. This is a no-op. Please check the code for the NoticeScreen component.' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'document.body', + + + + + + + + + + + + +
Created with Raphaël 2.2.0
Terms of Use

Terms of Use

THIS AGREEMENT IS SUBJECT TO BINDING ARBITRATION AND A WAIVER OF CLASS ACTION RIGHTS AS DETAILED IN SECTION 13. PLEASE READ THE AGREEMENT CAREFULLY.

Our Terms of Use have been updated as of September 5, 2016

1. Acceptance of Terms

MetaMask provides a platform for managing Ethereum (or "ETH") accounts, and allowing ordinary websites to interact with the Ethereum blockchain, while keeping the user in control over what transactions they approve, through our website located at https://metamask.io/ and browser plugin (the "Site") — which includes text, images, audio, code and other materials (collectively, the “Content”) and all of the features, and services provided. The Site, and any other features, tools, materials, or other services offered from time to time by MetaMask are referred to here as the “Service.” Please read these Terms of Use (the “Terms” or “Terms of Use”) carefully before using the Service. By using or otherwise accessing the Services, or clicking to accept or agree to these Terms where that option is made available, you (1) accept and agree to these Terms (2) consent to the collection, use, disclosure and other handling of information as described in our Privacy Policy and (3) any additional terms, rules and conditions of participation issued by MetaMask from time to time. If you do not agree to the Terms, then you may not access or use the Content or Services.

2. Modification of Terms of Use

Except for Section 13, providing for binding arbitration and waiver of class action rights, MetaMask reserves the right, at its sole discretion, to modify or replace the Terms of Use at any time. The most current version of these Terms will be posted on our Site. You shall be responsible for reviewing and becoming familiar with any such modifications. Use of the Services by you after any modification to the Terms constitutes your acceptance of the Terms of Use as modified.

3. Eligibility

You hereby represent and warrant that you are fully able and competent to enter into the terms, conditions, obligations, affirmations, representations and warranties set forth in these Terms and to abide by and comply with these Terms.

MetaMask is a global platform and by accessing the Content or Services, you are representing and warranting that, you are of the legal age of majority in your jurisdiction as is required to access such Services and Content and enter into arrangements as provided by the Service. You further represent that you are otherwise legally permitted to use the service in your jurisdiction including owning cryptographic tokens of value, and interacting with the Services or Content in any way. You further represent you are responsible for ensuring compliance with the laws of your jurisdiction and acknowledge that MetaMask is not liable for your compliance with such laws.

4 Account Password and Security

When setting up an account within MetaMask, you will be responsible for keeping your own account secrets, which may be a twelve-word seed phrase, an account file, or other locally stored secret information. MetaMask encrypts this information locally with a password you provide, that we never send to our servers. You agree to (a) never use the same password for MetaMask that you have ever used outside of this service; (b) keep your secret information and password confidential and do not share them with anyone else; (c) immediately notify MetaMask of any unauthorized use of your account or breach of security. MetaMask cannot and will not be liable for any loss or damage arising from your failure to comply with this section.

5. Representations, Warranties, and Risks

5.1. Warranty Disclaimer

You expressly understand and agree that your use of the Service is at your sole risk. The Service (including the Service and the Content) are provided on an "AS IS" and "as available" basis, without warranties of any kind, either express or implied, including, without limitation, implied warranties of merchantability, fitness for a particular purpose or non-infringement. You acknowledge that MetaMask has no control over, and no duty to take any action regarding: which users gain access to or use the Service; what effects the Content may have on you; how you may interpret or use the Content; or what actions you may take as a result of having been exposed to the Content. You release MetaMask from all liability for you having acquired or not acquired Content through the Service. MetaMask makes no representations concerning any Content contained in or accessed through the Service, and MetaMask will not be responsible or liable for the accuracy, copyright compliance, legality or decency of material contained in or accessed through the Service.

5.2 Sophistication and Risk of Cryptographic Systems

By utilizing the Service or interacting with the Content or platform in any way, you represent that you understand the inherent risks associated with cryptographic systems; and warrant that you have an understanding of the usage and intricacies of native cryptographic tokens, like Ether (ETH) and Bitcoin (BTC), smart contract based tokens such as those that follow the Ethereum Token Standard (https://github.com/ethereum/EIPs/issues/20), and blockchain-based software systems.

5.3 Risk of Regulatory Actions in One or More Jurisdictions

MetaMask and ETH could be impacted by one or more regulatory inquiries or regulatory action, which could impede or limit the ability of MetaMask to continue to develop, or which could impede or limit your ability to access or use the Service or Ethereum blockchain.

5.4 Risk of Weaknesses or Exploits in the Field of Cryptography

You acknowledge and understand that Cryptography is a progressing field. Advances in code cracking or technical advances such as the development of quantum computers may present risks to cryptocurrencies and Services of Content, which could result in the theft or loss of your cryptographic tokens or property. To the extent possible, MetaMask intends to update the protocol underlying Services to account for any advances in cryptography and to incorporate additional security measures, but does not guarantee or otherwise represent full security of the system. By using the Service or accessing Content, you acknowledge these inherent risks.

5.5 Volatility of Crypto Currencies

You understand that Ethereum and other blockchain technologies and associated currencies or tokens are highly volatile due to many factors including but not limited to adoption, speculation, technology and security risks. You also acknowledge that the cost of transacting on such technologies is variable and may increase at any time causing impact to any activities taking place on the Ethereum blockchain. You acknowledge these risks and represent that MetaMask cannot be held liable for such fluctuations or increased costs.

5.6 Application Security

You acknowledge that Ethereum applications are code subject to flaws and acknowledge that you are solely responsible for evaluating any code provided by the Services or Content and the trustworthiness of any third-party websites, products, smart-contracts, or Content you access or use through the Service. You further expressly acknowledge and represent that Ethereum applications can be written maliciously or negligently, that MetaMask cannot be held liable for your interaction with such applications and that such applications may cause the loss of property or even identity. This warning and others later provided by MetaMask in no way evidence or represent an on-going duty to alert you to all of the potential risks of utilizing the Service or Content.

6. Indemnity

You agree to release and to indemnify, defend and hold harmless MetaMask and its parents, subsidiaries, affiliates and agencies, as well as the officers, directors, employees, shareholders and representatives of any of the foregoing entities, from and against any and all losses, liabilities, expenses, damages, costs (including attorneys’ fees and court costs) claims or actions of any kind whatsoever arising or resulting from your use of the Service, your violation of these Terms of Use, and any of your acts or omissions that implicate publicity rights, defamation or invasion of privacy. MetaMask reserves the right, at its own expense, to assume exclusive defense and control of any matter otherwise subject to indemnification by you and, in such case, you agree to cooperate with MetaMask in the defense of such matter.

7. Limitation on liability

YOU ACKNOWLEDGE AND AGREE THAT YOU ASSUME FULL RESPONSIBILITY FOR YOUR USE OF THE SITE AND SERVICE. YOU ACKNOWLEDGE AND AGREE THAT ANY INFORMATION YOU SEND OR RECEIVE DURING YOUR USE OF THE SITE AND SERVICE MAY NOT BE SECURE AND MAY BE INTERCEPTED OR LATER ACQUIRED BY UNAUTHORIZED PARTIES. YOU ACKNOWLEDGE AND AGREE THAT YOUR USE OF THE SITE AND SERVICE IS AT YOUR OWN RISK. RECOGNIZING SUCH, YOU UNDERSTAND AND AGREE THAT, TO THE FULLEST EXTENT PERMITTED BY APPLICABLE LAW, NEITHER METAMASK NOR ITS SUPPLIERS OR LICENSORS WILL BE LIABLE TO YOU FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY OR OTHER DAMAGES OF ANY KIND, INCLUDING WITHOUT LIMITATION DAMAGES FOR LOSS OF PROFITS, GOODWILL, USE, DATA OR OTHER TANGIBLE OR INTANGIBLE LOSSES OR ANY OTHER DAMAGES BASED ON CONTRACT, TORT, STRICT LIABILITY OR ANY OTHER THEORY (EVEN IF METAMASK HAD BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES), RESULTING FROM THE SITE OR SERVICE; THE USE OR THE INABILITY TO USE THE SITE OR SERVICE; UNAUTHORIZED ACCESS TO OR ALTERATION OF YOUR TRANSMISSIONS OR DATA; STATEMENTS OR CONDUCT OF ANY THIRD PARTY ON THE SITE OR SERVICE; ANY ACTIONS WE TAKE OR FAIL TO TAKE AS A RESULT OF COMMUNICATIONS YOU SEND TO US; HUMAN ERRORS; TECHNICAL MALFUNCTIONS; FAILURES, INCLUDING PUBLIC UTILITY OR TELEPHONE OUTAGES; OMISSIONS, INTERRUPTIONS, LATENCY, DELETIONS OR DEFECTS OF ANY DEVICE OR NETWORK, PROVIDERS, OR SOFTWARE (INCLUDING, BUT NOT LIMITED TO, THOSE THAT DO NOT PERMIT PARTICIPATION IN THE SERVICE); ANY INJURY OR DAMAGE TO COMPUTER EQUIPMENT; INABILITY TO FULLY ACCESS THE SITE OR SERVICE OR ANY OTHER WEBSITE; THEFT, TAMPERING, DESTRUCTION, OR UNAUTHORIZED ACCESS TO, IMAGES OR OTHER CONTENT OF ANY KIND; DATA THAT IS PROCESSED LATE OR INCORRECTLY OR IS INCOMPLETE OR LOST; TYPOGRAPHICAL, PRINTING OR OTHER ERRORS, OR ANY COMBINATION THEREOF; OR ANY OTHER MATTER RELATING TO THE SITE OR SERVICE.

SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF CERTAIN WARRANTIES OR THE LIMITATION OR EXCLUSION OF LIABILITY FOR INCIDENTAL OR CONSEQUENTIAL DAMAGES. ACCORDINGLY, SOME OF THE ABOVE LIMITATIONS MAY NOT APPLY TO YOU.

8. Our Proprietary Rights

All title, ownership and intellectual property rights in and to the Service are owned by MetaMask or its licensors. You acknowledge and agree that the Service contains proprietary and confidential information that is protected by applicable intellectual property and other laws. Except as expressly authorized by MetaMask, you agree not to copy, modify, rent, lease, loan, sell, distribute, perform, display or create derivative works based on the Service, in whole or in part. MetaMask issues a license for MetaMask, found here. For information on other licenses utilized in the development of MetaMask, please see our attribution page at: https://metamask.io/attributions.html

9. Links

The Service provides, or third parties may provide, links to other World Wide Web or accessible sites, applications or resources. Because MetaMask has no control over such sites, applications and resources, you acknowledge and agree that MetaMask is not responsible for the availability of such external sites, applications or resources, and does not endorse and is not responsible or liable for any content, advertising, products or other materials on or available from such sites or resources. You further acknowledge and agree that MetaMask shall not be responsible or liable, directly or indirectly, for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods or services available on or through any such site or resource.

10. Termination and Suspension

MetaMask may terminate or suspend all or part of the Service and your MetaMask access immediately, without prior notice or liability, if you breach any of the terms or conditions of the Terms. Upon termination of your access, your right to use the Service will immediately cease.

The following provisions of the Terms survive any termination of these Terms: INDEMNITY; WARRANTY DISCLAIMERS; LIMITATION ON LIABILITY; OUR PROPRIETARY RIGHTS; LINKS; TERMINATION; NO THIRD PARTY BENEFICIARIES; BINDING ARBITRATION AND CLASS ACTION WAIVER; GENERAL INFORMATION.

11. No Third Party Beneficiaries

You agree that, except as otherwise expressly provided in these Terms, there shall be no third party beneficiaries to the Terms.

12. Notice and Procedure For Making Claims of Copyright Infringement

If you believe that your copyright or the copyright of a person on whose behalf you are authorized to act has been infringed, please provide MetaMask’s Copyright Agent a written Notice containing the following information:

· an electronic or physical signature of the person authorized to act on behalf of the owner of the copyright or other intellectual property interest;

· a description of the copyrighted work or other intellectual property that you claim has been infringed;

· a description of where the material that you claim is infringing is located on the Service;

· your address, telephone number, and email address;

· a statement by you that you have a good faith belief that the disputed use is not authorized by the copyright owner, its agent, or the law;

· a statement by you, made under penalty of perjury, that the above information in your Notice is accurate and that you are the copyright or intellectual property owner or authorized to act on the copyright or intellectual property owner's behalf.

MetaMask’s Copyright Agent can be reached at:

Email: copyright at metamask dot io

Mail:

Attention:

MetaMask Copyright ℅ ConsenSys

49 Bogart Street

Brooklyn, NY 11206

13. Binding Arbitration and Class Action Waiver

PLEASE READ THIS SECTION CAREFULLY – IT MAY SIGNIFICANTLY AFFECT YOUR LEGAL RIGHTS, INCLUDING YOUR RIGHT TO FILE A LAWSUIT IN COURT

13.1 Initial Dispute Resolution

The parties shall use their best efforts to engage directly to settle any dispute, claim, question, or disagreement and engage in good faith negotiations which shall be a condition to either party initiating a lawsuit or arbitration.

13.2 Binding Arbitration

If the parties do not reach an agreed upon solution within a period of 30 days from the time informal dispute resolution under the Initial Dispute Resolution provision begins, then either party may initiate binding arbitration as the sole means to resolve claims, subject to the terms set forth below. Specifically, all claims arising out of or relating to these Terms (including their formation, performance and breach), the parties’ relationship with each other and/or your use of the Service shall be finally settled by binding arbitration administered by the American Arbitration Association in accordance with the provisions of its Commercial Arbitration Rules and the supplementary procedures for consumer related disputes of the American Arbitration Association (the "AAA"), excluding any rules or procedures governing or permitting class actions.

The arbitrator, and not any federal, state or local court or agency, shall have exclusive authority to resolve all disputes arising out of or relating to the interpretation, applicability, enforceability or formation of these Terms, including, but not limited to any claim that all or any part of these Terms are void or voidable, or whether a claim is subject to arbitration. The arbitrator shall be empowered to grant whatever relief would be available in a court under law or in equity. The arbitrator’s award shall be written, and binding on the parties and may be entered as a judgment in any court of competent jurisdiction.

The parties understand that, absent this mandatory provision, they would have the right to sue in court and have a jury trial. They further understand that, in some instances, the costs of arbitration could exceed the costs of litigation and the right to discovery may be more limited in arbitration than in court.

13.3 Location

Binding arbitration shall take place in New York. You agree to submit to the personal jurisdiction of any federal or state court in New York County, New York, in order to compel arbitration, to stay proceedings pending arbitration, or to confirm, modify, vacate or enter judgment on the award entered by the arbitrator.

13.4 Class Action Waiver

The parties further agree that any arbitration shall be conducted in their individual capacities only and not as a class action or other representative action, and the parties expressly waive their right to file a class action or seek relief on a class basis. YOU AND METAMASK AGREE THAT EACH MAY BRING CLAIMS AGAINST THE OTHER ONLY IN YOUR OR ITS INDIVIDUAL CAPACITY, AND NOT AS A PLAINTIFF OR CLASS MEMBER IN ANY PURPORTED CLASS OR REPRESENTATIVE PROCEEDING. If any court or arbitrator determines that the class action waiver set forth in this paragraph is void or unenforceable for any reason or that an arbitration can proceed on a class basis, then the arbitration provision set forth above shall be deemed null and void in its entirety and the parties shall be deemed to have not agreed to arbitrate disputes.

13.5 Exception - Litigation of Intellectual Property and Small Claims Court Claims

Notwithstanding the parties' decision to resolve all disputes through arbitration, either party may bring an action in state or federal court to protect its intellectual property rights ("intellectual property rights" means patents, copyrights, moral rights, trademarks, and trade secrets, but not privacy or publicity rights). Either party may also seek relief in a small claims court for disputes or claims within the scope of that court’s jurisdiction.

13.6 30-Day Right to Opt Out

You have the right to opt-out and not be bound by the arbitration and class action waiver provisions set forth above by sending written notice of your decision to opt-out to the following address: MetaMask ℅ ConsenSys, 49 Bogart Street, Brooklyn NY 11206 and via email at legal-opt@metamask.io. The notice must be sent within 30 days of September 6, 2016 or your first use of the Service, whichever is later, otherwise you shall be bound to arbitrate disputes in accordance with the terms of those paragraphs. If you opt-out of these arbitration provisions, MetaMask also will not be bound by them.

13.7 Changes to This Section

MetaMask will provide 60-days’ notice of any changes to this section. Changes will become effective on the 60th day, and will apply prospectively only to any claims arising after the 60th day.

For any dispute not subject to arbitration you and MetaMask agree to submit to the personal and exclusive jurisdiction of and venue in the federal and state courts located in New York, New York. You further agree to accept service of process by mail, and hereby waive any and all jurisdictional and venue defenses otherwise available.

The Terms and the relationship between you and MetaMask shall be governed by the laws of the State of New York without regard to conflict of law provisions.

14. General Information

14.1 Entire Agreement

These Terms (and any additional terms, rules and conditions of participation that MetaMask may post on the Service) constitute the entire agreement between you and MetaMask with respect to the Service and supersedes any prior agreements, oral or written, between you and MetaMask. In the event of a conflict between these Terms and the additional terms, rules and conditions of participation, the latter will prevail over the Terms to the extent of the conflict.

14.2 Waiver and Severability of Terms

The failure of MetaMask to exercise or enforce any right or provision of the Terms shall not constitute a waiver of such right or provision. If any provision of the Terms is found by an arbitrator or court of competent jurisdiction to be invalid, the parties nevertheless agree that the arbitrator or court should endeavor to give effect to the parties' intentions as reflected in the provision, and the other provisions of the Terms remain in full force and effect.

14.3 Statute of Limitations

You agree that regardless of any statute or law to the contrary, any claim or cause of action arising out of or related to the use of the Service or the Terms must be filed within one (1) year after such claim or cause of action arose or be forever barred.

14.4 Section Titles

The section titles in the Terms are for convenience only and have no legal or contractual effect.

14.5 Communications

Users with questions, complaints or claims with respect to the Service may contact us using the relevant contact information set forth above and at communications@metamask.io.

15 Related Links

Terms of Use

Privacy

Attributions

+Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got UPDATE_METAMASK_STATE' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'Main ui render function' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'rendering primary' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_METAMASK_STATE', value: Object{isInitialized: true, provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', unapprovedTxs: Object{}, selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, isUnlocked: true, keyringTypes: [..., ...], keyrings: [...], identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, computedBalances: Object{}, frequentRpcList: [], currentAccountTab: 'history', tokens: [], useBlockie: false, featureFlags: Object{betaUI: ...}, selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', addressBook: [], currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, noActiveNotices: false, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'document.body', + + + + + + + + + + + + +
Created with Raphaël 2.2.0
Terms of Use

Terms of Use

THIS AGREEMENT IS SUBJECT TO BINDING ARBITRATION AND A WAIVER OF CLASS ACTION RIGHTS AS DETAILED IN SECTION 13. PLEASE READ THE AGREEMENT CAREFULLY.

Our Terms of Use have been updated as of September 5, 2016

1. Acceptance of Terms

MetaMask provides a platform for managing Ethereum (or "ETH") accounts, and allowing ordinary websites to interact with the Ethereum blockchain, while keeping the user in control over what transactions they approve, through our website located at https://metamask.io/ and browser plugin (the "Site") — which includes text, images, audio, code and other materials (collectively, the “Content”) and all of the features, and services provided. The Site, and any other features, tools, materials, or other services offered from time to time by MetaMask are referred to here as the “Service.” Please read these Terms of Use (the “Terms” or “Terms of Use”) carefully before using the Service. By using or otherwise accessing the Services, or clicking to accept or agree to these Terms where that option is made available, you (1) accept and agree to these Terms (2) consent to the collection, use, disclosure and other handling of information as described in our Privacy Policy and (3) any additional terms, rules and conditions of participation issued by MetaMask from time to time. If you do not agree to the Terms, then you may not access or use the Content or Services.

2. Modification of Terms of Use

Except for Section 13, providing for binding arbitration and waiver of class action rights, MetaMask reserves the right, at its sole discretion, to modify or replace the Terms of Use at any time. The most current version of these Terms will be posted on our Site. You shall be responsible for reviewing and becoming familiar with any such modifications. Use of the Services by you after any modification to the Terms constitutes your acceptance of the Terms of Use as modified.

3. Eligibility

You hereby represent and warrant that you are fully able and competent to enter into the terms, conditions, obligations, affirmations, representations and warranties set forth in these Terms and to abide by and comply with these Terms.

MetaMask is a global platform and by accessing the Content or Services, you are representing and warranting that, you are of the legal age of majority in your jurisdiction as is required to access such Services and Content and enter into arrangements as provided by the Service. You further represent that you are otherwise legally permitted to use the service in your jurisdiction including owning cryptographic tokens of value, and interacting with the Services or Content in any way. You further represent you are responsible for ensuring compliance with the laws of your jurisdiction and acknowledge that MetaMask is not liable for your compliance with such laws.

4 Account Password and Security

When setting up an account within MetaMask, you will be responsible for keeping your own account secrets, which may be a twelve-word seed phrase, an account file, or other locally stored secret information. MetaMask encrypts this information locally with a password you provide, that we never send to our servers. You agree to (a) never use the same password for MetaMask that you have ever used outside of this service; (b) keep your secret information and password confidential and do not share them with anyone else; (c) immediately notify MetaMask of any unauthorized use of your account or breach of security. MetaMask cannot and will not be liable for any loss or damage arising from your failure to comply with this section.

5. Representations, Warranties, and Risks

5.1. Warranty Disclaimer

You expressly understand and agree that your use of the Service is at your sole risk. The Service (including the Service and the Content) are provided on an "AS IS" and "as available" basis, without warranties of any kind, either express or implied, including, without limitation, implied warranties of merchantability, fitness for a particular purpose or non-infringement. You acknowledge that MetaMask has no control over, and no duty to take any action regarding: which users gain access to or use the Service; what effects the Content may have on you; how you may interpret or use the Content; or what actions you may take as a result of having been exposed to the Content. You release MetaMask from all liability for you having acquired or not acquired Content through the Service. MetaMask makes no representations concerning any Content contained in or accessed through the Service, and MetaMask will not be responsible or liable for the accuracy, copyright compliance, legality or decency of material contained in or accessed through the Service.

5.2 Sophistication and Risk of Cryptographic Systems

By utilizing the Service or interacting with the Content or platform in any way, you represent that you understand the inherent risks associated with cryptographic systems; and warrant that you have an understanding of the usage and intricacies of native cryptographic tokens, like Ether (ETH) and Bitcoin (BTC), smart contract based tokens such as those that follow the Ethereum Token Standard (https://github.com/ethereum/EIPs/issues/20), and blockchain-based software systems.

5.3 Risk of Regulatory Actions in One or More Jurisdictions

MetaMask and ETH could be impacted by one or more regulatory inquiries or regulatory action, which could impede or limit the ability of MetaMask to continue to develop, or which could impede or limit your ability to access or use the Service or Ethereum blockchain.

5.4 Risk of Weaknesses or Exploits in the Field of Cryptography

You acknowledge and understand that Cryptography is a progressing field. Advances in code cracking or technical advances such as the development of quantum computers may present risks to cryptocurrencies and Services of Content, which could result in the theft or loss of your cryptographic tokens or property. To the extent possible, MetaMask intends to update the protocol underlying Services to account for any advances in cryptography and to incorporate additional security measures, but does not guarantee or otherwise represent full security of the system. By using the Service or accessing Content, you acknowledge these inherent risks.

5.5 Volatility of Crypto Currencies

You understand that Ethereum and other blockchain technologies and associated currencies or tokens are highly volatile due to many factors including but not limited to adoption, speculation, technology and security risks. You also acknowledge that the cost of transacting on such technologies is variable and may increase at any time causing impact to any activities taking place on the Ethereum blockchain. You acknowledge these risks and represent that MetaMask cannot be held liable for such fluctuations or increased costs.

5.6 Application Security

You acknowledge that Ethereum applications are code subject to flaws and acknowledge that you are solely responsible for evaluating any code provided by the Services or Content and the trustworthiness of any third-party websites, products, smart-contracts, or Content you access or use through the Service. You further expressly acknowledge and represent that Ethereum applications can be written maliciously or negligently, that MetaMask cannot be held liable for your interaction with such applications and that such applications may cause the loss of property or even identity. This warning and others later provided by MetaMask in no way evidence or represent an on-going duty to alert you to all of the potential risks of utilizing the Service or Content.

6. Indemnity

You agree to release and to indemnify, defend and hold harmless MetaMask and its parents, subsidiaries, affiliates and agencies, as well as the officers, directors, employees, shareholders and representatives of any of the foregoing entities, from and against any and all losses, liabilities, expenses, damages, costs (including attorneys’ fees and court costs) claims or actions of any kind whatsoever arising or resulting from your use of the Service, your violation of these Terms of Use, and any of your acts or omissions that implicate publicity rights, defamation or invasion of privacy. MetaMask reserves the right, at its own expense, to assume exclusive defense and control of any matter otherwise subject to indemnification by you and, in such case, you agree to cooperate with MetaMask in the defense of such matter.

7. Limitation on liability

YOU ACKNOWLEDGE AND AGREE THAT YOU ASSUME FULL RESPONSIBILITY FOR YOUR USE OF THE SITE AND SERVICE. YOU ACKNOWLEDGE AND AGREE THAT ANY INFORMATION YOU SEND OR RECEIVE DURING YOUR USE OF THE SITE AND SERVICE MAY NOT BE SECURE AND MAY BE INTERCEPTED OR LATER ACQUIRED BY UNAUTHORIZED PARTIES. YOU ACKNOWLEDGE AND AGREE THAT YOUR USE OF THE SITE AND SERVICE IS AT YOUR OWN RISK. RECOGNIZING SUCH, YOU UNDERSTAND AND AGREE THAT, TO THE FULLEST EXTENT PERMITTED BY APPLICABLE LAW, NEITHER METAMASK NOR ITS SUPPLIERS OR LICENSORS WILL BE LIABLE TO YOU FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY OR OTHER DAMAGES OF ANY KIND, INCLUDING WITHOUT LIMITATION DAMAGES FOR LOSS OF PROFITS, GOODWILL, USE, DATA OR OTHER TANGIBLE OR INTANGIBLE LOSSES OR ANY OTHER DAMAGES BASED ON CONTRACT, TORT, STRICT LIABILITY OR ANY OTHER THEORY (EVEN IF METAMASK HAD BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES), RESULTING FROM THE SITE OR SERVICE; THE USE OR THE INABILITY TO USE THE SITE OR SERVICE; UNAUTHORIZED ACCESS TO OR ALTERATION OF YOUR TRANSMISSIONS OR DATA; STATEMENTS OR CONDUCT OF ANY THIRD PARTY ON THE SITE OR SERVICE; ANY ACTIONS WE TAKE OR FAIL TO TAKE AS A RESULT OF COMMUNICATIONS YOU SEND TO US; HUMAN ERRORS; TECHNICAL MALFUNCTIONS; FAILURES, INCLUDING PUBLIC UTILITY OR TELEPHONE OUTAGES; OMISSIONS, INTERRUPTIONS, LATENCY, DELETIONS OR DEFECTS OF ANY DEVICE OR NETWORK, PROVIDERS, OR SOFTWARE (INCLUDING, BUT NOT LIMITED TO, THOSE THAT DO NOT PERMIT PARTICIPATION IN THE SERVICE); ANY INJURY OR DAMAGE TO COMPUTER EQUIPMENT; INABILITY TO FULLY ACCESS THE SITE OR SERVICE OR ANY OTHER WEBSITE; THEFT, TAMPERING, DESTRUCTION, OR UNAUTHORIZED ACCESS TO, IMAGES OR OTHER CONTENT OF ANY KIND; DATA THAT IS PROCESSED LATE OR INCORRECTLY OR IS INCOMPLETE OR LOST; TYPOGRAPHICAL, PRINTING OR OTHER ERRORS, OR ANY COMBINATION THEREOF; OR ANY OTHER MATTER RELATING TO THE SITE OR SERVICE.

SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF CERTAIN WARRANTIES OR THE LIMITATION OR EXCLUSION OF LIABILITY FOR INCIDENTAL OR CONSEQUENTIAL DAMAGES. ACCORDINGLY, SOME OF THE ABOVE LIMITATIONS MAY NOT APPLY TO YOU.

8. Our Proprietary Rights

All title, ownership and intellectual property rights in and to the Service are owned by MetaMask or its licensors. You acknowledge and agree that the Service contains proprietary and confidential information that is protected by applicable intellectual property and other laws. Except as expressly authorized by MetaMask, you agree not to copy, modify, rent, lease, loan, sell, distribute, perform, display or create derivative works based on the Service, in whole or in part. MetaMask issues a license for MetaMask, found here. For information on other licenses utilized in the development of MetaMask, please see our attribution page at: https://metamask.io/attributions.html

9. Links

The Service provides, or third parties may provide, links to other World Wide Web or accessible sites, applications or resources. Because MetaMask has no control over such sites, applications and resources, you acknowledge and agree that MetaMask is not responsible for the availability of such external sites, applications or resources, and does not endorse and is not responsible or liable for any content, advertising, products or other materials on or available from such sites or resources. You further acknowledge and agree that MetaMask shall not be responsible or liable, directly or indirectly, for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods or services available on or through any such site or resource.

10. Termination and Suspension

MetaMask may terminate or suspend all or part of the Service and your MetaMask access immediately, without prior notice or liability, if you breach any of the terms or conditions of the Terms. Upon termination of your access, your right to use the Service will immediately cease.

The following provisions of the Terms survive any termination of these Terms: INDEMNITY; WARRANTY DISCLAIMERS; LIMITATION ON LIABILITY; OUR PROPRIETARY RIGHTS; LINKS; TERMINATION; NO THIRD PARTY BENEFICIARIES; BINDING ARBITRATION AND CLASS ACTION WAIVER; GENERAL INFORMATION.

11. No Third Party Beneficiaries

You agree that, except as otherwise expressly provided in these Terms, there shall be no third party beneficiaries to the Terms.

12. Notice and Procedure For Making Claims of Copyright Infringement

If you believe that your copyright or the copyright of a person on whose behalf you are authorized to act has been infringed, please provide MetaMask’s Copyright Agent a written Notice containing the following information:

· an electronic or physical signature of the person authorized to act on behalf of the owner of the copyright or other intellectual property interest;

· a description of the copyrighted work or other intellectual property that you claim has been infringed;

· a description of where the material that you claim is infringing is located on the Service;

· your address, telephone number, and email address;

· a statement by you that you have a good faith belief that the disputed use is not authorized by the copyright owner, its agent, or the law;

· a statement by you, made under penalty of perjury, that the above information in your Notice is accurate and that you are the copyright or intellectual property owner or authorized to act on the copyright or intellectual property owner's behalf.

MetaMask’s Copyright Agent can be reached at:

Email: copyright at metamask dot io

Mail:

Attention:

MetaMask Copyright ℅ ConsenSys

49 Bogart Street

Brooklyn, NY 11206

13. Binding Arbitration and Class Action Waiver

PLEASE READ THIS SECTION CAREFULLY – IT MAY SIGNIFICANTLY AFFECT YOUR LEGAL RIGHTS, INCLUDING YOUR RIGHT TO FILE A LAWSUIT IN COURT

13.1 Initial Dispute Resolution

The parties shall use their best efforts to engage directly to settle any dispute, claim, question, or disagreement and engage in good faith negotiations which shall be a condition to either party initiating a lawsuit or arbitration.

13.2 Binding Arbitration

If the parties do not reach an agreed upon solution within a period of 30 days from the time informal dispute resolution under the Initial Dispute Resolution provision begins, then either party may initiate binding arbitration as the sole means to resolve claims, subject to the terms set forth below. Specifically, all claims arising out of or relating to these Terms (including their formation, performance and breach), the parties’ relationship with each other and/or your use of the Service shall be finally settled by binding arbitration administered by the American Arbitration Association in accordance with the provisions of its Commercial Arbitration Rules and the supplementary procedures for consumer related disputes of the American Arbitration Association (the "AAA"), excluding any rules or procedures governing or permitting class actions.

The arbitrator, and not any federal, state or local court or agency, shall have exclusive authority to resolve all disputes arising out of or relating to the interpretation, applicability, enforceability or formation of these Terms, including, but not limited to any claim that all or any part of these Terms are void or voidable, or whether a claim is subject to arbitration. The arbitrator shall be empowered to grant whatever relief would be available in a court under law or in equity. The arbitrator’s award shall be written, and binding on the parties and may be entered as a judgment in any court of competent jurisdiction.

The parties understand that, absent this mandatory provision, they would have the right to sue in court and have a jury trial. They further understand that, in some instances, the costs of arbitration could exceed the costs of litigation and the right to discovery may be more limited in arbitration than in court.

13.3 Location

Binding arbitration shall take place in New York. You agree to submit to the personal jurisdiction of any federal or state court in New York County, New York, in order to compel arbitration, to stay proceedings pending arbitration, or to confirm, modify, vacate or enter judgment on the award entered by the arbitrator.

13.4 Class Action Waiver

The parties further agree that any arbitration shall be conducted in their individual capacities only and not as a class action or other representative action, and the parties expressly waive their right to file a class action or seek relief on a class basis. YOU AND METAMASK AGREE THAT EACH MAY BRING CLAIMS AGAINST THE OTHER ONLY IN YOUR OR ITS INDIVIDUAL CAPACITY, AND NOT AS A PLAINTIFF OR CLASS MEMBER IN ANY PURPORTED CLASS OR REPRESENTATIVE PROCEEDING. If any court or arbitrator determines that the class action waiver set forth in this paragraph is void or unenforceable for any reason or that an arbitration can proceed on a class basis, then the arbitration provision set forth above shall be deemed null and void in its entirety and the parties shall be deemed to have not agreed to arbitrate disputes.

13.5 Exception - Litigation of Intellectual Property and Small Claims Court Claims

Notwithstanding the parties' decision to resolve all disputes through arbitration, either party may bring an action in state or federal court to protect its intellectual property rights ("intellectual property rights" means patents, copyrights, moral rights, trademarks, and trade secrets, but not privacy or publicity rights). Either party may also seek relief in a small claims court for disputes or claims within the scope of that court’s jurisdiction.

13.6 30-Day Right to Opt Out

You have the right to opt-out and not be bound by the arbitration and class action waiver provisions set forth above by sending written notice of your decision to opt-out to the following address: MetaMask ℅ ConsenSys, 49 Bogart Street, Brooklyn NY 11206 and via email at legal-opt@metamask.io. The notice must be sent within 30 days of September 6, 2016 or your first use of the Service, whichever is later, otherwise you shall be bound to arbitrate disputes in accordance with the terms of those paragraphs. If you opt-out of these arbitration provisions, MetaMask also will not be bound by them.

13.7 Changes to This Section

MetaMask will provide 60-days’ notice of any changes to this section. Changes will become effective on the 60th day, and will apply prospectively only to any claims arising after the 60th day.

For any dispute not subject to arbitration you and MetaMask agree to submit to the personal and exclusive jurisdiction of and venue in the federal and state courts located in New York, New York. You further agree to accept service of process by mail, and hereby waive any and all jurisdictional and venue defenses otherwise available.

The Terms and the relationship between you and MetaMask shall be governed by the laws of the State of New York without regard to conflict of law provisions.

14. General Information

14.1 Entire Agreement

These Terms (and any additional terms, rules and conditions of participation that MetaMask may post on the Service) constitute the entire agreement between you and MetaMask with respect to the Service and supersedes any prior agreements, oral or written, between you and MetaMask. In the event of a conflict between these Terms and the additional terms, rules and conditions of participation, the latter will prevail over the Terms to the extent of the conflict.

14.2 Waiver and Severability of Terms

The failure of MetaMask to exercise or enforce any right or provision of the Terms shall not constitute a waiver of such right or provision. If any provision of the Terms is found by an arbitrator or court of competent jurisdiction to be invalid, the parties nevertheless agree that the arbitrator or court should endeavor to give effect to the parties' intentions as reflected in the provision, and the other provisions of the Terms remain in full force and effect.

14.3 Statute of Limitations

You agree that regardless of any statute or law to the contrary, any claim or cause of action arising out of or related to the use of the Service or the Terms must be filed within one (1) year after such claim or cause of action arose or be forever barred.

14.4 Section Titles

The section titles in the Terms are for convenience only and have no legal or contractual effect.

14.5 Communications

Users with questions, complaints or claims with respect to the Service may contact us using the relevant contact information set forth above and at communications@metamask.io.

15 Related Links

Terms of Use

Privacy

Attributions

+Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got SHOW_LOADING_INDICATION' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'SHOW_LOADING_INDICATION', value: undefined} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'background.markNoticeRead' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got SET_MOUSE_USER_STATE' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'SET_MOUSE_USER_STATE', value: true} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'Main ui render function' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'rendering primary' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: true, seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert', noActiveNotices: false, address: '0x77abfc38dea988c2f9602daa758867918b877f3a', forgottenPassword: undefined, isLoading: true, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.state*************************', Object{screenType: 'notice'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************isLoading*************************', true +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got HIDE_LOADING_INDICATION' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'Main ui render function' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'rendering primary' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: true, seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert', noActiveNotices: false, address: '0x77abfc38dea988c2f9602daa758867918b877f3a', forgottenPassword: undefined, isLoading: false, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.state*************************', Object{screenType: 'notice'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************isLoading*************************', false +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '**************************************************************************' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'HIDE_LOADING_INDICATION'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got CLEAR_NOTICES' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'Main ui render function' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'rendering primary' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: true, seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert', noActiveNotices: true, address: '0x77abfc38dea988c2f9602daa758867918b877f3a', forgottenPassword: undefined, isLoading: false, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.state*************************', Object{screenType: 'notice'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************isLoading*************************', false +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '**************************************************************************' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'CLEAR_NOTICES'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: true, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +ERROR: 'Warning: setState(...): Can only update a mounted or mounting component. This usually means you called setState() on an unmounted component. This is a no-op. Please check the code for the NoticeScreen component.' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: true, seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert', noActiveNotices: true, address: '0x77abfc38dea988c2f9602daa758867918b877f3a', forgottenPassword: undefined, isLoading: false, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************this.state*************************', Object{screenType: 'back_up_phrase'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '*************************isLoading*************************', false +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '**************************************************************************' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'App Reducer got UPDATE_METAMASK_STATE' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx-helper called with params:' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unapproved txs' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned personal messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'tx helper found 0 unsigned typed messages' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'Main ui render function' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'rendering primary' +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: true, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_METAMASK_STATE', value: Object{isInitialized: true, provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', unapprovedTxs: Object{}, selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, isUnlocked: true, keyringTypes: [..., ...], keyrings: [...], identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, computedBalances: Object{}, frequentRpcList: [], currentAccountTab: 'history', tokens: [], useBlockie: false, featureFlags: Object{betaUI: ...}, selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', addressBook: [], currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, noActiveNotices: true, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: true, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +LOG: 'document.body', + + + + + + + + + + + + +
Created with Raphaël 2.2.0
Secret Backup Phrase
Your secret backup phrase makes it easy to back up and restore your account.
WARNING: Never disclose your backup phrase. Anyone with this phrase can take your Ether forever.
seven lobster found cream soccer country indicate history track yellow chat desert
Tips:
Store this phrase in a password manager like 1password.
Write this phrase on a piece of paper and store in a secure location. If you want even more security, write it down on multiple pieces of paper and store each in 2 - 3 different locations.
Memorize this phrase.
+Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) +Chrome 64.0.3282 (Mac OS X 10.12.6) ERROR + Uncaught TypeError: Cannot read property 'scrollTop' of null + at dist/mascara/ui.js:2311 +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 ERROR (0 secs / 0 secs) +Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 ERROR (16.275 secs / 0 secs) -- cgit v1.2.3 From 6740be109be1b545e1efa327901c6ac4a46b8bf0 Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 20 Feb 2018 16:17:30 -0330 Subject: Temporarily disable loading indicator. --- mascara/src/app/first-time/index.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mascara/src/app/first-time/index.js b/mascara/src/app/first-time/index.js index a05e0aa96..46b821c8b 100644 --- a/mascara/src/app/first-time/index.js +++ b/mascara/src/app/first-time/index.js @@ -89,9 +89,10 @@ class FirstTimeFlow extends Component { leaveImportSeedScreenState, } = this.props - if (isLoading) { - return () - } + // Disable until testing bug resolved + // if (isLoading) { + // return () + // } switch (this.state.screenType) { case SCREEN_TYPE.CREATE_PASSWORD: -- cgit v1.2.3 From a1b72e5252e15113c98180194cfa7f1640bde08e Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Tue, 20 Feb 2018 13:51:06 -0800 Subject: Try fixing notice screen synchronous state call --- ui/app/components/notice.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ui/app/components/notice.js b/ui/app/components/notice.js index 941ac33e6..9d2e89cb0 100644 --- a/ui/app/components/notice.js +++ b/ui/app/components/notice.js @@ -105,8 +105,7 @@ Notice.prototype.render = function () { h('button.primary', { disabled, onClick: () => { - this.setState({disclaimerDisabled: true}) - onConfirm() + this.setState({disclaimerDisabled: true}, () => onConfirm()) }, style: { marginTop: '18px', -- cgit v1.2.3 From 16f9ddc72c4a1c49402ea3b883a0e580c19f0651 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Tue, 20 Feb 2018 15:44:04 -0800 Subject: Add 8MM gas limit default to send screen --- old-ui/app/components/pending-tx.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/old-ui/app/components/pending-tx.js b/old-ui/app/components/pending-tx.js index 10208b5ce..720df2243 100644 --- a/old-ui/app/components/pending-tx.js +++ b/old-ui/app/components/pending-tx.js @@ -60,7 +60,8 @@ PendingTx.prototype.render = function () { // Gas const gas = txParams.gas const gasBn = hexToBn(gas) - const gasLimit = new BN(parseInt(blockGasLimit)) + // default to 8MM gas limit + const gasLimit = new BN(parseInt(blockGasLimit) || '8000000') const safeGasLimitBN = this.bnMultiplyByFraction(gasLimit, 19, 20) const saferGasLimitBN = this.bnMultiplyByFraction(gasLimit, 18, 20) const safeGasLimit = safeGasLimitBN.toString(10) -- cgit v1.2.3 From 98d3fba3efaedb65ee0cf60b4cc3f954a1fd9740 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Tue, 20 Feb 2018 15:45:48 -0800 Subject: Fix promise construction --- app/scripts/lib/nonce-tracker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/lib/nonce-tracker.js b/app/scripts/lib/nonce-tracker.js index 0029ac953..ed9dd3f11 100644 --- a/app/scripts/lib/nonce-tracker.js +++ b/app/scripts/lib/nonce-tracker.js @@ -56,7 +56,7 @@ class NonceTracker { const blockTracker = this._getBlockTracker() const currentBlock = blockTracker.getCurrentBlock() if (currentBlock) return currentBlock - return await Promise((reject, resolve) => { + return await new Promise((reject, resolve) => { blockTracker.once('latest', resolve) }) } -- cgit v1.2.3 From 66f55f954e9f3868396e478fd79c4bbd8f8673e5 Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 20 Feb 2018 20:51:45 -0330 Subject: Render loading inside notice screen, and don't set isLoading from unMarkPasswordForgotten. --- mascara/src/app/first-time/index.js | 11 -------- mascara/src/app/first-time/notice-screen.js | 44 ++++++++++++++++------------- ui/app/actions.js | 1 - 3 files changed, 24 insertions(+), 32 deletions(-) diff --git a/mascara/src/app/first-time/index.js b/mascara/src/app/first-time/index.js index 46b821c8b..da2f6bab9 100644 --- a/mascara/src/app/first-time/index.js +++ b/mascara/src/app/first-time/index.js @@ -7,7 +7,6 @@ import NoticeScreen from './notice-screen' import BackupPhraseScreen from './backup-phrase-screen' import ImportAccountScreen from './import-account-screen' import ImportSeedPhraseScreen from './import-seed-phrase-screen' -const Loading = require('../../../../ui/app/components/loading') import { onboardingBuyEthView, unMarkPasswordForgotten, @@ -85,15 +84,9 @@ class FirstTimeFlow extends Component { address, restoreCreatePasswordScreen, forgottenPassword, - isLoading, leaveImportSeedScreenState, } = this.props - // Disable until testing bug resolved - // if (isLoading) { - // return () - // } - switch (this.state.screenType) { case SCREEN_TYPE.CREATE_PASSWORD: return ( @@ -164,9 +157,6 @@ export default connect( noActiveNotices, selectedAddress, forgottenPassword, - }, - appState: { - isLoading, } }) => ({ isInitialized, @@ -174,7 +164,6 @@ export default connect( noActiveNotices, address: selectedAddress, forgottenPassword, - isLoading, }), dispatch => ({ leaveImportSeedScreenState: () => dispatch(unMarkPasswordForgotten()), diff --git a/mascara/src/app/first-time/notice-screen.js b/mascara/src/app/first-time/notice-screen.js index e691a2f47..0f0a7e95d 100644 --- a/mascara/src/app/first-time/notice-screen.js +++ b/mascara/src/app/first-time/notice-screen.js @@ -6,6 +6,7 @@ import debounce from 'lodash.debounce' import {markNoticeRead} from '../../../../ui/app/actions' import Identicon from '../../../../ui/app/components/identicon' import Breadcrumbs from './breadcrumbs' +import LoadingScreen from './loading-screen' class NoticeScreen extends Component { static propTypes = { @@ -55,36 +56,39 @@ class NoticeScreen extends Component { const { address, lastUnreadNotice: { title, body }, + isLoading, } = this.props const { atBottom } = this.state return ( -
- -
{title}
- - - -
+ +
{title}
+ + + + ) } } export default connect( - ({ metamask: { selectedAddress, lastUnreadNotice } }) => ({ + ({ metamask: { selectedAddress, lastUnreadNotice }, appState: { isLoading } }) => ({ lastUnreadNotice, address: selectedAddress, }), diff --git a/ui/app/actions.js b/ui/app/actions.js index 4bc1f379e..64d5b67e0 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -853,7 +853,6 @@ function markPasswordForgotten () { function unMarkPasswordForgotten () { return (dispatch) => { return background.unMarkPasswordForgotten(() => { - dispatch(actions.hideLoadingIndication()) dispatch(actions.forgotPassword()) forceUpdateMetamaskState(dispatch) }) -- cgit v1.2.3 From b1b97727313eaa3a375541e85f43b5f2253ad6de Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 20 Feb 2018 21:34:55 -0330 Subject: Fix old-ui active notices width. --- old-ui/app/app.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/old-ui/app/app.js b/old-ui/app/app.js index 61f6223bc..c79ac633a 100644 --- a/old-ui/app/app.js +++ b/old-ui/app/app.js @@ -456,7 +456,9 @@ App.prototype.renderPrimary = function () { // notices if (!props.noActiveNotices) { log.debug('rendering notice screen for unread notices.') - return h('div', [ + return h('div', { + style: { width: '100%' }, + }, [ h(NoticeScreen, { notice: props.lastUnreadNotice, -- cgit v1.2.3 From 84c023ba40b11ace63e2f2281a7c0ef1e1f2f3cb Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Tue, 20 Feb 2018 19:52:32 -0800 Subject: Use same logic for downloading state logs in the old/uat --- ui/app/settings.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ui/app/settings.js b/ui/app/settings.js index 988ddea8d..466f739d5 100644 --- a/ui/app/settings.js +++ b/ui/app/settings.js @@ -201,7 +201,13 @@ class Settings extends Component { h('div.settings__content-item-col', [ h('button.settings__clear-button', { onClick (event) { - exportAsFile('MetaMask State Logs', window.logState()) + window.logStateString((err, result) => { + if (err) { + this.state.dispatch(actions.displayWarning('Error in retrieving state logs.')) + } else { + exportAsFile('MetaMask State Logs.json', result) + } + }) }, }, 'Download State Logs'), ]), -- cgit v1.2.3 From c26c57fad774e21fcb0b817227e9d0d99418f8a0 Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Tue, 20 Feb 2018 20:09:32 -0800 Subject: Remove output file --- output | 1889 ---------------------------------------------------------------- 1 file changed, 1889 deletions(-) delete mode 100644 output diff --git a/output b/output deleted file mode 100644 index dfb259888..000000000 --- a/output +++ /dev/null @@ -1,1889 +0,0 @@ - -> metamask-crx@0.0.0 test:mascara /Users/danmiller/kyokan/metamask/metamask-extension -> npm run test:mascara:build && karma start test/mascara.conf.js - - -> metamask-crx@0.0.0 test:mascara:build /Users/danmiller/kyokan/metamask/metamask-extension -> mkdir -p dist/mascara && npm run test:mascara:build:ui && npm run test:mascara:build:background && npm run test:mascara:build:tests - - -> metamask-crx@0.0.0 test:mascara:build:ui /Users/danmiller/kyokan/metamask/metamask-extension -> browserify mascara/test/test-ui.js -o dist/mascara/ui.js - - -> metamask-crx@0.0.0 test:mascara:build:background /Users/danmiller/kyokan/metamask/metamask-extension -> browserify mascara/src/background.js -o dist/mascara/background.js - - -> metamask-crx@0.0.0 test:mascara:build:tests /Users/danmiller/kyokan/metamask/metamask-extension -> browserify test/integration/lib/first-time.js -o dist/mascara/tests.js - -20 02 2018 15:29:25.773:INFO [karma]: Karma v1.7.1 server started at http://0.0.0.0:9876/ -20 02 2018 15:29:25.776:INFO [launcher]: Launching browser Chrome with concurrency 1 -20 02 2018 15:29:25.822:INFO [launcher]: Starting browser Chrome -20 02 2018 15:29:31.117:INFO [Chrome 64.0.3282 (Mac OS X 10.12.6)]: Connected on socket xl57FfHdT0vJ5kbQAAAA with id 3100832 -Chrome 64.0.3282 (Mac OS X 10.12.6) WARN: 'Warning: Accessing PropTypes via the main React package is deprecated, and will be removed in React v16.0. Use the latest available v15.* prop-types package from npm instead. For info on usage, compatibility, migration and more, see https://fb.me/prop-types-docs' - -Chrome 64.0.3282 (Mac OS X 10.12.6) WARN: 'Warning: Accessing createClass via the main React package is deprecated, and will be removed in React v16.0. Use a plain JavaScript class instead. If you're not yet ready to migrate, create-react-class v15.* is available on npm as a temporary, drop-in replacement. For more info see https://fb.me/react-create-class' - - -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got @@redux/INIT' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'background.setNetworkEndpoints' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'Main ui render function' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'rendering primary' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: false, seedWords: '', noActiveNotices: false, address: undefined, forgottenPassword: undefined, isLoading: false, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.state*************************', Object{screenType: 'create_password'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************isLoading*************************', false -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '**************************************************************************' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'hello from MetaMascara ui!' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'hello from cb ready event!' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got UPDATE_NETWORK_ENDPOINT_TYPE' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: false}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_NETWORK_ENDPOINT_TYPE', value: 'network'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: false}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'No more notices...' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got UPDATE_METAMASK_STATE' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'Main ui render function' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'rendering primary' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: false}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_METAMASK_STATE', value: Object{isInitialized: false, provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', unapprovedTxs: Object{}, selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, isUnlocked: false, keyringTypes: [..., ...], keyrings: [], identities: Object{}, computedBalances: Object{}, frequentRpcList: [], currentAccountTab: 'history', tokens: [], useBlockie: false, featureFlags: Object{}, addressBook: [], currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, noActiveNotices: false, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: false}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got UPDATE_METAMASK_STATE' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'Main ui render function' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'rendering primary' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: false}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_METAMASK_STATE', value: Object{isInitialized: false, provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', unapprovedTxs: Object{}, selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, isUnlocked: false, keyringTypes: [..., ...], keyrings: [], identities: Object{}, computedBalances: Object{}, frequentRpcList: [], currentAccountTab: 'history', tokens: [], useBlockie: false, featureFlags: Object{}, addressBook: [], currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, noActiveNotices: false, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: false}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got UPDATE_METAMASK_STATE' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'Main ui render function' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'rendering primary' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: false}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_METAMASK_STATE', value: Object{isInitialized: false, provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', unapprovedTxs: Object{}, selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, isUnlocked: false, keyringTypes: [..., ...], keyrings: [], identities: Object{}, computedBalances: Object{}, frequentRpcList: [], currentAccountTab: 'history', tokens: [], useBlockie: false, featureFlags: Object{}, addressBook: [], currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, noActiveNotices: false, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: false}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got UPDATE_METAMASK_STATE' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'Main ui render function' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'rendering primary' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: false}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_METAMASK_STATE', value: Object{isInitialized: false, provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', unapprovedTxs: Object{}, selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, isUnlocked: false, keyringTypes: [..., ...], keyrings: [], identities: Object{}, computedBalances: Object{}, frequentRpcList: [], currentAccountTab: 'history', tokens: [], useBlockie: false, featureFlags: Object{}, addressBook: [], currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, noActiveNotices: false, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: false}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got UPDATE_METAMASK_STATE' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'Main ui render function' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'rendering primary' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: false}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_METAMASK_STATE', value: Object{isInitialized: false, provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', unapprovedTxs: Object{}, selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, isUnlocked: false, keyringTypes: [..., ...], keyrings: [], identities: Object{}, computedBalances: Object{}, frequentRpcList: [], currentAccountTab: 'history', tokens: [], useBlockie: false, featureFlags: Object{}, addressBook: [], currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, noActiveNotices: false, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: false}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got SHOW_LOADING_INDICATION' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: false}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'SHOW_LOADING_INDICATION', value: undefined} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: false, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'background.createNewVaultAndKeychain' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got SET_MOUSE_USER_STATE' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: false, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'SET_MOUSE_USER_STATE', value: true} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'Main ui render function' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'rendering primary' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: false, seedWords: '', noActiveNotices: false, address: undefined, forgottenPassword: undefined, isLoading: true, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.state*************************', Object{screenType: 'create_password'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************isLoading*************************', true -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'background.placeSeedWords' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got HIDE_LOADING_INDICATION' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'Main ui render function' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'rendering primary' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: false, seedWords: '', noActiveNotices: false, address: undefined, forgottenPassword: undefined, isLoading: false, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.state*************************', Object{screenType: 'create_password'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************isLoading*************************', false -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '**************************************************************************' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'HIDE_LOADING_INDICATION'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'background.getState' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: false, seedWords: '', noActiveNotices: false, address: undefined, forgottenPassword: undefined, isLoading: false, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.state*************************', Object{screenType: 'unique_image'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************isLoading*************************', false -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '**************************************************************************' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got UPDATE_METAMASK_STATE' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got SHOW_LOADING_INDICATION' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: false, isUnlocked: false, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: []}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_METAMASK_STATE', value: Object{isInitialized: true, provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', unapprovedTxs: Object{}, selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, isUnlocked: true, keyringTypes: [..., ...], keyrings: [...], identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, computedBalances: Object{}, frequentRpcList: [], currentAccountTab: 'history', tokens: [], useBlockie: false, featureFlags: Object{}, selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', addressBook: [], currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, noActiveNotices: false, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'SHOW_LOADING_INDICATION', value: undefined} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'Main ui render function' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'rendering primary' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: true, seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert', noActiveNotices: false, address: '0x77abfc38dea988c2f9602daa758867918b877f3a', forgottenPassword: undefined, isLoading: true, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.state*************************', Object{screenType: 'unique_image'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************isLoading*************************', true -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got HIDE_LOADING_INDICATION' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'Main ui render function' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'rendering primary' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: true, seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert', noActiveNotices: false, address: '0x77abfc38dea988c2f9602daa758867918b877f3a', forgottenPassword: undefined, isLoading: false, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.state*************************', Object{screenType: 'unique_image'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************isLoading*************************', false -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '**************************************************************************' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'HIDE_LOADING_INDICATION'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got UPDATE_FEATURE_FLAGS' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got SHOW_LOADING_INDICATION' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_FEATURE_FLAGS', value: Object{betaUI: true}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'SHOW_LOADING_INDICATION', value: undefined} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'Main ui render function' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'rendering primary' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: true, seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert', noActiveNotices: false, address: '0x77abfc38dea988c2f9602daa758867918b877f3a', forgottenPassword: undefined, isLoading: true, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.state*************************', Object{screenType: 'unique_image'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************isLoading*************************', true -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'background.setNetworkEndpoints' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got HIDE_LOADING_INDICATION' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'Main ui render function' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'rendering primary' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: true, seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert', noActiveNotices: false, address: '0x77abfc38dea988c2f9602daa758867918b877f3a', forgottenPassword: undefined, isLoading: false, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.state*************************', Object{screenType: 'unique_image'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************isLoading*************************', false -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '**************************************************************************' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'HIDE_LOADING_INDICATION'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got UPDATE_FEATURE_FLAGS' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_FEATURE_FLAGS', value: Object{betaUI: true}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'background.setNetworkEndpoints' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got UPDATE_NETWORK_ENDPOINT_TYPE' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'network', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_NETWORK_ENDPOINT_TYPE', value: 'networkBeta'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got UPDATE_NETWORK_ENDPOINT_TYPE' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_NETWORK_ENDPOINT_TYPE', value: 'networkBeta'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got SET_MOUSE_USER_STATE' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'SET_MOUSE_USER_STATE', value: true} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: true, seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert', noActiveNotices: false, address: '0x77abfc38dea988c2f9602daa758867918b877f3a', forgottenPassword: undefined, isLoading: false, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.state*************************', Object{screenType: 'notice'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************isLoading*************************', false -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '**************************************************************************' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'document.body', - - - - - - - - - - - - -
Created with Raphaël 2.2.0
Privacy Notice

MetaMask is beta software.

When you log in to MetaMask, your current account is visible to every new site you visit.

For your privacy, for now, please sign out of MetaMask when you're done using a site.

-Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got UPDATE_METAMASK_STATE' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'Main ui render function' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'rendering primary' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_METAMASK_STATE', value: Object{isInitialized: true, provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', unapprovedTxs: Object{}, selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, isUnlocked: true, keyringTypes: [..., ...], keyrings: [...], identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, computedBalances: Object{}, frequentRpcList: [], currentAccountTab: 'history', tokens: [], useBlockie: false, featureFlags: Object{betaUI: ...}, selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', addressBook: [], currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, noActiveNotices: false, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got SHOW_LOADING_INDICATION' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'SHOW_LOADING_INDICATION', value: undefined} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'background.markNoticeRead' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got SET_MOUSE_USER_STATE' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'SET_MOUSE_USER_STATE', value: true} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'Main ui render function' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'rendering primary' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: true, seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert', noActiveNotices: false, address: '0x77abfc38dea988c2f9602daa758867918b877f3a', forgottenPassword: undefined, isLoading: true, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.state*************************', Object{screenType: 'notice'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************isLoading*************************', true -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got HIDE_LOADING_INDICATION' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'Main ui render function' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'rendering primary' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: true, seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert', noActiveNotices: false, address: '0x77abfc38dea988c2f9602daa758867918b877f3a', forgottenPassword: undefined, isLoading: false, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.state*************************', Object{screenType: 'notice'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************isLoading*************************', false -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '**************************************************************************' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'HIDE_LOADING_INDICATION'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got SHOW_NOTICE' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'Main ui render function' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'rendering primary' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'SHOW_NOTICE', value: Object{read: false, date: 'Thu Feb 09 2017', title: 'Terms of Use', body: '# Terms of Use # - -**THIS AGREEMENT IS SUBJECT TO BINDING ARBITRATION AND A WAIVER OF CLASS ACTION RIGHTS AS DETAILED IN SECTION 13. PLEASE READ THE AGREEMENT CAREFULLY.** - -_Our Terms of Use have been updated as of September 5, 2016_ - -## 1. Acceptance of Terms ## - -MetaMask provides a platform for managing Ethereum (or "ETH") accounts, and allowing ordinary websites to interact with the Ethereum blockchain, while keeping the user in control over what transactions they approve, through our website located at[ ](http://metamask.io)[https://metamask.io/](https://metamask.io/) and browser plugin (the "Site") — which includes text, images, audio, code and other materials (collectively, the “Content”) and all of the features, and services provided. The Site, and any other features, tools, materials, or other services offered from time to time by MetaMask are referred to here as the “Service.” Please read these Terms of Use (the “Terms” or “Terms of Use”) carefully before using the Service. By using or otherwise accessing the Services, or clicking to accept or agree to these Terms where that option is made available, you (1) accept and agree to these Terms (2) consent to the collection, use, disclosure and other handling of information as described in our Privacy Policy and (3) any additional terms, rules and conditions of participation issued by MetaMask from time to time. If you do not agree to the Terms, then you may not access or use the Content or Services. - -## 2. Modification of Terms of Use ## - -Except for Section 13, providing for binding arbitration and waiver of class action rights, MetaMask reserves the right, at its sole discretion, to modify or replace the Terms of Use at any time. The most current version of these Terms will be posted on our Site. You shall be responsible for reviewing and becoming familiar with any such modifications. Use of the Services by you after any modification to the Terms constitutes your acceptance of the Terms of Use as modified. - - - -## 3. Eligibility ## - -You hereby represent and warrant that you are fully able and competent to enter into the terms, conditions, obligations, affirmations, representations and warranties set forth in these Terms and to abide by and comply with these Terms. - -MetaMask is a global platform and by accessing the Content or Services, you are representing and warranting that, you are of the legal age of majority in your jurisdiction as is required to access such Services and Content and enter into arrangements as provided by the Service. You further represent that you are otherwise legally permitted to use the service in your jurisdiction including owning cryptographic tokens of value, and interacting with the Services or Content in any way. You further represent you are responsible for ensuring compliance with the laws of your jurisdiction and acknowledge that MetaMask is not liable for your compliance with such laws. - -## 4 Account Password and Security ## - -When setting up an account within MetaMask, you will be responsible for keeping your own account secrets, which may be a twelve-word seed phrase, an account file, or other locally stored secret information. MetaMask encrypts this information locally with a password you provide, that we never send to our servers. You agree to (a) never use the same password for MetaMask that you have ever used outside of this service; (b) keep your secret information and password confidential and do not share them with anyone else; (c) immediately notify MetaMask of any unauthorized use of your account or breach of security. MetaMask cannot and will not be liable for any loss or damage arising from your failure to comply with this section. - -## 5. Representations, Warranties, and Risks ## - -### 5.1. Warranty Disclaimer ### - -You expressly understand and agree that your use of the Service is at your sole risk. The Service (including the Service and the Content) are provided on an "AS IS" and "as available" basis, without warranties of any kind, either express or implied, including, without limitation, implied warranties of merchantability, fitness for a particular purpose or non-infringement. You acknowledge that MetaMask has no control over, and no duty to take any action regarding: which users gain access to or use the Service; what effects the Content may have on you; how you may interpret or use the Content; or what actions you may take as a result of having been exposed to the Content. You release MetaMask from all liability for you having acquired or not acquired Content through the Service. MetaMask makes no representations concerning any Content contained in or accessed through the Service, and MetaMask will not be responsible or liable for the accuracy, copyright compliance, legality or decency of material contained in or accessed through the Service. - -### 5.2 Sophistication and Risk of Cryptographic Systems ### - -By utilizing the Service or interacting with the Content or platform in any way, you represent that you understand the inherent risks associated with cryptographic systems; and warrant that you have an understanding of the usage and intricacies of native cryptographic tokens, like Ether (ETH) and Bitcoin (BTC), smart contract based tokens such as those that follow the Ethereum Token Standard (https://github.com/ethereum/EIPs/issues/20), and blockchain-based software systems. - -### 5.3 Risk of Regulatory Actions in One or More Jurisdictions ### - -MetaMask and ETH could be impacted by one or more regulatory inquiries or regulatory action, which could impede or limit the ability of MetaMask to continue to develop, or which could impede or limit your ability to access or use the Service or Ethereum blockchain. - -### 5.4 Risk of Weaknesses or Exploits in the Field of Cryptography ### - -You acknowledge and understand that Cryptography is a progressing field. Advances in code cracking or technical advances such as the development of quantum computers may present risks to cryptocurrencies and Services of Content, which could result in the theft or loss of your cryptographic tokens or property. To the extent possible, MetaMask intends to update the protocol underlying Services to account for any advances in cryptography and to incorporate additional security measures, but does not guarantee or otherwise represent full security of the system. By using the Service or accessing Content, you acknowledge these inherent risks. - -### 5.5 Volatility of Crypto Currencies ### - -You understand that Ethereum and other blockchain technologies and associated currencies or tokens are highly volatile due to many factors including but not limited to adoption, speculation, technology and security risks. You also acknowledge that the cost of transacting on such technologies is variable and may increase at any time causing impact to any activities taking place on the Ethereum blockchain. You acknowledge these risks and represent that MetaMask cannot be held liable for such fluctuations or increased costs. - -### 5.6 Application Security ### - -You acknowledge that Ethereum applications are code subject to flaws and acknowledge that you are solely responsible for evaluating any code provided by the Services or Content and the trustworthiness of any third-party websites, products, smart-contracts, or Content you access or use through the Service. You further expressly acknowledge and represent that Ethereum applications can be written maliciously or negligently, that MetaMask cannot be held liable for your interaction with such applications and that such applications may cause the loss of property or even identity. This warning and others later provided by MetaMask in no way evidence or represent an on-going duty to alert you to all of the potential risks of utilizing the Service or Content. - -## 6. Indemnity ## - -You agree to release and to indemnify, defend and hold harmless MetaMask and its parents, subsidiaries, affiliates and agencies, as well as the officers, directors, employees, shareholders and representatives of any of the foregoing entities, from and against any and all losses, liabilities, expenses, damages, costs (including attorneys’ fees and court costs) claims or actions of any kind whatsoever arising or resulting from your use of the Service, your violation of these Terms of Use, and any of your acts or omissions that implicate publicity rights, defamation or invasion of privacy. MetaMask reserves the right, at its own expense, to assume exclusive defense and control of any matter otherwise subject to indemnification by you and, in such case, you agree to cooperate with MetaMask in the defense of such matter. - -## 7. Limitation on liability ## - -YOU ACKNOWLEDGE AND AGREE THAT YOU ASSUME FULL RESPONSIBILITY FOR YOUR USE OF THE SITE AND SERVICE. YOU ACKNOWLEDGE AND AGREE THAT ANY INFORMATION YOU SEND OR RECEIVE DURING YOUR USE OF THE SITE AND SERVICE MAY NOT BE SECURE AND MAY BE INTERCEPTED OR LATER ACQUIRED BY UNAUTHORIZED PARTIES. YOU ACKNOWLEDGE AND AGREE THAT YOUR USE OF THE SITE AND SERVICE IS AT YOUR OWN RISK. RECOGNIZING SUCH, YOU UNDERSTAND AND AGREE THAT, TO THE FULLEST EXTENT PERMITTED BY APPLICABLE LAW, NEITHER METAMASK NOR ITS SUPPLIERS OR LICENSORS WILL BE LIABLE TO YOU FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY OR OTHER DAMAGES OF ANY KIND, INCLUDING WITHOUT LIMITATION DAMAGES FOR LOSS OF PROFITS, GOODWILL, USE, DATA OR OTHER TANGIBLE OR INTANGIBLE LOSSES OR ANY OTHER DAMAGES BASED ON CONTRACT, TORT, STRICT LIABILITY OR ANY OTHER THEORY (EVEN IF METAMASK HAD BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES), RESULTING FROM THE SITE OR SERVICE; THE USE OR THE INABILITY TO USE THE SITE OR SERVICE; UNAUTHORIZED ACCESS TO OR ALTERATION OF YOUR TRANSMISSIONS OR DATA; STATEMENTS OR CONDUCT OF ANY THIRD PARTY ON THE SITE OR SERVICE; ANY ACTIONS WE TAKE OR FAIL TO TAKE AS A RESULT OF COMMUNICATIONS YOU SEND TO US; HUMAN ERRORS; TECHNICAL MALFUNCTIONS; FAILURES, INCLUDING PUBLIC UTILITY OR TELEPHONE OUTAGES; OMISSIONS, INTERRUPTIONS, LATENCY, DELETIONS OR DEFECTS OF ANY DEVICE OR NETWORK, PROVIDERS, OR SOFTWARE (INCLUDING, BUT NOT LIMITED TO, THOSE THAT DO NOT PERMIT PARTICIPATION IN THE SERVICE); ANY INJURY OR DAMAGE TO COMPUTER EQUIPMENT; INABILITY TO FULLY ACCESS THE SITE OR SERVICE OR ANY OTHER WEBSITE; THEFT, TAMPERING, DESTRUCTION, OR UNAUTHORIZED ACCESS TO, IMAGES OR OTHER CONTENT OF ANY KIND; DATA THAT IS PROCESSED LATE OR INCORRECTLY OR IS INCOMPLETE OR LOST; TYPOGRAPHICAL, PRINTING OR OTHER ERRORS, OR ANY COMBINATION THEREOF; OR ANY OTHER MATTER RELATING TO THE SITE OR SERVICE. - -SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF CERTAIN WARRANTIES OR THE LIMITATION OR EXCLUSION OF LIABILITY FOR INCIDENTAL OR CONSEQUENTIAL DAMAGES. ACCORDINGLY, SOME OF THE ABOVE LIMITATIONS MAY NOT APPLY TO YOU. - -## 8. Our Proprietary Rights ## - -All title, ownership and intellectual property rights in and to the Service are owned by MetaMask or its licensors. You acknowledge and agree that the Service contains proprietary and confidential information that is protected by applicable intellectual property and other laws. Except as expressly authorized by MetaMask, you agree not to copy, modify, rent, lease, loan, sell, distribute, perform, display or create derivative works based on the Service, in whole or in part. MetaMask issues a license for MetaMask, found [here](https://github.com/MetaMask/metamask-plugin/blob/master/LICENSE). For information on other licenses utilized in the development of MetaMask, please see our attribution page at: [https://metamask.io/attributions.html](https://metamask.io/attributions.html) - -## 9. Links ## - -The Service provides, or third parties may provide, links to other World Wide Web or accessible sites, applications or resources. Because MetaMask has no control over such sites, applications and resources, you acknowledge and agree that MetaMask is not responsible for the availability of such external sites, applications or resources, and does not endorse and is not responsible or liable for any content, advertising, products or other materials on or available from such sites or resources. You further acknowledge and agree that MetaMask shall not be responsible or liable, directly or indirectly, for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods or services available on or through any such site or resource. - -## 10. Termination and Suspension ## - -MetaMask may terminate or suspend all or part of the Service and your MetaMask access immediately, without prior notice or liability, if you breach any of the terms or conditions of the Terms. Upon termination of your access, your right to use the Service will immediately cease. - -The following provisions of the Terms survive any termination of these Terms: INDEMNITY; WARRANTY DISCLAIMERS; LIMITATION ON LIABILITY; OUR PROPRIETARY RIGHTS; LINKS; TERMINATION; NO THIRD PARTY BENEFICIARIES; BINDING ARBITRATION AND CLASS ACTION WAIVER; GENERAL INFORMATION. - -## 11. No Third Party Beneficiaries ## - -You agree that, except as otherwise expressly provided in these Terms, there shall be no third party beneficiaries to the Terms. - -## 12. Notice and Procedure For Making Claims of Copyright Infringement ## - -If you believe that your copyright or the copyright of a person on whose behalf you are authorized to act has been infringed, please provide MetaMask’s Copyright Agent a written Notice containing the following information: - -· an electronic or physical signature of the person authorized to act on behalf of the owner of the copyright or other intellectual property interest; - -· a description of the copyrighted work or other intellectual property that you claim has been infringed; - -· a description of where the material that you claim is infringing is located on the Service; - -· your address, telephone number, and email address; - -· a statement by you that you have a good faith belief that the disputed use is not authorized by the copyright owner, its agent, or the law; - -· a statement by you, made under penalty of perjury, that the above information in your Notice is accurate and that you are the copyright or intellectual property owner or authorized to act on the copyright or intellectual property owner's behalf. - -MetaMask’s Copyright Agent can be reached at: - -Email: copyright [at] metamask [dot] io - -Mail: - -Attention: - -MetaMask Copyright ℅ ConsenSys - -49 Bogart Street - -Brooklyn, NY 11206 - -## 13. Binding Arbitration and Class Action Waiver ## - -PLEASE READ THIS SECTION CAREFULLY – IT MAY SIGNIFICANTLY AFFECT YOUR LEGAL RIGHTS, INCLUDING YOUR RIGHT TO FILE A LAWSUIT IN COURT - -### 13.1 Initial Dispute Resolution ### - -The parties shall use their best efforts to engage directly to settle any dispute, claim, question, or disagreement and engage in good faith negotiations which shall be a condition to either party initiating a lawsuit or arbitration. - -### 13.2 Binding Arbitration ### - -If the parties do not reach an agreed upon solution within a period of 30 days from the time informal dispute resolution under the Initial Dispute Resolution provision begins, then either party may initiate binding arbitration as the sole means to resolve claims, subject to the terms set forth below. Specifically, all claims arising out of or relating to these Terms (including their formation, performance and breach), the parties’ relationship with each other and/or your use of the Service shall be finally settled by binding arbitration administered by the American Arbitration Association in accordance with the provisions of its Commercial Arbitration Rules and the supplementary procedures for consumer related disputes of the American Arbitration Association (the "AAA"), excluding any rules or procedures governing or permitting class actions. - -The arbitrator, and not any federal, state or local court or agency, shall have exclusive authority to resolve all disputes arising out of or relating to the interpretation, applicability, enforceability or formation of these Terms, including, but not limited to any claim that all or any part of these Terms are void or voidable, or whether a claim is subject to arbitration. The arbitrator shall be empowered to grant whatever relief would be available in a court under law or in equity. The arbitrator’s award shall be written, and binding on the parties and may be entered as a judgment in any court of competent jurisdiction. - -The parties understand that, absent this mandatory provision, they would have the right to sue in court and have a jury trial. They further understand that, in some instances, the costs of arbitration could exceed the costs of litigation and the right to discovery may be more limited in arbitration than in court. - -### 13.3 Location ### - -Binding arbitration shall take place in New York. You agree to submit to the personal jurisdiction of any federal or state court in New York County, New York, in order to compel arbitration, to stay proceedings pending arbitration, or to confirm, modify, vacate or enter judgment on the award entered by the arbitrator. - -### 13.4 Class Action Waiver ### - -The parties further agree that any arbitration shall be conducted in their individual capacities only and not as a class action or other representative action, and the parties expressly waive their right to file a class action or seek relief on a class basis. YOU AND METAMASK AGREE THAT EACH MAY BRING CLAIMS AGAINST THE OTHER ONLY IN YOUR OR ITS INDIVIDUAL CAPACITY, AND NOT AS A PLAINTIFF OR CLASS MEMBER IN ANY PURPORTED CLASS OR REPRESENTATIVE PROCEEDING. If any court or arbitrator determines that the class action waiver set forth in this paragraph is void or unenforceable for any reason or that an arbitration can proceed on a class basis, then the arbitration provision set forth above shall be deemed null and void in its entirety and the parties shall be deemed to have not agreed to arbitrate disputes. - -### 13.5 Exception - Litigation of Intellectual Property and Small Claims Court Claims ### - -Notwithstanding the parties' decision to resolve all disputes through arbitration, either party may bring an action in state or federal court to protect its intellectual property rights ("intellectual property rights" means patents, copyrights, moral rights, trademarks, and trade secrets, but not privacy or publicity rights). Either party may also seek relief in a small claims court for disputes or claims within the scope of that court’s jurisdiction. - -### 13.6 30-Day Right to Opt Out ### - -You have the right to opt-out and not be bound by the arbitration and class action waiver provisions set forth above by sending written notice of your decision to opt-out to the following address: MetaMask ℅ ConsenSys, 49 Bogart Street, Brooklyn NY 11206 and via email at legal-opt@metamask.io. The notice must be sent within 30 days of September 6, 2016 or your first use of the Service, whichever is later, otherwise you shall be bound to arbitrate disputes in accordance with the terms of those paragraphs. If you opt-out of these arbitration provisions, MetaMask also will not be bound by them. - -### 13.7 Changes to This Section ### - -MetaMask will provide 60-days’ notice of any changes to this section. Changes will become effective on the 60th day, and will apply prospectively only to any claims arising after the 60th day. - -For any dispute not subject to arbitration you and MetaMask agree to submit to the personal and exclusive jurisdiction of and venue in the federal and state courts located in New York, New York. You further agree to accept service of process by mail, and hereby waive any and all jurisdictional and venue defenses otherwise available. - -The Terms and the relationship between you and MetaMask shall be governed by the laws of the State of New York without regard to conflict of law provisions. - -## 14. General Information ## - -### 14.1 Entire Agreement ### - -These Terms (and any additional terms, rules and conditions of participation that MetaMask may post on the Service) constitute the entire agreement between you and MetaMask with respect to the Service and supersedes any prior agreements, oral or written, between you and MetaMask. In the event of a conflict between these Terms and the additional terms, rules and conditions of participation, the latter will prevail over the Terms to the extent of the conflict. - -### 14.2 Waiver and Severability of Terms ### - -The failure of MetaMask to exercise or enforce any right or provision of the Terms shall not constitute a waiver of such right or provision. If any provision of the Terms is found by an arbitrator or court of competent jurisdiction to be invalid, the parties nevertheless agree that the arbitrator or court should endeavor to give effect to the parties' intentions as reflected in the provision, and the other provisions of the Terms remain in full force and effect. - -### 14.3 Statute of Limitations ### - -You agree that regardless of any statute or law to the contrary, any claim or cause of action arising out of or related to the use of the Service or the Terms must be filed within one (1) year after such claim or cause of action arose or be forever barred. - -### 14.4 Section Titles ### - -The section titles in the Terms are for convenience only and have no legal or contractual effect. - -### 14.5 Communications ### - -Users with questions, complaints or claims with respect to the Service may contact us using the relevant contact information set forth above and at communications@metamask.io. - -## 15 Related Links ## - -**[Terms of Use](https://metamask.io/terms.html)** - -**[Privacy](https://metamask.io/privacy.html)** - -**[Attributions](https://metamask.io/attributions.html)** - -', id: 0}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -ERROR: 'Warning: setState(...): Can only update a mounted or mounting component. This usually means you called setState() on an unmounted component. This is a no-op. Please check the code for the NoticeScreen component.' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'document.body', - - - - - - - - - - - - -
Created with Raphaël 2.2.0
Terms of Use

Terms of Use

THIS AGREEMENT IS SUBJECT TO BINDING ARBITRATION AND A WAIVER OF CLASS ACTION RIGHTS AS DETAILED IN SECTION 13. PLEASE READ THE AGREEMENT CAREFULLY.

Our Terms of Use have been updated as of September 5, 2016

1. Acceptance of Terms

MetaMask provides a platform for managing Ethereum (or "ETH") accounts, and allowing ordinary websites to interact with the Ethereum blockchain, while keeping the user in control over what transactions they approve, through our website located at https://metamask.io/ and browser plugin (the "Site") — which includes text, images, audio, code and other materials (collectively, the “Content”) and all of the features, and services provided. The Site, and any other features, tools, materials, or other services offered from time to time by MetaMask are referred to here as the “Service.” Please read these Terms of Use (the “Terms” or “Terms of Use”) carefully before using the Service. By using or otherwise accessing the Services, or clicking to accept or agree to these Terms where that option is made available, you (1) accept and agree to these Terms (2) consent to the collection, use, disclosure and other handling of information as described in our Privacy Policy and (3) any additional terms, rules and conditions of participation issued by MetaMask from time to time. If you do not agree to the Terms, then you may not access or use the Content or Services.

2. Modification of Terms of Use

Except for Section 13, providing for binding arbitration and waiver of class action rights, MetaMask reserves the right, at its sole discretion, to modify or replace the Terms of Use at any time. The most current version of these Terms will be posted on our Site. You shall be responsible for reviewing and becoming familiar with any such modifications. Use of the Services by you after any modification to the Terms constitutes your acceptance of the Terms of Use as modified.

3. Eligibility

You hereby represent and warrant that you are fully able and competent to enter into the terms, conditions, obligations, affirmations, representations and warranties set forth in these Terms and to abide by and comply with these Terms.

MetaMask is a global platform and by accessing the Content or Services, you are representing and warranting that, you are of the legal age of majority in your jurisdiction as is required to access such Services and Content and enter into arrangements as provided by the Service. You further represent that you are otherwise legally permitted to use the service in your jurisdiction including owning cryptographic tokens of value, and interacting with the Services or Content in any way. You further represent you are responsible for ensuring compliance with the laws of your jurisdiction and acknowledge that MetaMask is not liable for your compliance with such laws.

4 Account Password and Security

When setting up an account within MetaMask, you will be responsible for keeping your own account secrets, which may be a twelve-word seed phrase, an account file, or other locally stored secret information. MetaMask encrypts this information locally with a password you provide, that we never send to our servers. You agree to (a) never use the same password for MetaMask that you have ever used outside of this service; (b) keep your secret information and password confidential and do not share them with anyone else; (c) immediately notify MetaMask of any unauthorized use of your account or breach of security. MetaMask cannot and will not be liable for any loss or damage arising from your failure to comply with this section.

5. Representations, Warranties, and Risks

5.1. Warranty Disclaimer

You expressly understand and agree that your use of the Service is at your sole risk. The Service (including the Service and the Content) are provided on an "AS IS" and "as available" basis, without warranties of any kind, either express or implied, including, without limitation, implied warranties of merchantability, fitness for a particular purpose or non-infringement. You acknowledge that MetaMask has no control over, and no duty to take any action regarding: which users gain access to or use the Service; what effects the Content may have on you; how you may interpret or use the Content; or what actions you may take as a result of having been exposed to the Content. You release MetaMask from all liability for you having acquired or not acquired Content through the Service. MetaMask makes no representations concerning any Content contained in or accessed through the Service, and MetaMask will not be responsible or liable for the accuracy, copyright compliance, legality or decency of material contained in or accessed through the Service.

5.2 Sophistication and Risk of Cryptographic Systems

By utilizing the Service or interacting with the Content or platform in any way, you represent that you understand the inherent risks associated with cryptographic systems; and warrant that you have an understanding of the usage and intricacies of native cryptographic tokens, like Ether (ETH) and Bitcoin (BTC), smart contract based tokens such as those that follow the Ethereum Token Standard (https://github.com/ethereum/EIPs/issues/20), and blockchain-based software systems.

5.3 Risk of Regulatory Actions in One or More Jurisdictions

MetaMask and ETH could be impacted by one or more regulatory inquiries or regulatory action, which could impede or limit the ability of MetaMask to continue to develop, or which could impede or limit your ability to access or use the Service or Ethereum blockchain.

5.4 Risk of Weaknesses or Exploits in the Field of Cryptography

You acknowledge and understand that Cryptography is a progressing field. Advances in code cracking or technical advances such as the development of quantum computers may present risks to cryptocurrencies and Services of Content, which could result in the theft or loss of your cryptographic tokens or property. To the extent possible, MetaMask intends to update the protocol underlying Services to account for any advances in cryptography and to incorporate additional security measures, but does not guarantee or otherwise represent full security of the system. By using the Service or accessing Content, you acknowledge these inherent risks.

5.5 Volatility of Crypto Currencies

You understand that Ethereum and other blockchain technologies and associated currencies or tokens are highly volatile due to many factors including but not limited to adoption, speculation, technology and security risks. You also acknowledge that the cost of transacting on such technologies is variable and may increase at any time causing impact to any activities taking place on the Ethereum blockchain. You acknowledge these risks and represent that MetaMask cannot be held liable for such fluctuations or increased costs.

5.6 Application Security

You acknowledge that Ethereum applications are code subject to flaws and acknowledge that you are solely responsible for evaluating any code provided by the Services or Content and the trustworthiness of any third-party websites, products, smart-contracts, or Content you access or use through the Service. You further expressly acknowledge and represent that Ethereum applications can be written maliciously or negligently, that MetaMask cannot be held liable for your interaction with such applications and that such applications may cause the loss of property or even identity. This warning and others later provided by MetaMask in no way evidence or represent an on-going duty to alert you to all of the potential risks of utilizing the Service or Content.

6. Indemnity

You agree to release and to indemnify, defend and hold harmless MetaMask and its parents, subsidiaries, affiliates and agencies, as well as the officers, directors, employees, shareholders and representatives of any of the foregoing entities, from and against any and all losses, liabilities, expenses, damages, costs (including attorneys’ fees and court costs) claims or actions of any kind whatsoever arising or resulting from your use of the Service, your violation of these Terms of Use, and any of your acts or omissions that implicate publicity rights, defamation or invasion of privacy. MetaMask reserves the right, at its own expense, to assume exclusive defense and control of any matter otherwise subject to indemnification by you and, in such case, you agree to cooperate with MetaMask in the defense of such matter.

7. Limitation on liability

YOU ACKNOWLEDGE AND AGREE THAT YOU ASSUME FULL RESPONSIBILITY FOR YOUR USE OF THE SITE AND SERVICE. YOU ACKNOWLEDGE AND AGREE THAT ANY INFORMATION YOU SEND OR RECEIVE DURING YOUR USE OF THE SITE AND SERVICE MAY NOT BE SECURE AND MAY BE INTERCEPTED OR LATER ACQUIRED BY UNAUTHORIZED PARTIES. YOU ACKNOWLEDGE AND AGREE THAT YOUR USE OF THE SITE AND SERVICE IS AT YOUR OWN RISK. RECOGNIZING SUCH, YOU UNDERSTAND AND AGREE THAT, TO THE FULLEST EXTENT PERMITTED BY APPLICABLE LAW, NEITHER METAMASK NOR ITS SUPPLIERS OR LICENSORS WILL BE LIABLE TO YOU FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY OR OTHER DAMAGES OF ANY KIND, INCLUDING WITHOUT LIMITATION DAMAGES FOR LOSS OF PROFITS, GOODWILL, USE, DATA OR OTHER TANGIBLE OR INTANGIBLE LOSSES OR ANY OTHER DAMAGES BASED ON CONTRACT, TORT, STRICT LIABILITY OR ANY OTHER THEORY (EVEN IF METAMASK HAD BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES), RESULTING FROM THE SITE OR SERVICE; THE USE OR THE INABILITY TO USE THE SITE OR SERVICE; UNAUTHORIZED ACCESS TO OR ALTERATION OF YOUR TRANSMISSIONS OR DATA; STATEMENTS OR CONDUCT OF ANY THIRD PARTY ON THE SITE OR SERVICE; ANY ACTIONS WE TAKE OR FAIL TO TAKE AS A RESULT OF COMMUNICATIONS YOU SEND TO US; HUMAN ERRORS; TECHNICAL MALFUNCTIONS; FAILURES, INCLUDING PUBLIC UTILITY OR TELEPHONE OUTAGES; OMISSIONS, INTERRUPTIONS, LATENCY, DELETIONS OR DEFECTS OF ANY DEVICE OR NETWORK, PROVIDERS, OR SOFTWARE (INCLUDING, BUT NOT LIMITED TO, THOSE THAT DO NOT PERMIT PARTICIPATION IN THE SERVICE); ANY INJURY OR DAMAGE TO COMPUTER EQUIPMENT; INABILITY TO FULLY ACCESS THE SITE OR SERVICE OR ANY OTHER WEBSITE; THEFT, TAMPERING, DESTRUCTION, OR UNAUTHORIZED ACCESS TO, IMAGES OR OTHER CONTENT OF ANY KIND; DATA THAT IS PROCESSED LATE OR INCORRECTLY OR IS INCOMPLETE OR LOST; TYPOGRAPHICAL, PRINTING OR OTHER ERRORS, OR ANY COMBINATION THEREOF; OR ANY OTHER MATTER RELATING TO THE SITE OR SERVICE.

SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF CERTAIN WARRANTIES OR THE LIMITATION OR EXCLUSION OF LIABILITY FOR INCIDENTAL OR CONSEQUENTIAL DAMAGES. ACCORDINGLY, SOME OF THE ABOVE LIMITATIONS MAY NOT APPLY TO YOU.

8. Our Proprietary Rights

All title, ownership and intellectual property rights in and to the Service are owned by MetaMask or its licensors. You acknowledge and agree that the Service contains proprietary and confidential information that is protected by applicable intellectual property and other laws. Except as expressly authorized by MetaMask, you agree not to copy, modify, rent, lease, loan, sell, distribute, perform, display or create derivative works based on the Service, in whole or in part. MetaMask issues a license for MetaMask, found here. For information on other licenses utilized in the development of MetaMask, please see our attribution page at: https://metamask.io/attributions.html

9. Links

The Service provides, or third parties may provide, links to other World Wide Web or accessible sites, applications or resources. Because MetaMask has no control over such sites, applications and resources, you acknowledge and agree that MetaMask is not responsible for the availability of such external sites, applications or resources, and does not endorse and is not responsible or liable for any content, advertising, products or other materials on or available from such sites or resources. You further acknowledge and agree that MetaMask shall not be responsible or liable, directly or indirectly, for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods or services available on or through any such site or resource.

10. Termination and Suspension

MetaMask may terminate or suspend all or part of the Service and your MetaMask access immediately, without prior notice or liability, if you breach any of the terms or conditions of the Terms. Upon termination of your access, your right to use the Service will immediately cease.

The following provisions of the Terms survive any termination of these Terms: INDEMNITY; WARRANTY DISCLAIMERS; LIMITATION ON LIABILITY; OUR PROPRIETARY RIGHTS; LINKS; TERMINATION; NO THIRD PARTY BENEFICIARIES; BINDING ARBITRATION AND CLASS ACTION WAIVER; GENERAL INFORMATION.

11. No Third Party Beneficiaries

You agree that, except as otherwise expressly provided in these Terms, there shall be no third party beneficiaries to the Terms.

12. Notice and Procedure For Making Claims of Copyright Infringement

If you believe that your copyright or the copyright of a person on whose behalf you are authorized to act has been infringed, please provide MetaMask’s Copyright Agent a written Notice containing the following information:

· an electronic or physical signature of the person authorized to act on behalf of the owner of the copyright or other intellectual property interest;

· a description of the copyrighted work or other intellectual property that you claim has been infringed;

· a description of where the material that you claim is infringing is located on the Service;

· your address, telephone number, and email address;

· a statement by you that you have a good faith belief that the disputed use is not authorized by the copyright owner, its agent, or the law;

· a statement by you, made under penalty of perjury, that the above information in your Notice is accurate and that you are the copyright or intellectual property owner or authorized to act on the copyright or intellectual property owner's behalf.

MetaMask’s Copyright Agent can be reached at:

Email: copyright at metamask dot io

Mail:

Attention:

MetaMask Copyright ℅ ConsenSys

49 Bogart Street

Brooklyn, NY 11206

13. Binding Arbitration and Class Action Waiver

PLEASE READ THIS SECTION CAREFULLY – IT MAY SIGNIFICANTLY AFFECT YOUR LEGAL RIGHTS, INCLUDING YOUR RIGHT TO FILE A LAWSUIT IN COURT

13.1 Initial Dispute Resolution

The parties shall use their best efforts to engage directly to settle any dispute, claim, question, or disagreement and engage in good faith negotiations which shall be a condition to either party initiating a lawsuit or arbitration.

13.2 Binding Arbitration

If the parties do not reach an agreed upon solution within a period of 30 days from the time informal dispute resolution under the Initial Dispute Resolution provision begins, then either party may initiate binding arbitration as the sole means to resolve claims, subject to the terms set forth below. Specifically, all claims arising out of or relating to these Terms (including their formation, performance and breach), the parties’ relationship with each other and/or your use of the Service shall be finally settled by binding arbitration administered by the American Arbitration Association in accordance with the provisions of its Commercial Arbitration Rules and the supplementary procedures for consumer related disputes of the American Arbitration Association (the "AAA"), excluding any rules or procedures governing or permitting class actions.

The arbitrator, and not any federal, state or local court or agency, shall have exclusive authority to resolve all disputes arising out of or relating to the interpretation, applicability, enforceability or formation of these Terms, including, but not limited to any claim that all or any part of these Terms are void or voidable, or whether a claim is subject to arbitration. The arbitrator shall be empowered to grant whatever relief would be available in a court under law or in equity. The arbitrator’s award shall be written, and binding on the parties and may be entered as a judgment in any court of competent jurisdiction.

The parties understand that, absent this mandatory provision, they would have the right to sue in court and have a jury trial. They further understand that, in some instances, the costs of arbitration could exceed the costs of litigation and the right to discovery may be more limited in arbitration than in court.

13.3 Location

Binding arbitration shall take place in New York. You agree to submit to the personal jurisdiction of any federal or state court in New York County, New York, in order to compel arbitration, to stay proceedings pending arbitration, or to confirm, modify, vacate or enter judgment on the award entered by the arbitrator.

13.4 Class Action Waiver

The parties further agree that any arbitration shall be conducted in their individual capacities only and not as a class action or other representative action, and the parties expressly waive their right to file a class action or seek relief on a class basis. YOU AND METAMASK AGREE THAT EACH MAY BRING CLAIMS AGAINST THE OTHER ONLY IN YOUR OR ITS INDIVIDUAL CAPACITY, AND NOT AS A PLAINTIFF OR CLASS MEMBER IN ANY PURPORTED CLASS OR REPRESENTATIVE PROCEEDING. If any court or arbitrator determines that the class action waiver set forth in this paragraph is void or unenforceable for any reason or that an arbitration can proceed on a class basis, then the arbitration provision set forth above shall be deemed null and void in its entirety and the parties shall be deemed to have not agreed to arbitrate disputes.

13.5 Exception - Litigation of Intellectual Property and Small Claims Court Claims

Notwithstanding the parties' decision to resolve all disputes through arbitration, either party may bring an action in state or federal court to protect its intellectual property rights ("intellectual property rights" means patents, copyrights, moral rights, trademarks, and trade secrets, but not privacy or publicity rights). Either party may also seek relief in a small claims court for disputes or claims within the scope of that court’s jurisdiction.

13.6 30-Day Right to Opt Out

You have the right to opt-out and not be bound by the arbitration and class action waiver provisions set forth above by sending written notice of your decision to opt-out to the following address: MetaMask ℅ ConsenSys, 49 Bogart Street, Brooklyn NY 11206 and via email at legal-opt@metamask.io. The notice must be sent within 30 days of September 6, 2016 or your first use of the Service, whichever is later, otherwise you shall be bound to arbitrate disputes in accordance with the terms of those paragraphs. If you opt-out of these arbitration provisions, MetaMask also will not be bound by them.

13.7 Changes to This Section

MetaMask will provide 60-days’ notice of any changes to this section. Changes will become effective on the 60th day, and will apply prospectively only to any claims arising after the 60th day.

For any dispute not subject to arbitration you and MetaMask agree to submit to the personal and exclusive jurisdiction of and venue in the federal and state courts located in New York, New York. You further agree to accept service of process by mail, and hereby waive any and all jurisdictional and venue defenses otherwise available.

The Terms and the relationship between you and MetaMask shall be governed by the laws of the State of New York without regard to conflict of law provisions.

14. General Information

14.1 Entire Agreement

These Terms (and any additional terms, rules and conditions of participation that MetaMask may post on the Service) constitute the entire agreement between you and MetaMask with respect to the Service and supersedes any prior agreements, oral or written, between you and MetaMask. In the event of a conflict between these Terms and the additional terms, rules and conditions of participation, the latter will prevail over the Terms to the extent of the conflict.

14.2 Waiver and Severability of Terms

The failure of MetaMask to exercise or enforce any right or provision of the Terms shall not constitute a waiver of such right or provision. If any provision of the Terms is found by an arbitrator or court of competent jurisdiction to be invalid, the parties nevertheless agree that the arbitrator or court should endeavor to give effect to the parties' intentions as reflected in the provision, and the other provisions of the Terms remain in full force and effect.

14.3 Statute of Limitations

You agree that regardless of any statute or law to the contrary, any claim or cause of action arising out of or related to the use of the Service or the Terms must be filed within one (1) year after such claim or cause of action arose or be forever barred.

14.4 Section Titles

The section titles in the Terms are for convenience only and have no legal or contractual effect.

14.5 Communications

Users with questions, complaints or claims with respect to the Service may contact us using the relevant contact information set forth above and at communications@metamask.io.

15 Related Links

Terms of Use

Privacy

Attributions

-Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got UPDATE_METAMASK_STATE' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'Main ui render function' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'rendering primary' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_METAMASK_STATE', value: Object{isInitialized: true, provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', unapprovedTxs: Object{}, selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, isUnlocked: true, keyringTypes: [..., ...], keyrings: [...], identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, computedBalances: Object{}, frequentRpcList: [], currentAccountTab: 'history', tokens: [], useBlockie: false, featureFlags: Object{betaUI: ...}, selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', addressBook: [], currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, noActiveNotices: false, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'document.body', - - - - - - - - - - - - -
Created with Raphaël 2.2.0
Terms of Use

Terms of Use

THIS AGREEMENT IS SUBJECT TO BINDING ARBITRATION AND A WAIVER OF CLASS ACTION RIGHTS AS DETAILED IN SECTION 13. PLEASE READ THE AGREEMENT CAREFULLY.

Our Terms of Use have been updated as of September 5, 2016

1. Acceptance of Terms

MetaMask provides a platform for managing Ethereum (or "ETH") accounts, and allowing ordinary websites to interact with the Ethereum blockchain, while keeping the user in control over what transactions they approve, through our website located at https://metamask.io/ and browser plugin (the "Site") — which includes text, images, audio, code and other materials (collectively, the “Content”) and all of the features, and services provided. The Site, and any other features, tools, materials, or other services offered from time to time by MetaMask are referred to here as the “Service.” Please read these Terms of Use (the “Terms” or “Terms of Use”) carefully before using the Service. By using or otherwise accessing the Services, or clicking to accept or agree to these Terms where that option is made available, you (1) accept and agree to these Terms (2) consent to the collection, use, disclosure and other handling of information as described in our Privacy Policy and (3) any additional terms, rules and conditions of participation issued by MetaMask from time to time. If you do not agree to the Terms, then you may not access or use the Content or Services.

2. Modification of Terms of Use

Except for Section 13, providing for binding arbitration and waiver of class action rights, MetaMask reserves the right, at its sole discretion, to modify or replace the Terms of Use at any time. The most current version of these Terms will be posted on our Site. You shall be responsible for reviewing and becoming familiar with any such modifications. Use of the Services by you after any modification to the Terms constitutes your acceptance of the Terms of Use as modified.

3. Eligibility

You hereby represent and warrant that you are fully able and competent to enter into the terms, conditions, obligations, affirmations, representations and warranties set forth in these Terms and to abide by and comply with these Terms.

MetaMask is a global platform and by accessing the Content or Services, you are representing and warranting that, you are of the legal age of majority in your jurisdiction as is required to access such Services and Content and enter into arrangements as provided by the Service. You further represent that you are otherwise legally permitted to use the service in your jurisdiction including owning cryptographic tokens of value, and interacting with the Services or Content in any way. You further represent you are responsible for ensuring compliance with the laws of your jurisdiction and acknowledge that MetaMask is not liable for your compliance with such laws.

4 Account Password and Security

When setting up an account within MetaMask, you will be responsible for keeping your own account secrets, which may be a twelve-word seed phrase, an account file, or other locally stored secret information. MetaMask encrypts this information locally with a password you provide, that we never send to our servers. You agree to (a) never use the same password for MetaMask that you have ever used outside of this service; (b) keep your secret information and password confidential and do not share them with anyone else; (c) immediately notify MetaMask of any unauthorized use of your account or breach of security. MetaMask cannot and will not be liable for any loss or damage arising from your failure to comply with this section.

5. Representations, Warranties, and Risks

5.1. Warranty Disclaimer

You expressly understand and agree that your use of the Service is at your sole risk. The Service (including the Service and the Content) are provided on an "AS IS" and "as available" basis, without warranties of any kind, either express or implied, including, without limitation, implied warranties of merchantability, fitness for a particular purpose or non-infringement. You acknowledge that MetaMask has no control over, and no duty to take any action regarding: which users gain access to or use the Service; what effects the Content may have on you; how you may interpret or use the Content; or what actions you may take as a result of having been exposed to the Content. You release MetaMask from all liability for you having acquired or not acquired Content through the Service. MetaMask makes no representations concerning any Content contained in or accessed through the Service, and MetaMask will not be responsible or liable for the accuracy, copyright compliance, legality or decency of material contained in or accessed through the Service.

5.2 Sophistication and Risk of Cryptographic Systems

By utilizing the Service or interacting with the Content or platform in any way, you represent that you understand the inherent risks associated with cryptographic systems; and warrant that you have an understanding of the usage and intricacies of native cryptographic tokens, like Ether (ETH) and Bitcoin (BTC), smart contract based tokens such as those that follow the Ethereum Token Standard (https://github.com/ethereum/EIPs/issues/20), and blockchain-based software systems.

5.3 Risk of Regulatory Actions in One or More Jurisdictions

MetaMask and ETH could be impacted by one or more regulatory inquiries or regulatory action, which could impede or limit the ability of MetaMask to continue to develop, or which could impede or limit your ability to access or use the Service or Ethereum blockchain.

5.4 Risk of Weaknesses or Exploits in the Field of Cryptography

You acknowledge and understand that Cryptography is a progressing field. Advances in code cracking or technical advances such as the development of quantum computers may present risks to cryptocurrencies and Services of Content, which could result in the theft or loss of your cryptographic tokens or property. To the extent possible, MetaMask intends to update the protocol underlying Services to account for any advances in cryptography and to incorporate additional security measures, but does not guarantee or otherwise represent full security of the system. By using the Service or accessing Content, you acknowledge these inherent risks.

5.5 Volatility of Crypto Currencies

You understand that Ethereum and other blockchain technologies and associated currencies or tokens are highly volatile due to many factors including but not limited to adoption, speculation, technology and security risks. You also acknowledge that the cost of transacting on such technologies is variable and may increase at any time causing impact to any activities taking place on the Ethereum blockchain. You acknowledge these risks and represent that MetaMask cannot be held liable for such fluctuations or increased costs.

5.6 Application Security

You acknowledge that Ethereum applications are code subject to flaws and acknowledge that you are solely responsible for evaluating any code provided by the Services or Content and the trustworthiness of any third-party websites, products, smart-contracts, or Content you access or use through the Service. You further expressly acknowledge and represent that Ethereum applications can be written maliciously or negligently, that MetaMask cannot be held liable for your interaction with such applications and that such applications may cause the loss of property or even identity. This warning and others later provided by MetaMask in no way evidence or represent an on-going duty to alert you to all of the potential risks of utilizing the Service or Content.

6. Indemnity

You agree to release and to indemnify, defend and hold harmless MetaMask and its parents, subsidiaries, affiliates and agencies, as well as the officers, directors, employees, shareholders and representatives of any of the foregoing entities, from and against any and all losses, liabilities, expenses, damages, costs (including attorneys’ fees and court costs) claims or actions of any kind whatsoever arising or resulting from your use of the Service, your violation of these Terms of Use, and any of your acts or omissions that implicate publicity rights, defamation or invasion of privacy. MetaMask reserves the right, at its own expense, to assume exclusive defense and control of any matter otherwise subject to indemnification by you and, in such case, you agree to cooperate with MetaMask in the defense of such matter.

7. Limitation on liability

YOU ACKNOWLEDGE AND AGREE THAT YOU ASSUME FULL RESPONSIBILITY FOR YOUR USE OF THE SITE AND SERVICE. YOU ACKNOWLEDGE AND AGREE THAT ANY INFORMATION YOU SEND OR RECEIVE DURING YOUR USE OF THE SITE AND SERVICE MAY NOT BE SECURE AND MAY BE INTERCEPTED OR LATER ACQUIRED BY UNAUTHORIZED PARTIES. YOU ACKNOWLEDGE AND AGREE THAT YOUR USE OF THE SITE AND SERVICE IS AT YOUR OWN RISK. RECOGNIZING SUCH, YOU UNDERSTAND AND AGREE THAT, TO THE FULLEST EXTENT PERMITTED BY APPLICABLE LAW, NEITHER METAMASK NOR ITS SUPPLIERS OR LICENSORS WILL BE LIABLE TO YOU FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY OR OTHER DAMAGES OF ANY KIND, INCLUDING WITHOUT LIMITATION DAMAGES FOR LOSS OF PROFITS, GOODWILL, USE, DATA OR OTHER TANGIBLE OR INTANGIBLE LOSSES OR ANY OTHER DAMAGES BASED ON CONTRACT, TORT, STRICT LIABILITY OR ANY OTHER THEORY (EVEN IF METAMASK HAD BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES), RESULTING FROM THE SITE OR SERVICE; THE USE OR THE INABILITY TO USE THE SITE OR SERVICE; UNAUTHORIZED ACCESS TO OR ALTERATION OF YOUR TRANSMISSIONS OR DATA; STATEMENTS OR CONDUCT OF ANY THIRD PARTY ON THE SITE OR SERVICE; ANY ACTIONS WE TAKE OR FAIL TO TAKE AS A RESULT OF COMMUNICATIONS YOU SEND TO US; HUMAN ERRORS; TECHNICAL MALFUNCTIONS; FAILURES, INCLUDING PUBLIC UTILITY OR TELEPHONE OUTAGES; OMISSIONS, INTERRUPTIONS, LATENCY, DELETIONS OR DEFECTS OF ANY DEVICE OR NETWORK, PROVIDERS, OR SOFTWARE (INCLUDING, BUT NOT LIMITED TO, THOSE THAT DO NOT PERMIT PARTICIPATION IN THE SERVICE); ANY INJURY OR DAMAGE TO COMPUTER EQUIPMENT; INABILITY TO FULLY ACCESS THE SITE OR SERVICE OR ANY OTHER WEBSITE; THEFT, TAMPERING, DESTRUCTION, OR UNAUTHORIZED ACCESS TO, IMAGES OR OTHER CONTENT OF ANY KIND; DATA THAT IS PROCESSED LATE OR INCORRECTLY OR IS INCOMPLETE OR LOST; TYPOGRAPHICAL, PRINTING OR OTHER ERRORS, OR ANY COMBINATION THEREOF; OR ANY OTHER MATTER RELATING TO THE SITE OR SERVICE.

SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF CERTAIN WARRANTIES OR THE LIMITATION OR EXCLUSION OF LIABILITY FOR INCIDENTAL OR CONSEQUENTIAL DAMAGES. ACCORDINGLY, SOME OF THE ABOVE LIMITATIONS MAY NOT APPLY TO YOU.

8. Our Proprietary Rights

All title, ownership and intellectual property rights in and to the Service are owned by MetaMask or its licensors. You acknowledge and agree that the Service contains proprietary and confidential information that is protected by applicable intellectual property and other laws. Except as expressly authorized by MetaMask, you agree not to copy, modify, rent, lease, loan, sell, distribute, perform, display or create derivative works based on the Service, in whole or in part. MetaMask issues a license for MetaMask, found here. For information on other licenses utilized in the development of MetaMask, please see our attribution page at: https://metamask.io/attributions.html

9. Links

The Service provides, or third parties may provide, links to other World Wide Web or accessible sites, applications or resources. Because MetaMask has no control over such sites, applications and resources, you acknowledge and agree that MetaMask is not responsible for the availability of such external sites, applications or resources, and does not endorse and is not responsible or liable for any content, advertising, products or other materials on or available from such sites or resources. You further acknowledge and agree that MetaMask shall not be responsible or liable, directly or indirectly, for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods or services available on or through any such site or resource.

10. Termination and Suspension

MetaMask may terminate or suspend all or part of the Service and your MetaMask access immediately, without prior notice or liability, if you breach any of the terms or conditions of the Terms. Upon termination of your access, your right to use the Service will immediately cease.

The following provisions of the Terms survive any termination of these Terms: INDEMNITY; WARRANTY DISCLAIMERS; LIMITATION ON LIABILITY; OUR PROPRIETARY RIGHTS; LINKS; TERMINATION; NO THIRD PARTY BENEFICIARIES; BINDING ARBITRATION AND CLASS ACTION WAIVER; GENERAL INFORMATION.

11. No Third Party Beneficiaries

You agree that, except as otherwise expressly provided in these Terms, there shall be no third party beneficiaries to the Terms.

12. Notice and Procedure For Making Claims of Copyright Infringement

If you believe that your copyright or the copyright of a person on whose behalf you are authorized to act has been infringed, please provide MetaMask’s Copyright Agent a written Notice containing the following information:

· an electronic or physical signature of the person authorized to act on behalf of the owner of the copyright or other intellectual property interest;

· a description of the copyrighted work or other intellectual property that you claim has been infringed;

· a description of where the material that you claim is infringing is located on the Service;

· your address, telephone number, and email address;

· a statement by you that you have a good faith belief that the disputed use is not authorized by the copyright owner, its agent, or the law;

· a statement by you, made under penalty of perjury, that the above information in your Notice is accurate and that you are the copyright or intellectual property owner or authorized to act on the copyright or intellectual property owner's behalf.

MetaMask’s Copyright Agent can be reached at:

Email: copyright at metamask dot io

Mail:

Attention:

MetaMask Copyright ℅ ConsenSys

49 Bogart Street

Brooklyn, NY 11206

13. Binding Arbitration and Class Action Waiver

PLEASE READ THIS SECTION CAREFULLY – IT MAY SIGNIFICANTLY AFFECT YOUR LEGAL RIGHTS, INCLUDING YOUR RIGHT TO FILE A LAWSUIT IN COURT

13.1 Initial Dispute Resolution

The parties shall use their best efforts to engage directly to settle any dispute, claim, question, or disagreement and engage in good faith negotiations which shall be a condition to either party initiating a lawsuit or arbitration.

13.2 Binding Arbitration

If the parties do not reach an agreed upon solution within a period of 30 days from the time informal dispute resolution under the Initial Dispute Resolution provision begins, then either party may initiate binding arbitration as the sole means to resolve claims, subject to the terms set forth below. Specifically, all claims arising out of or relating to these Terms (including their formation, performance and breach), the parties’ relationship with each other and/or your use of the Service shall be finally settled by binding arbitration administered by the American Arbitration Association in accordance with the provisions of its Commercial Arbitration Rules and the supplementary procedures for consumer related disputes of the American Arbitration Association (the "AAA"), excluding any rules or procedures governing or permitting class actions.

The arbitrator, and not any federal, state or local court or agency, shall have exclusive authority to resolve all disputes arising out of or relating to the interpretation, applicability, enforceability or formation of these Terms, including, but not limited to any claim that all or any part of these Terms are void or voidable, or whether a claim is subject to arbitration. The arbitrator shall be empowered to grant whatever relief would be available in a court under law or in equity. The arbitrator’s award shall be written, and binding on the parties and may be entered as a judgment in any court of competent jurisdiction.

The parties understand that, absent this mandatory provision, they would have the right to sue in court and have a jury trial. They further understand that, in some instances, the costs of arbitration could exceed the costs of litigation and the right to discovery may be more limited in arbitration than in court.

13.3 Location

Binding arbitration shall take place in New York. You agree to submit to the personal jurisdiction of any federal or state court in New York County, New York, in order to compel arbitration, to stay proceedings pending arbitration, or to confirm, modify, vacate or enter judgment on the award entered by the arbitrator.

13.4 Class Action Waiver

The parties further agree that any arbitration shall be conducted in their individual capacities only and not as a class action or other representative action, and the parties expressly waive their right to file a class action or seek relief on a class basis. YOU AND METAMASK AGREE THAT EACH MAY BRING CLAIMS AGAINST THE OTHER ONLY IN YOUR OR ITS INDIVIDUAL CAPACITY, AND NOT AS A PLAINTIFF OR CLASS MEMBER IN ANY PURPORTED CLASS OR REPRESENTATIVE PROCEEDING. If any court or arbitrator determines that the class action waiver set forth in this paragraph is void or unenforceable for any reason or that an arbitration can proceed on a class basis, then the arbitration provision set forth above shall be deemed null and void in its entirety and the parties shall be deemed to have not agreed to arbitrate disputes.

13.5 Exception - Litigation of Intellectual Property and Small Claims Court Claims

Notwithstanding the parties' decision to resolve all disputes through arbitration, either party may bring an action in state or federal court to protect its intellectual property rights ("intellectual property rights" means patents, copyrights, moral rights, trademarks, and trade secrets, but not privacy or publicity rights). Either party may also seek relief in a small claims court for disputes or claims within the scope of that court’s jurisdiction.

13.6 30-Day Right to Opt Out

You have the right to opt-out and not be bound by the arbitration and class action waiver provisions set forth above by sending written notice of your decision to opt-out to the following address: MetaMask ℅ ConsenSys, 49 Bogart Street, Brooklyn NY 11206 and via email at legal-opt@metamask.io. The notice must be sent within 30 days of September 6, 2016 or your first use of the Service, whichever is later, otherwise you shall be bound to arbitrate disputes in accordance with the terms of those paragraphs. If you opt-out of these arbitration provisions, MetaMask also will not be bound by them.

13.7 Changes to This Section

MetaMask will provide 60-days’ notice of any changes to this section. Changes will become effective on the 60th day, and will apply prospectively only to any claims arising after the 60th day.

For any dispute not subject to arbitration you and MetaMask agree to submit to the personal and exclusive jurisdiction of and venue in the federal and state courts located in New York, New York. You further agree to accept service of process by mail, and hereby waive any and all jurisdictional and venue defenses otherwise available.

The Terms and the relationship between you and MetaMask shall be governed by the laws of the State of New York without regard to conflict of law provisions.

14. General Information

14.1 Entire Agreement

These Terms (and any additional terms, rules and conditions of participation that MetaMask may post on the Service) constitute the entire agreement between you and MetaMask with respect to the Service and supersedes any prior agreements, oral or written, between you and MetaMask. In the event of a conflict between these Terms and the additional terms, rules and conditions of participation, the latter will prevail over the Terms to the extent of the conflict.

14.2 Waiver and Severability of Terms

The failure of MetaMask to exercise or enforce any right or provision of the Terms shall not constitute a waiver of such right or provision. If any provision of the Terms is found by an arbitrator or court of competent jurisdiction to be invalid, the parties nevertheless agree that the arbitrator or court should endeavor to give effect to the parties' intentions as reflected in the provision, and the other provisions of the Terms remain in full force and effect.

14.3 Statute of Limitations

You agree that regardless of any statute or law to the contrary, any claim or cause of action arising out of or related to the use of the Service or the Terms must be filed within one (1) year after such claim or cause of action arose or be forever barred.

14.4 Section Titles

The section titles in the Terms are for convenience only and have no legal or contractual effect.

14.5 Communications

Users with questions, complaints or claims with respect to the Service may contact us using the relevant contact information set forth above and at communications@metamask.io.

15 Related Links

Terms of Use

Privacy

Attributions

-Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got SHOW_LOADING_INDICATION' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'SHOW_LOADING_INDICATION', value: undefined} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'background.markNoticeRead' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got SET_MOUSE_USER_STATE' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'SET_MOUSE_USER_STATE', value: true} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'Main ui render function' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'rendering primary' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: true, seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert', noActiveNotices: false, address: '0x77abfc38dea988c2f9602daa758867918b877f3a', forgottenPassword: undefined, isLoading: true, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.state*************************', Object{screenType: 'notice'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************isLoading*************************', true -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got HIDE_LOADING_INDICATION' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'Main ui render function' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'rendering primary' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: true, seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert', noActiveNotices: false, address: '0x77abfc38dea988c2f9602daa758867918b877f3a', forgottenPassword: undefined, isLoading: false, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.state*************************', Object{screenType: 'notice'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************isLoading*************************', false -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '**************************************************************************' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: true, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'HIDE_LOADING_INDICATION'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got CLEAR_NOTICES' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'Main ui render function' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'rendering primary' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: true, seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert', noActiveNotices: true, address: '0x77abfc38dea988c2f9602daa758867918b877f3a', forgottenPassword: undefined, isLoading: false, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.state*************************', Object{screenType: 'notice'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************isLoading*************************', false -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '**************************************************************************' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: false, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'CLEAR_NOTICES'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: true, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -ERROR: 'Warning: setState(...): Can only update a mounted or mounting component. This usually means you called setState() on an unmounted component. This is a no-op. Please check the code for the NoticeScreen component.' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.props*************************', Object{children: undefined, isInitialized: true, seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert', noActiveNotices: true, address: '0x77abfc38dea988c2f9602daa758867918b877f3a', forgottenPassword: undefined, isLoading: false, leaveImportSeedScreenState: function leaveImportSeedScreenState() { ... }, goToBuyEtherView: function goToBuyEtherView(address) { ... }} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************this.state*************************', Object{screenType: 'back_up_phrase'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '*************************isLoading*************************', false -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '**************************************************************************' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'App Reducer got UPDATE_METAMASK_STATE' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx-helper called with params:' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: Object{unapprovedTxs: Object{}, unapprovedMsgs: Object{}, personalMsgs: Object{}, typedMessages: Object{}, network: '4'} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unapproved txs' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned personal messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'tx helper found 0 unsigned typed messages' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'Main ui render function' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'rendering primary' -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c prev state', 'color: #9E9E9E; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: true, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c action ', 'color: #03A9F4; font-weight: bold', Object{type: 'UPDATE_METAMASK_STATE', value: Object{isInitialized: true, provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', unapprovedTxs: Object{}, selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, isUnlocked: true, keyringTypes: [..., ...], keyrings: [...], identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, computedBalances: Object{}, frequentRpcList: [], currentAccountTab: 'history', tokens: [], useBlockie: false, featureFlags: Object{betaUI: ...}, selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', addressBook: [], currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, noActiveNotices: true, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: '%c next state', 'color: #4CAF50; font-weight: bold', Object{metamask: Object{isInitialized: true, isUnlocked: true, isAccountMenuOpen: false, isMascara: true, isPopup: false, rpcTarget: 'https://rawtestrpc.metamask.io/', identities: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, unapprovedTxs: Object{}, noActiveNotices: true, lastUnreadNotice: Object{read: ..., date: ..., title: ..., body: ..., id: ...}, frequentRpcList: [], addressBook: [], selectedTokenAddress: null, tokenExchangeRates: Object{}, tokens: [], send: Object{gasLimit: ..., gasPrice: ..., gasTotal: ..., tokenBalance: ..., from: ..., to: ..., amount: ..., memo: ..., errors: ..., maxModeOn: ..., editingTransactionId: ...}, coinOptions: Object{}, useBlockie: false, featureFlags: Object{betaUI: ...}, networkEndpointType: 'networkBeta', provider: Object{type: ..., rpcTarget: ...}, network: '4', accounts: Object{0x77abfc38dea988c2f9602daa758867918b877f3a: ...}, currentBlockGasLimit: '0x6c4171', selectedAddressTxList: [], unapprovedMsgs: Object{}, unapprovedMsgCount: 0, unapprovedPersonalMsgs: Object{}, unapprovedPersonalMsgCount: 0, unapprovedTypedMessages: Object{}, unapprovedTypedMessagesCount: 0, keyringTypes: [..., ...], keyrings: [...], computedBalances: Object{}, currentAccountTab: 'history', currentCurrency: 'usd', conversionRate: 923.81, conversionDate: 1519153165, infuraNetworkStatus: Object{}, recentBlocks: [..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ..., ...], shapeShiftTxList: [], lostAccounts: [], selectedAddress: '0x77abfc38dea988c2f9602daa758867918b877f3a', seedWords: 'seven lobster found cream soccer country indicate history track yellow chat desert'}, appState: Object{shouldClose: false, menuOpen: false, modal: Object{open: ..., modalState: ..., previousModalState: ...}, sidebarOpen: false, networkDropdownOpen: false, currentView: Object{name: ..., detailView: ..., context: ...}, accountDetail: Object{subview: ...}, transForward: true, isLoading: false, warning: null, buyView: Object{}, isMouseUser: true, loadingMessage: undefined}, networkVersion: undefined, identities: Object{}} -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -LOG: 'document.body', - - - - - - - - - - - - -
Created with Raphaël 2.2.0
Secret Backup Phrase
Your secret backup phrase makes it easy to back up and restore your account.
WARNING: Never disclose your backup phrase. Anyone with this phrase can take your Ether forever.
seven lobster found cream soccer country indicate history track yellow chat desert
Tips:
Store this phrase in a password manager like 1password.
Write this phrase on a piece of paper and store in a secure location. If you want even more security, write it down on multiple pieces of paper and store each in 2 - 3 different locations.
Memorize this phrase.
-Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 SUCCESS (0 secs / 0 secs) -Chrome 64.0.3282 (Mac OS X 10.12.6) ERROR - Uncaught TypeError: Cannot read property 'scrollTop' of null - at dist/mascara/ui.js:2311 -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 ERROR (0 secs / 0 secs) -Chrome 64.0.3282 (Mac OS X 10.12.6): Executed 0 of 1 ERROR (16.275 secs / 0 secs) -- cgit v1.2.3 From a4ed6af2ad9469a29e100f9246e8960b078cff46 Mon Sep 17 00:00:00 2001 From: Dan Date: Wed, 21 Feb 2018 14:54:00 -0330 Subject: Prevents new transaction from generating popup when metamask is open in an active tab. --- app/scripts/background.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/scripts/background.js b/app/scripts/background.js index 0471cee3b..816c655a1 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -30,6 +30,7 @@ const release = platform.getVersion() const raven = setupRaven({ release }) let popupIsOpen = false +let openMetamaskTabsIDs = {} // state persistence const diskStore = new LocalStorageStore({ storageKey: STORAGE_KEY }) @@ -113,9 +114,15 @@ function setupController (initState) { popupIsOpen = popupIsOpen || (remotePort.name === 'popup') controller.setupTrustedCommunication(portStream, 'MetaMask') // record popup as closed + if (remotePort.sender.url.match(/home.html$/)) { + openMetamaskTabsIDs[remotePort.sender.tab.id] = true + } if (remotePort.name === 'popup') { endOfStream(portStream, () => { popupIsOpen = false + if (remotePort.sender.url.match(/home.html$/)) { + openMetamaskTabsIDs[remotePort.sender.tab.id] = false + } }) } } else { @@ -158,7 +165,10 @@ function setupController (initState) { // popup trigger function triggerUi () { - if (!popupIsOpen) notificationManager.showPopup() + extension.tabs.query({ active: true }, (tabs) => { + const currentlyActiveMetamaskTab = tabs.find(tab => openMetamaskTabsIDs[tab.id]) + if (!popupIsOpen && !currentlyActiveMetamaskTab) notificationManager.showPopup() + }) } // On first install, open a window to MetaMask website to how-it-works. -- cgit v1.2.3 From 5ec311ba3e01bd9b0a9ff447fd7639d22a7b3d9c Mon Sep 17 00:00:00 2001 From: Csaba Solya Date: Thu, 22 Feb 2018 14:39:32 +0100 Subject: add edge support --- app/scripts/background.js | 8 +++++ app/scripts/edge-encryptor.js | 69 +++++++++++++++++++++++++++++++++++++++++++ package.json | 1 + 3 files changed, 78 insertions(+) create mode 100644 app/scripts/edge-encryptor.js diff --git a/app/scripts/background.js b/app/scripts/background.js index 6bf7707e8..7bececba1 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -15,6 +15,7 @@ const MetamaskController = require('./metamask-controller') const firstTimeState = require('./first-time-state') const setupRaven = require('./setupRaven') const setupMetamaskMeshMetrics = require('./lib/setupMetamaskMeshMetrics') +const EdgeEncryptor = require('./edge-encryptor') const STORAGE_KEY = 'metamask-config' const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG' @@ -30,6 +31,12 @@ global.METAMASK_NOTIFIER = notificationManager const release = platform.getVersion() const raven = setupRaven({ release }) +// browser check if it is Edge - https://stackoverflow.com/questions/9847580/how-to-detect-safari-chrome-ie-firefox-and-opera-browser +// Internet Explorer 6-11 +const isIE = !!document.documentMode +// Edge 20+ +const isEdge = !isIE && !!window.StyleMedia + let popupIsOpen = false // state persistence @@ -78,6 +85,7 @@ function setupController (initState) { initState, // platform specific api platform, + encryptor: isEdge ? new EdgeEncryptor() : undefined, }) global.metamaskController = controller diff --git a/app/scripts/edge-encryptor.js b/app/scripts/edge-encryptor.js new file mode 100644 index 000000000..9d6ac37b3 --- /dev/null +++ b/app/scripts/edge-encryptor.js @@ -0,0 +1,69 @@ +const asmcrypto = require('asmcrypto.js') +const Unibabel = require('browserify-unibabel') + +class EdgeEncryptor { + + encrypt (password, dataObject) { + + var salt = this._generateSalt() + return this.keyFromPassword(password, salt) + .then(function (key) { + + var data = JSON.stringify(dataObject) + var dataBuffer = Unibabel.utf8ToBuffer(data) + var vector = global.crypto.getRandomValues(new Uint8Array(16)) + var resultbuffer = asmcrypto.AES_GCM.encrypt(dataBuffer, key, vector) + + var buffer = new Uint8Array(resultbuffer) + var vectorStr = Unibabel.bufferToBase64(vector) + var vaultStr = Unibabel.bufferToBase64(buffer) + return JSON.stringify({ + data: vaultStr, + iv: vectorStr, + salt: salt, + }) + }) + } + + decrypt (password, text) { + + const payload = JSON.parse(text) + const salt = payload.salt + return this.keyFromPassword(password, salt) + .then(function (key) { + const encryptedData = Unibabel.base64ToBuffer(payload.data) + const vector = Unibabel.base64ToBuffer(payload.iv) + return new Promise((resolve, reject) => { + var result + try { + result = asmcrypto.AES_GCM.decrypt(encryptedData, key, vector) + } catch (err) { + return reject(new Error('Incorrect password')) + } + const decryptedData = new Uint8Array(result) + const decryptedStr = Unibabel.bufferToUtf8(decryptedData) + const decryptedObj = JSON.parse(decryptedStr) + resolve(decryptedObj) + }) + }) + } + + keyFromPassword (password, salt) { + + var passBuffer = Unibabel.utf8ToBuffer(password) + var saltBuffer = Unibabel.base64ToBuffer(salt) + return new Promise((resolve) => { + var key = asmcrypto.PBKDF2_HMAC_SHA256.bytes(passBuffer, saltBuffer, 10000) + resolve(key) + }) + } + + _generateSalt (byteCount = 32) { + var view = new Uint8Array(byteCount) + global.crypto.getRandomValues(view) + var b64encoded = btoa(String.fromCharCode.apply(null, view)) + return b64encoded + } +} + +module.exports = EdgeEncryptor diff --git a/package.json b/package.json index 74a9f15d0..c47c46004 100644 --- a/package.json +++ b/package.json @@ -51,6 +51,7 @@ ] }, "dependencies": { + "asmcrypto.js": "0.22.0", "async": "^2.5.0", "await-semaphore": "^0.1.1", "babel-runtime": "^6.23.0", -- cgit v1.2.3 From b45295499e0df87c20e1411b43d6e6ba88e9aeed Mon Sep 17 00:00:00 2001 From: Thomas Date: Thu, 22 Feb 2018 14:57:24 -0800 Subject: Version 4.0.0 --- CHANGELOG.md | 4 ++++ app/manifest.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fae2e0800..c97e6416f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Current Master +## 4.0.0 2018-2-22 + +- Introduce new MetaMask user interface. + ## 3.14.2 2018-2-15 - Fix bug where log subscriptions would break when switching network. diff --git a/app/manifest.json b/app/manifest.json index c4e134053..2abe673db 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "MetaMask", "short_name": "Metamask", - "version": "4.0.12", + "version": "4.0.0", "manifest_version": 2, "author": "https://metamask.io", "description": "Ethereum Browser Extension", -- cgit v1.2.3 From c1aa59f6eddac0a37f0084e37ab1281e109d1c80 Mon Sep 17 00:00:00 2001 From: Csaba Solya Date: Fri, 23 Feb 2018 10:08:23 +0100 Subject: adding tests --- test/unit/edge-encryptor-test.js | 66 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 test/unit/edge-encryptor-test.js diff --git a/test/unit/edge-encryptor-test.js b/test/unit/edge-encryptor-test.js new file mode 100644 index 000000000..627386051 --- /dev/null +++ b/test/unit/edge-encryptor-test.js @@ -0,0 +1,66 @@ +const assert = require('assert') + +const EdgeEncryptor = require('../../app/scripts/edge-encryptor') + +var password = 'passw0rd1' +var data = 'some random data' + +// polyfill fetch +global.crypto = global.crypto || { + getRandomValues (array) { + for (let i = 0; i < array.length; i++) { + array[i] = Math.random() * 100; + } + } +} + +describe('EdgeEncryptor', function () { + const edgeEncryptor = new EdgeEncryptor() + + describe('encrypt', function () { + + it('should encrypt the data.', function () { + edgeEncryptor.encrypt(password, data) + .then(function (encryptedData) { + assert.notEqual(data, encryptedData) + assert.notEqual(encryptedData.length, 0) + done() + }).catch(function (err) { + done(err) + }) + }) + + it('should not return the same twice.', function () { + + const encryptPromises = [] + encryptPromises.push(edgeEncryptor.encrypt(password, data)) + encryptPromises.push(edgeEncryptor.encrypt(password, data)) + + Promise.all(encryptPromises).then((encryptedData) => { + assert.equal(encryptedData.length, 2) + assert.notEqual(encryptedData[0], encryptedData[1]) + assert.notEqual(encryptedData[0].length, 0) + assert.notEqual(encryptedData[1].length, 0) + }) + }) + }) + + describe('decrypt', function () { + it('should be able to decrypt the encrypted data.', function () { + + edgeEncryptor.encrypt(password, data) + .then(function (encryptedData) { + edgeEncryptor.decrypt(password, encryptedData) + .then(function (decryptedData) { + assert.equal(decryptedData, data) + }) + .catch(function (err) { + done(err) + }) + }) + .catch(function (err) { + done(err) + }) + }) + }) +}) -- cgit v1.2.3 From 73d9bfc52cfb4b63f0960d80a7b68f2bf6f7d88c Mon Sep 17 00:00:00 2001 From: Csaba Solya Date: Fri, 23 Feb 2018 10:09:16 +0100 Subject: make keyFromPassword private --- app/scripts/edge-encryptor.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/scripts/edge-encryptor.js b/app/scripts/edge-encryptor.js index 9d6ac37b3..24c0c93a8 100644 --- a/app/scripts/edge-encryptor.js +++ b/app/scripts/edge-encryptor.js @@ -6,7 +6,7 @@ class EdgeEncryptor { encrypt (password, dataObject) { var salt = this._generateSalt() - return this.keyFromPassword(password, salt) + return this._keyFromPassword(password, salt) .then(function (key) { var data = JSON.stringify(dataObject) @@ -29,7 +29,7 @@ class EdgeEncryptor { const payload = JSON.parse(text) const salt = payload.salt - return this.keyFromPassword(password, salt) + return this._keyFromPassword(password, salt) .then(function (key) { const encryptedData = Unibabel.base64ToBuffer(payload.data) const vector = Unibabel.base64ToBuffer(payload.iv) @@ -48,7 +48,7 @@ class EdgeEncryptor { }) } - keyFromPassword (password, salt) { + _keyFromPassword (password, salt) { var passBuffer = Unibabel.utf8ToBuffer(password) var saltBuffer = Unibabel.base64ToBuffer(salt) -- cgit v1.2.3 From cd05d77c3fd9fe8e49d38b43728ff90b72b1ca9d Mon Sep 17 00:00:00 2001 From: Csaba Solya Date: Fri, 23 Feb 2018 10:49:56 +0100 Subject: fix tests --- test/unit/edge-encryptor-test.js | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/test/unit/edge-encryptor-test.js b/test/unit/edge-encryptor-test.js index 627386051..ef733a494 100644 --- a/test/unit/edge-encryptor-test.js +++ b/test/unit/edge-encryptor-test.js @@ -5,21 +5,21 @@ const EdgeEncryptor = require('../../app/scripts/edge-encryptor') var password = 'passw0rd1' var data = 'some random data' -// polyfill fetch global.crypto = global.crypto || { - getRandomValues (array) { + getRandomValues: function (array) { for (let i = 0; i < array.length; i++) { - array[i] = Math.random() * 100; + array[i] = Math.random() * 100 } + return array } } describe('EdgeEncryptor', function () { - const edgeEncryptor = new EdgeEncryptor() + const edgeEncryptor = new EdgeEncryptor() describe('encrypt', function () { - it('should encrypt the data.', function () { + it('should encrypt the data.', function (done) { edgeEncryptor.encrypt(password, data) .then(function (encryptedData) { assert.notEqual(data, encryptedData) @@ -30,6 +30,19 @@ describe('EdgeEncryptor', function () { }) }) + it('should return proper format.', function (done) { + edgeEncryptor.encrypt(password, data) + .then(function (encryptedData) { + let encryptedObject = JSON.parse(encryptedData) + assert.ok(encryptedObject.data, 'there is no data') + assert.ok(encryptedObject.iv && encryptedObject.iv.length != 0, 'there is no iv') + assert.ok(encryptedObject.salt && encryptedObject.salt.length != 0, 'there is no salt') + done() + }).catch(function (err) { + done(err) + }) + }) + it('should not return the same twice.', function () { const encryptPromises = [] @@ -46,13 +59,14 @@ describe('EdgeEncryptor', function () { }) describe('decrypt', function () { - it('should be able to decrypt the encrypted data.', function () { + it('should be able to decrypt the encrypted data.', function (done) { edgeEncryptor.encrypt(password, data) .then(function (encryptedData) { edgeEncryptor.decrypt(password, encryptedData) .then(function (decryptedData) { assert.equal(decryptedData, data) + done() }) .catch(function (err) { done(err) -- cgit v1.2.3 From 8292dabed56b858fa2ccec7497627f5e5aa65181 Mon Sep 17 00:00:00 2001 From: Csaba Solya Date: Fri, 23 Feb 2018 11:03:53 +0100 Subject: add negative decrypt test --- test/unit/edge-encryptor-test.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/test/unit/edge-encryptor-test.js b/test/unit/edge-encryptor-test.js index ef733a494..1dad4b91e 100644 --- a/test/unit/edge-encryptor-test.js +++ b/test/unit/edge-encryptor-test.js @@ -76,5 +76,25 @@ describe('EdgeEncryptor', function () { done(err) }) }) + + it('cannot decrypt the encrypted data with wrong password.', function (done) { + + edgeEncryptor.encrypt(password, data) + .then(function (encryptedData) { + edgeEncryptor.decrypt('wrong password', encryptedData) + .then(function (decryptedData) { + assert.fail('could decrypt with wrong password') + done() + }) + .catch(function (err) { + assert.ok(err instanceof Error) + assert.equal(err.message, 'Incorrect password') + done() + }) + }) + .catch(function (err) { + done(err) + }) + }) }) }) -- cgit v1.2.3 From 1b367bc2150434f5d2324d4344dfbbeff0eb4967 Mon Sep 17 00:00:00 2001 From: Csaba Solya Date: Fri, 23 Feb 2018 11:11:14 +0100 Subject: fix test --- test/unit/edge-encryptor-test.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/unit/edge-encryptor-test.js b/test/unit/edge-encryptor-test.js index 1dad4b91e..d3f014d74 100644 --- a/test/unit/edge-encryptor-test.js +++ b/test/unit/edge-encryptor-test.js @@ -43,7 +43,7 @@ describe('EdgeEncryptor', function () { }) }) - it('should not return the same twice.', function () { + it('should not return the same twice.', function (done) { const encryptPromises = [] encryptPromises.push(edgeEncryptor.encrypt(password, data)) @@ -54,6 +54,7 @@ describe('EdgeEncryptor', function () { assert.notEqual(encryptedData[0], encryptedData[1]) assert.notEqual(encryptedData[0].length, 0) assert.notEqual(encryptedData[1].length, 0) + done() }) }) }) -- cgit v1.2.3 From b24d949ca44a2a0a8414625ebd58a6882a3fd81c Mon Sep 17 00:00:00 2001 From: frankiebee Date: Mon, 26 Feb 2018 10:55:30 -0800 Subject: fix feature flags being undefined --- ui/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/index.js b/ui/index.js index bc3676c1f..fdb2f23e0 100644 --- a/ui/index.js +++ b/ui/index.js @@ -25,6 +25,7 @@ function launchMetamaskUi (opts, cb) { function startApp (metamaskState, accountManager, opts) { // parse opts + if (!metamaskState.featureFlags) metamaskState.featureFlags = {} const store = configureStore({ // metamaskState represents the cross-tab state -- cgit v1.2.3 From 3eba74a0f50d2635c6c80d9e5ce61663b9108eb7 Mon Sep 17 00:00:00 2001 From: Thomas Date: Mon, 26 Feb 2018 16:23:24 -0800 Subject: Update LICENSE to current year. --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 96e55582b..ddfbecf90 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2016 MetaMask +Copyright (c) 2018 MetaMask Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal -- cgit v1.2.3 From 746c3e5f1803e9b3712d22a4e4dd7ab43e84e060 Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 27 Feb 2018 13:34:31 -0330 Subject: Body width container in first time flow is consistent with app bar. --- mascara/src/app/first-time/index.css | 7 ++++++- ui/app/css/itcss/components/newui-sections.scss | 24 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/mascara/src/app/first-time/index.css b/mascara/src/app/first-time/index.css index 4314efbe6..4f2400222 100644 --- a/mascara/src/app/first-time/index.css +++ b/mascara/src/app/first-time/index.css @@ -4,6 +4,8 @@ width: 100vw; background-color: #FFF; overflow: auto; + display: flex; + justify-content: center; } .alpha-warning { @@ -23,7 +25,6 @@ display: flex; flex-flow: column; margin-top: 70px; - margin-right: 10vw; width: 35vw; max-width: 550px; } @@ -48,6 +49,10 @@ max-width: 35rem; } +.create-password { + margin: 67px 0 50px 0px; +} + .import-account { max-width: initial; } diff --git a/ui/app/css/itcss/components/newui-sections.scss b/ui/app/css/itcss/components/newui-sections.scss index 73faebe8b..ecf5e1036 100644 --- a/ui/app/css/itcss/components/newui-sections.scss +++ b/ui/app/css/itcss/components/newui-sections.scss @@ -290,3 +290,27 @@ $wallet-view-bg: $alabaster; .token-balance__amount { padding-right: 6px; } + + +// first time +.first-view-main { + display: flex; + flex-direction: row-reverse; + justify-content: space-between; + + @media screen and (max-width: 575px) { + height: 100%; + } + + @media screen and (min-width: 576px) { + width: 85vw; + } + + @media screen and (min-width: 769px) { + width: 80vw; + } + + @media screen and (min-width: 1281px) { + width: 62vw; + } +} \ No newline at end of file -- cgit v1.2.3 From 07edf3f9ffdee9459f4d0b9d30b8b6821d26dbf0 Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 27 Feb 2018 13:35:29 -0330 Subject: NewUI first time flow warning message change. --- mascara/src/app/first-time/create-password-screen.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mascara/src/app/first-time/create-password-screen.js b/mascara/src/app/first-time/create-password-screen.js index d1a2ec70f..d348eaa1a 100644 --- a/mascara/src/app/first-time/create-password-screen.js +++ b/mascara/src/app/first-time/create-password-screen.js @@ -59,7 +59,7 @@ class CreatePasswordScreen extends Component { ? : (
-

Warning: This is Experimental software and is a Developer BETA

+

Please be aware that this version is still in under development.

Date: Tue, 27 Feb 2018 13:43:22 -0330 Subject: Move beta warning to app header. --- mascara/src/app/first-time/create-password-screen.js | 1 - ui/app/app.js | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mascara/src/app/first-time/create-password-screen.js b/mascara/src/app/first-time/create-password-screen.js index d348eaa1a..450d6a479 100644 --- a/mascara/src/app/first-time/create-password-screen.js +++ b/mascara/src/app/first-time/create-password-screen.js @@ -59,7 +59,6 @@ class CreatePasswordScreen extends Component { ? : (
-

Please be aware that this version is still in under development.

Date: Tue, 27 Feb 2018 13:59:33 -0330 Subject: Adds beta label to Metamask name in full screen app bar. --- ui/app/app.js | 2 ++ ui/app/css/itcss/components/header.scss | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/ui/app/app.js b/ui/app/app.js index 7490c63b1..5d37b9bdf 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -288,6 +288,8 @@ App.prototype.renderAppBar = function () { // metamask name h('h1', 'MetaMask'), + h('div.beta-label', 'BETA'), + ]), h('div.header__right-actions', [ diff --git a/ui/app/css/itcss/components/header.scss b/ui/app/css/itcss/components/header.scss index ac2cecf7e..d91ab3c48 100644 --- a/ui/app/css/itcss/components/header.scss +++ b/ui/app/css/itcss/components/header.scss @@ -76,6 +76,21 @@ } } +.beta-label { + font-family: Roboto; + text-transform: uppercase; + font-weight: 500; + font-size: 0.8rem; + padding-left: 9px; + color: $buttercup; + align-self: flex-start; + margin-top: 10px; + + @media screen and (max-width: 575px) { + display: none; + } +} + h2.page-subtitle { text-transform: uppercase; color: #aeaeae; -- cgit v1.2.3 From baab9917ff741dd8e2f7efea63f85bc3de0f89ca Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 27 Feb 2018 14:14:55 -0330 Subject: Padding of alpha warning aligns with app-bar --- mascara/src/app/first-time/index.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mascara/src/app/first-time/index.css b/mascara/src/app/first-time/index.css index 4f2400222..109946e1d 100644 --- a/mascara/src/app/first-time/index.css +++ b/mascara/src/app/first-time/index.css @@ -12,7 +12,7 @@ background: #f7861c; color: #fff; line-height: 2em; - padding-left: 2em; + padding-left: 10vw; } .first-view-main { -- cgit v1.2.3 From d9486a3ce535636f890bee76a635571f2be0ec7c Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 27 Feb 2018 10:35:43 -0800 Subject: Bump Version --- CHANGELOG.md | 6 ++++++ app/manifest.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c97e6416f..fcddc76cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## Current Master +## 4.1.0 2018-2-27 + +- Sentry report failed tx with more specific message +- Fix feature flags being undefined +- Standardized license + ## 4.0.0 2018-2-22 - Introduce new MetaMask user interface. diff --git a/app/manifest.json b/app/manifest.json index 2abe673db..eab6c7063 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "MetaMask", "short_name": "Metamask", - "version": "4.0.0", + "version": "4.1.0", "manifest_version": 2, "author": "https://metamask.io", "description": "Ethereum Browser Extension", -- cgit v1.2.3 From dae5d085d1bb448971e93b4905f8931a10bf5ce6 Mon Sep 17 00:00:00 2001 From: kumavis Date: Tue, 27 Feb 2018 10:37:43 -0800 Subject: changelog - improve changelog notes --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fcddc76cf..abc89f9c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,9 @@ ## 4.1.0 2018-2-27 -- Sentry report failed tx with more specific message -- Fix feature flags being undefined -- Standardized license +- Report failed txs to Sentry with more specific message +- Fix internal feature flags being sometimes undefined +- Standardized license to MIT ## 4.0.0 2018-2-22 -- cgit v1.2.3 From 50f20358c1ffe0e04f65025db9ac9627af313b33 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 27 Feb 2018 12:01:09 -0800 Subject: Add import account disclaimer --- old-ui/app/accounts/import/index.js | 26 ++++++++++++++++++++++---- old-ui/app/css/lib.css | 2 +- ui/app/accounts/import/index.js | 22 ++++++++++++++++++++++ 3 files changed, 45 insertions(+), 5 deletions(-) diff --git a/old-ui/app/accounts/import/index.js b/old-ui/app/accounts/import/index.js index 3502efe93..a57525ccf 100644 --- a/old-ui/app/accounts/import/index.js +++ b/old-ui/app/accounts/import/index.js @@ -34,10 +34,7 @@ AccountImportSubview.prototype.render = function () { const { type } = state return ( - h('div', { - style: { - }, - }, [ + h('div', [ h('.section-title.flex-row.flex-center', [ h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', { onClick: (event) => { @@ -46,6 +43,27 @@ AccountImportSubview.prototype.render = function () { }), h('h2.page-subtitle', 'Import Accounts'), ]), + h('.error', { + style: { + display: 'inline-block', + alignItems: 'center', + padding: '5px 15px 0px 15px', + }, + }, [ + h('span', 'Imported accounts will not be associated with your originally created MetaMask account seedphrase. Learn more about imported accounts '), + h('span', { + style: { + color: 'rgba(247, 134, 28, 1)', + cursor: 'pointer', + textDecoration: 'underline', + }, + onClick: () => { + global.platform.openWindow({ + url: 'https://metamask.helpscoutdocs.com/article/17-what-are-loose-accounts', + }) + }, + }, 'here.'), + ]), h('div', { style: { padding: '10px', diff --git a/old-ui/app/css/lib.css b/old-ui/app/css/lib.css index f3acbee76..fd63b2b2e 100644 --- a/old-ui/app/css/lib.css +++ b/old-ui/app/css/lib.css @@ -217,7 +217,7 @@ hr.horizontal-line { background: rgba(255,0,0,0.8); color: white; bottom: 0px; - left: -8px; + left: -18px; border-radius: 10px; height: 20px; min-width: 20px; diff --git a/ui/app/accounts/import/index.js b/ui/app/accounts/import/index.js index 71eb9ae23..7e7d3aa91 100644 --- a/ui/app/accounts/import/index.js +++ b/ui/app/accounts/import/index.js @@ -35,6 +35,28 @@ AccountImportSubview.prototype.render = function () { return ( h('div.new-account-import-form', [ + h('.warning', { + style: { + display: 'inline-block', + alignItems: 'center', + padding: '15px 15px 0px 15px', + }, + }, [ + h('span', 'Imported accounts will not be associated with your originally created MetaMask account seedphrase. Learn more about imported accounts '), + h('span', { + style: { + color: 'rgba(247, 134, 28, 1)', + cursor: 'pointer', + textDecoration: 'underline', + }, + onClick: () => { + global.platform.openWindow({ + url: 'https://metamask.helpscoutdocs.com/article/17-what-are-loose-accounts', + }) + }, + }, 'here.'), + ]), + h('div.new-account-import-form__select-section', [ h('div.new-account-import-form__select-label', 'Select Type'), -- cgit v1.2.3 From ac2e92fa5424bbb1517d7443a7c40dcac92af638 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 27 Feb 2018 12:02:48 -0800 Subject: Change Loose label to Imported --- old-ui/app/components/account-dropdowns.js | 2 +- ui/app/components/dropdowns/components/account-dropdowns.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/old-ui/app/components/account-dropdowns.js b/old-ui/app/components/account-dropdowns.js index aa7a3ad67..981f4d8a3 100644 --- a/old-ui/app/components/account-dropdowns.js +++ b/old-ui/app/components/account-dropdowns.js @@ -79,7 +79,7 @@ class AccountDropdowns extends Component { try { // Sometimes keyrings aren't loaded yet: const type = keyring.type const isLoose = type !== 'HD Key Tree' - return isLoose ? h('.keyring-label', 'LOOSE') : null + return isLoose ? h('.keyring-label', 'IMPORTED') : null } catch (e) { return } } diff --git a/ui/app/components/dropdowns/components/account-dropdowns.js b/ui/app/components/dropdowns/components/account-dropdowns.js index d3a549884..f637ca19d 100644 --- a/ui/app/components/dropdowns/components/account-dropdowns.js +++ b/ui/app/components/dropdowns/components/account-dropdowns.js @@ -159,7 +159,7 @@ class AccountDropdowns extends Component { try { // Sometimes keyrings aren't loaded yet: const type = keyring.type const isLoose = type !== 'HD Key Tree' - return isLoose ? h('.keyring-label', 'LOOSE') : null + return isLoose ? h('.keyring-label', 'IMPORTED') : null } catch (e) { return } } -- cgit v1.2.3 From 7aa324bdf61e83f9ed64e6b0354d88e0af76f42b Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 27 Feb 2018 12:06:24 -0800 Subject: Remove committed out merge code --- .../components/dropdowns/components/account-dropdowns.js | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/ui/app/components/dropdowns/components/account-dropdowns.js b/ui/app/components/dropdowns/components/account-dropdowns.js index f637ca19d..78b059d5b 100644 --- a/ui/app/components/dropdowns/components/account-dropdowns.js +++ b/ui/app/components/dropdowns/components/account-dropdowns.js @@ -134,22 +134,6 @@ class AccountDropdowns extends Component { ]), ]), -// ======= -// }, -// ), -// this.indicateIfLoose(keyring), -// h('span', { -// style: { -// marginLeft: '20px', -// fontSize: '24px', -// maxWidth: '145px', -// whiteSpace: 'nowrap', -// overflow: 'hidden', -// textOverflow: 'ellipsis', -// }, -// }, identity.name || ''), -// h('span', { style: { marginLeft: '20px', fontSize: '24px' } }, isSelected ? h('.check', '✓') : null), -// >>>>>>> master:ui/app/components/account-dropdowns.js ] ) }) -- cgit v1.2.3 From b4aac16c5830e974e5dd1093e80c1221892b9128 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 27 Feb 2018 12:08:05 -0800 Subject: Add changes to CHANGELOG --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index abc89f9c7..fce90f89c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## Current Master +- Change Loose label to Imported. +- Add Imported Account disclaimer. + ## 4.1.0 2018-2-27 - Report failed txs to Sentry with more specific message -- cgit v1.2.3 From 5de0471fcb65fb70dbb55e514a2da48b0e187d50 Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 27 Feb 2018 19:14:23 -0330 Subject: Fix cancel button on buy eth screen. --- old-ui/app/components/coinbase-form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/old-ui/app/components/coinbase-form.js b/old-ui/app/components/coinbase-form.js index 35b2111ff..1a1b77b50 100644 --- a/old-ui/app/components/coinbase-form.js +++ b/old-ui/app/components/coinbase-form.js @@ -40,7 +40,7 @@ CoinbaseForm.prototype.render = function () { }, 'Continue to Coinbase'), h('button.btn-red', { - onClick: () => props.dispatch(actions.backTobuyView(props.accounts.address)), + onClick: () => props.dispatch(actions.goHome()), }, 'Cancel'), ]), ]) -- cgit v1.2.3 From 2b9af0734b6127349ed4f1ed535dee858633776b Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 27 Feb 2018 20:05:54 -0330 Subject: Replace 'Contract Published' with 'Contract Deployment' for clearer indication of contract tx state. --- old-ui/app/components/transaction-list-item.js | 2 +- ui/app/components/transaction-list-item.js | 2 +- ui/app/components/tx-list-item.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/old-ui/app/components/transaction-list-item.js b/old-ui/app/components/transaction-list-item.js index 76a456d3f..95670bd54 100644 --- a/old-ui/app/components/transaction-list-item.js +++ b/old-ui/app/components/transaction-list-item.js @@ -123,7 +123,7 @@ function recipientField (txParams, transaction, isTx, isMsg) { } else if (txParams.to) { message = addressSummary(txParams.to) } else { - message = 'Contract Published' + message = 'Contract Deployment' } return h('div', { diff --git a/ui/app/components/transaction-list-item.js b/ui/app/components/transaction-list-item.js index 4e3d2cb93..a45cd441a 100644 --- a/ui/app/components/transaction-list-item.js +++ b/ui/app/components/transaction-list-item.js @@ -180,7 +180,7 @@ function recipientField (txParams, transaction, isTx, isMsg) { } else if (txParams.to) { message = addressSummary(txParams.to) } else { - message = 'Contract Published' + message = 'Contract Deployment' } return h('div', { diff --git a/ui/app/components/tx-list-item.js b/ui/app/components/tx-list-item.js index 7ccc5c315..1a13070c8 100644 --- a/ui/app/components/tx-list-item.js +++ b/ui/app/components/tx-list-item.js @@ -63,7 +63,7 @@ TxListItem.prototype.getAddressText = function () { default: return address ? `${address.slice(0, 10)}...${address.slice(-4)}` - : 'Contract Published' + : 'Contract Deployment' } } -- cgit v1.2.3 From b2f53fa35481006cba37d89ebf4c7a866be4f125 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 27 Feb 2018 15:50:49 -0800 Subject: Revert initializing first-time-state --- test/stub/first-time-state.js | 14 -------------- test/unit/metamask-controller-test.js | 6 +++--- 2 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 test/stub/first-time-state.js diff --git a/test/stub/first-time-state.js b/test/stub/first-time-state.js deleted file mode 100644 index c9d5a4fe9..000000000 --- a/test/stub/first-time-state.js +++ /dev/null @@ -1,14 +0,0 @@ - -// test and development environment variables -const { createTestProviderTools } = require('../stub/provider') -const providerResultStub = {} -const provider = createTestProviderTools({ scaffold: providerResultStub }).provider -// -// The default state of MetaMask -// -module.exports = { - config: {}, - NetworkController: { - provider, - }, -} diff --git a/test/unit/metamask-controller-test.js b/test/unit/metamask-controller-test.js index ac984faf5..adeca9b5f 100644 --- a/test/unit/metamask-controller-test.js +++ b/test/unit/metamask-controller-test.js @@ -4,7 +4,7 @@ const clone = require('clone') const nock = require('nock') const MetaMaskController = require('../../app/scripts/metamask-controller') const blacklistJSON = require('../stub/blacklist') -const firstTimeState = require('../stub/first-time-state') +const firstTimeState = require('../../app/scripts/first-time-state') describe('MetaMaskController', function () { let metamaskController @@ -18,9 +18,9 @@ describe('MetaMaskController', function () { .get('/v2/blacklist') .reply(200, blacklistJSON) - nock('https://rinkeby.infura.io') + nock('https://api.infura.io') .persist() - .post('/metamask') + .get(/.*/) .reply(200) metamaskController = new MetaMaskController({ -- cgit v1.2.3 From f9de87af51ccb1190ca93e524de24f8a32ea3d9e Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 27 Feb 2018 15:51:14 -0800 Subject: Using noop to not lose it --- test/unit/network-contoller-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/network-contoller-test.js b/test/unit/network-contoller-test.js index cd8c345c5..51ad09f87 100644 --- a/test/unit/network-contoller-test.js +++ b/test/unit/network-contoller-test.js @@ -10,7 +10,7 @@ describe('# Network Controller', function () { let networkController const noop = () => {} const networkControllerProviderInit = { - getAccounts: () => {}, + getAccounts: noop, } beforeEach(function () { -- cgit v1.2.3 From 78f6a4866425ca9fd7795d91ea5dacd47599c1ab Mon Sep 17 00:00:00 2001 From: Dan Date: Wed, 28 Feb 2018 13:12:06 -0330 Subject: Define event locally in onClickOutside method in account-dropdowns.js --- old-ui/app/components/account-dropdowns.js | 2 +- ui/app/components/account-dropdowns.js | 2 +- ui/app/components/dropdowns/components/account-dropdowns.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/old-ui/app/components/account-dropdowns.js b/old-ui/app/components/account-dropdowns.js index aa7a3ad67..7a2357921 100644 --- a/old-ui/app/components/account-dropdowns.js +++ b/old-ui/app/components/account-dropdowns.js @@ -173,7 +173,7 @@ class AccountDropdowns extends Component { minWidth: '180px', }, isOpen: optionsMenuActive, - onClickOutside: () => { + onClickOutside: (event) => { const { classList } = event.target const isNotToggleElement = !classList.contains(this.optionsMenuToggleClassName) if (optionsMenuActive && isNotToggleElement) { diff --git a/ui/app/components/account-dropdowns.js b/ui/app/components/account-dropdowns.js index f69a6ca68..1cd7a0847 100644 --- a/ui/app/components/account-dropdowns.js +++ b/ui/app/components/account-dropdowns.js @@ -173,7 +173,7 @@ class AccountDropdowns extends Component { minWidth: '180px', }, isOpen: optionsMenuActive, - onClickOutside: () => { + onClickOutside: (event) => { const { classList } = event.target const isNotToggleElement = !classList.contains(this.optionsMenuToggleClassName) if (optionsMenuActive && isNotToggleElement) { diff --git a/ui/app/components/dropdowns/components/account-dropdowns.js b/ui/app/components/dropdowns/components/account-dropdowns.js index d3a549884..fa9ffc632 100644 --- a/ui/app/components/dropdowns/components/account-dropdowns.js +++ b/ui/app/components/dropdowns/components/account-dropdowns.js @@ -281,7 +281,7 @@ class AccountDropdowns extends Component { dropdownWrapperStyle, ), isOpen: optionsMenuActive, - onClickOutside: () => { + onClickOutside: (event) => { const { classList } = event.target const isNotToggleElement = !classList.contains(this.optionsMenuToggleClassName) if (optionsMenuActive && isNotToggleElement) { -- cgit v1.2.3 From c4ef9630dae73d68cfc3191a182c03b840a33a0d Mon Sep 17 00:00:00 2001 From: Dan Date: Wed, 28 Feb 2018 14:13:44 -0330 Subject: Prevent user from switching network in old-ui notification --- old-ui/app/components/network.js | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/old-ui/app/components/network.js b/old-ui/app/components/network.js index 0dbe37cdd..59596dabd 100644 --- a/old-ui/app/components/network.js +++ b/old-ui/app/components/network.js @@ -23,14 +23,15 @@ Network.prototype.render = function () { if (networkNumber === 'loading') { return h('span.pointer', { + className: props.onClick && 'pointer', style: { display: 'flex', alignItems: 'center', flexDirection: 'row', }, - onClick: (event) => this.props.onClick(event), + onClick: (event) => props.onClick && props.onClick(event), }, [ - h('img', { + props.onClick && h('img', { title: 'Attempting to connect to blockchain.', style: { width: '27px', @@ -60,9 +61,10 @@ Network.prototype.render = function () { } return ( - h('#network_component.pointer', { + h('#network_component', { + className: props.onClick && 'pointer', title: hoverText, - onClick: (event) => this.props.onClick(event), + onClick: (event) => props.onClick && props.onClick(event), }, [ (function () { switch (iconName) { @@ -74,7 +76,7 @@ Network.prototype.render = function () { color: '#039396', }}, 'Main Network'), - h('i.fa.fa-caret-down.fa-lg'), + props.onClick && h('i.fa.fa-caret-down.fa-lg'), ]) case 'ropsten-test-network': return h('.network-indicator', [ @@ -84,7 +86,7 @@ Network.prototype.render = function () { color: '#ff6666', }}, 'Ropsten Test Net'), - h('i.fa.fa-caret-down.fa-lg'), + props.onClick && h('i.fa.fa-caret-down.fa-lg'), ]) case 'kovan-test-network': return h('.network-indicator', [ @@ -94,7 +96,7 @@ Network.prototype.render = function () { color: '#690496', }}, 'Kovan Test Net'), - h('i.fa.fa-caret-down.fa-lg'), + props.onClick && h('i.fa.fa-caret-down.fa-lg'), ]) case 'rinkeby-test-network': return h('.network-indicator', [ @@ -104,7 +106,7 @@ Network.prototype.render = function () { color: '#e7a218', }}, 'Rinkeby Test Net'), - h('i.fa.fa-caret-down.fa-lg'), + props.onClick && h('i.fa.fa-caret-down.fa-lg'), ]) default: return h('.network-indicator', [ @@ -120,7 +122,7 @@ Network.prototype.render = function () { color: '#AEAEAE', }}, 'Private Network'), - h('i.fa.fa-caret-down.fa-lg'), + props.onClick && h('i.fa.fa-caret-down.fa-lg'), ]) } })(), -- cgit v1.2.3 From fca2cbc8ef8e0d8434fd8c437497a7a0792e2caf Mon Sep 17 00:00:00 2001 From: kumavis Date: Wed, 28 Feb 2018 10:37:53 -0800 Subject: sentry - clean - move setupRaven to lib --- app/scripts/background.js | 2 +- app/scripts/lib/setupRaven.js | 26 ++++++++++++++++++++++++++ app/scripts/popup.js | 2 +- app/scripts/setupRaven.js | 26 -------------------------- 4 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 app/scripts/lib/setupRaven.js delete mode 100644 app/scripts/setupRaven.js diff --git a/app/scripts/background.js b/app/scripts/background.js index 476d073d1..0da079eb6 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -13,7 +13,7 @@ const PortStream = require('./lib/port-stream.js') const NotificationManager = require('./lib/notification-manager.js') const MetamaskController = require('./metamask-controller') const firstTimeState = require('./first-time-state') -const setupRaven = require('./setupRaven') +const setupRaven = require('./lib/setupRaven') const setupMetamaskMeshMetrics = require('./lib/setupMetamaskMeshMetrics') const STORAGE_KEY = 'metamask-config' diff --git a/app/scripts/lib/setupRaven.js b/app/scripts/lib/setupRaven.js new file mode 100644 index 000000000..42e48cb90 --- /dev/null +++ b/app/scripts/lib/setupRaven.js @@ -0,0 +1,26 @@ +const Raven = require('../vendor/raven.min.js') +const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG' +const PROD = 'https://3567c198f8a8412082d32655da2961d0@sentry.io/273505' +const DEV = 'https://f59f3dd640d2429d9d0e2445a87ea8e1@sentry.io/273496' + +module.exports = setupRaven + +// Setup raven / sentry remote error reporting +function setupRaven(opts) { + const { release } = opts + let ravenTarget + + if (METAMASK_DEBUG) { + console.log('Setting up Sentry Remote Error Reporting: DEV') + ravenTarget = DEV + } else { + console.log('Setting up Sentry Remote Error Reporting: PROD') + ravenTarget = PROD + } + + Raven.config(ravenTarget, { + release, + }).install() + + return Raven +} diff --git a/app/scripts/popup.js b/app/scripts/popup.js index 53ab00e00..11d50ee87 100644 --- a/app/scripts/popup.js +++ b/app/scripts/popup.js @@ -8,7 +8,7 @@ const extension = require('extensionizer') const ExtensionPlatform = require('./platforms/extension') const NotificationManager = require('./lib/notification-manager') const notificationManager = new NotificationManager() -const setupRaven = require('./setupRaven') +const setupRaven = require('./lib/setupRaven') // create platform global global.platform = new ExtensionPlatform() diff --git a/app/scripts/setupRaven.js b/app/scripts/setupRaven.js deleted file mode 100644 index 7beffeff9..000000000 --- a/app/scripts/setupRaven.js +++ /dev/null @@ -1,26 +0,0 @@ -const Raven = require('./vendor/raven.min.js') -const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG' -const PROD = 'https://3567c198f8a8412082d32655da2961d0@sentry.io/273505' -const DEV = 'https://f59f3dd640d2429d9d0e2445a87ea8e1@sentry.io/273496' - -module.exports = setupRaven - -// Setup raven / sentry remote error reporting -function setupRaven(opts) { - const { release } = opts - let ravenTarget - - if (METAMASK_DEBUG) { - console.log('Setting up Sentry Remote Error Reporting: DEV') - ravenTarget = DEV - } else { - console.log('Setting up Sentry Remote Error Reporting: PROD') - ravenTarget = PROD - } - - Raven.config(ravenTarget, { - release, - }).install() - - return Raven -} -- cgit v1.2.3 From 8e5bcf89359edb70b5d6847a4848c222aa283066 Mon Sep 17 00:00:00 2001 From: kumavis Date: Wed, 28 Feb 2018 10:53:54 -0800 Subject: sentry - failed tx - improve ethjs-rpc error formating --- app/scripts/background.js | 8 +++---- app/scripts/lib/reportFailedTxToSentry.js | 38 +++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 app/scripts/lib/reportFailedTxToSentry.js diff --git a/app/scripts/background.js b/app/scripts/background.js index 0da079eb6..4487ff318 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -14,8 +14,10 @@ const NotificationManager = require('./lib/notification-manager.js') const MetamaskController = require('./metamask-controller') const firstTimeState = require('./first-time-state') const setupRaven = require('./lib/setupRaven') +const reportFailedTxToSentry = require('./lib/reportFailedTxToSentry') const setupMetamaskMeshMetrics = require('./lib/setupMetamaskMeshMetrics') + const STORAGE_KEY = 'metamask-config' const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG' @@ -86,11 +88,7 @@ function setupController (initState) { controller.txController.on(`tx:status-update`, (txId, status) => { if (status !== 'failed') return const txMeta = controller.txController.txStateManager.getTx(txId) - const errorMessage = `Transaction Failed: ${txMeta.err.message}` - raven.captureMessage(errorMessage, { - // "extra" key is required by Sentry - extra: txMeta, - }) + reportFailedTxToSentry({ raven, txMeta }) }) // setup state persistence diff --git a/app/scripts/lib/reportFailedTxToSentry.js b/app/scripts/lib/reportFailedTxToSentry.js new file mode 100644 index 000000000..67b0acf43 --- /dev/null +++ b/app/scripts/lib/reportFailedTxToSentry.js @@ -0,0 +1,38 @@ +const ethJsRpcSlug = 'Error: [ethjs-rpc] rpc error with payload ' +const errorLabelPrefix = 'Error: ' + +module.exports = reportFailedTxToSentry + +// +// utility for formatting failed transaction messages +// for sending to sentry +// + +function reportFailedTxToSentry({ raven, txMeta }) { + const errorMessage = extractErrorMessage(txMeta.err.message) + raven.captureMessage(errorMessage, { + // "extra" key is required by Sentry + extra: txMeta, + }) +} + +// +// ethjs-rpc provides overly verbose error messages +// if we detect this type of message, we extract the important part +// Below is an example input and output +// +// Error: [ethjs-rpc] rpc error with payload {"id":3947817945380,"jsonrpc":"2.0","params":["0xf8eb8208708477359400830398539406012c8cf97bead5deae237070f9587f8e7a266d80b8843d7d3f5a0000000000000000000000000000000000000000000000000000000000081d1a000000000000000000000000000000000000000000000000001ff973cafa800000000000000000000000000000000000000000000000000000038d7ea4c68000000000000000000000000000000000000000000000000000000000000003f48025a04c32a9b630e0d9e7ff361562d850c86b7a884908135956a7e4a336fa0300d19ca06830776423f25218e8d19b267161db526e66895567147015b1f3fc47aef9a3c7"],"method":"eth_sendRawTransaction"} Error: replacement transaction underpriced +// +// "Transaction Failed: replacement transaction underpriced" +// + +function extractErrorMessage(errorMessage) { + const isEthjsRpcError = errorMessage.includes(ethJsRpcSlug) + if (isEthjsRpcError) { + const payloadAndError = errorMessage.slice(ethJsRpcSlug.length) + const originalError = payloadAndError.slice(payloadAndError.indexOf(errorLabelPrefix) + errorLabelPrefix.length) + return `Transaction Failed: ${originalError}` + } else { + return `Transaction Failed: ${errorMessage}` + } +} -- cgit v1.2.3 From c3bd27c9657d5e0236e2960dedd108ca5e2bb0ec Mon Sep 17 00:00:00 2001 From: kumavis Date: Wed, 28 Feb 2018 10:57:54 -0800 Subject: sentry - extractErrorMessage - fix comment formatting --- app/scripts/lib/reportFailedTxToSentry.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/lib/reportFailedTxToSentry.js b/app/scripts/lib/reportFailedTxToSentry.js index 67b0acf43..ee73f6845 100644 --- a/app/scripts/lib/reportFailedTxToSentry.js +++ b/app/scripts/lib/reportFailedTxToSentry.js @@ -23,7 +23,7 @@ function reportFailedTxToSentry({ raven, txMeta }) { // // Error: [ethjs-rpc] rpc error with payload {"id":3947817945380,"jsonrpc":"2.0","params":["0xf8eb8208708477359400830398539406012c8cf97bead5deae237070f9587f8e7a266d80b8843d7d3f5a0000000000000000000000000000000000000000000000000000000000081d1a000000000000000000000000000000000000000000000000001ff973cafa800000000000000000000000000000000000000000000000000000038d7ea4c68000000000000000000000000000000000000000000000000000000000000003f48025a04c32a9b630e0d9e7ff361562d850c86b7a884908135956a7e4a336fa0300d19ca06830776423f25218e8d19b267161db526e66895567147015b1f3fc47aef9a3c7"],"method":"eth_sendRawTransaction"} Error: replacement transaction underpriced // -// "Transaction Failed: replacement transaction underpriced" +// Transaction Failed: replacement transaction underpriced // function extractErrorMessage(errorMessage) { -- cgit v1.2.3 From d45116824c289a12ba43fcff257d282ef7f38902 Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Wed, 28 Feb 2018 13:03:46 -0800 Subject: Check in all font files locally. --- app/fonts/Font_Awesome/font-awesome.min.css | 4 + app/fonts/fonts/FontAwesome.otf | Bin 0 -> 106260 bytes app/fonts/fonts/fontawesome-webfont.eot | Bin 0 -> 68875 bytes app/fonts/fonts/fontawesome-webfont.svg | 640 ++++++++++++++++++++++++++++ app/fonts/fonts/fontawesome-webfont.ttf | Bin 0 -> 138204 bytes app/fonts/fonts/fontawesome-webfont.woff | Bin 0 -> 81284 bytes app/fonts/fonts/fontawesome-webfont.woff2 | Bin 0 -> 64464 bytes old-ui/app/css/fonts.css | 340 ++++++++++++++- old-ui/app/css/output/index.css | 341 ++++++++++++++- ui/app/css/itcss/settings/typography.scss | 338 ++++++++++++++- 10 files changed, 1657 insertions(+), 6 deletions(-) create mode 100644 app/fonts/Font_Awesome/font-awesome.min.css create mode 100644 app/fonts/fonts/FontAwesome.otf create mode 100644 app/fonts/fonts/fontawesome-webfont.eot create mode 100644 app/fonts/fonts/fontawesome-webfont.svg create mode 100644 app/fonts/fonts/fontawesome-webfont.ttf create mode 100644 app/fonts/fonts/fontawesome-webfont.woff create mode 100644 app/fonts/fonts/fontawesome-webfont.woff2 diff --git a/app/fonts/Font_Awesome/font-awesome.min.css b/app/fonts/Font_Awesome/font-awesome.min.css new file mode 100644 index 000000000..ee4e9782b --- /dev/null +++ b/app/fonts/Font_Awesome/font-awesome.min.css @@ -0,0 +1,4 @@ +/*! + * Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome + * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) + */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.4.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.4.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.4.0') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.4.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.4.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.4.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:.3em}.fa.fa-pull-right{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-y-combinator-square:before,.fa-yc-square:before,.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-hotel:before,.fa-bed:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-yc:before,.fa-y-combinator:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery-full:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-stop-o:before,.fa-hand-paper-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-tv:before,.fa-television:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"} diff --git a/app/fonts/fonts/FontAwesome.otf b/app/fonts/fonts/FontAwesome.otf new file mode 100644 index 000000000..681bdd4d4 Binary files /dev/null and b/app/fonts/fonts/FontAwesome.otf differ diff --git a/app/fonts/fonts/fontawesome-webfont.eot b/app/fonts/fonts/fontawesome-webfont.eot new file mode 100644 index 000000000..a30335d74 Binary files /dev/null and b/app/fonts/fonts/fontawesome-webfont.eot differ diff --git a/app/fonts/fonts/fontawesome-webfont.svg b/app/fonts/fonts/fontawesome-webfont.svg new file mode 100644 index 000000000..6fd19abcb --- /dev/null +++ b/app/fonts/fonts/fontawesome-webfont.svg @@ -0,0 +1,640 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/fonts/fonts/fontawesome-webfont.ttf b/app/fonts/fonts/fontawesome-webfont.ttf new file mode 100644 index 000000000..d7994e130 Binary files /dev/null and b/app/fonts/fonts/fontawesome-webfont.ttf differ diff --git a/app/fonts/fonts/fontawesome-webfont.woff b/app/fonts/fonts/fontawesome-webfont.woff new file mode 100644 index 000000000..6fd4ede0f Binary files /dev/null and b/app/fonts/fonts/fontawesome-webfont.woff differ diff --git a/app/fonts/fonts/fontawesome-webfont.woff2 b/app/fonts/fonts/fontawesome-webfont.woff2 new file mode 100644 index 000000000..5560193cc Binary files /dev/null and b/app/fonts/fonts/fontawesome-webfont.woff2 differ diff --git a/old-ui/app/css/fonts.css b/old-ui/app/css/fonts.css index 3b9f581b9..822f8cfc9 100644 --- a/old-ui/app/css/fonts.css +++ b/old-ui/app/css/fonts.css @@ -1,5 +1,341 @@ -@import url(https://fonts.googleapis.com/css?family=Roboto:300,500); -@import url(https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css); +/* cyrillic-ext */ +@import url('/fonts/Font_Awesome/font-awesome.min.css'); + +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; +} +/* cyrillic */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +/* greek-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + unicode-range: U+1F00-1FFF; +} +/* greek */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + unicode-range: U+0370-03FF; +} +/* vietnamese */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* cyrillic-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; +} +/* cyrillic */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +/* greek-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + unicode-range: U+1F00-1FFF; +} +/* greek */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + unicode-range: U+0370-03FF; +} +/* vietnamese */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* cyrillic-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; +} +/* cyrillic */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +/* greek-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + unicode-range: U+1F00-1FFF; +} +/* greek */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + unicode-range: U+0370-03FF; +} +/* vietnamese */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* cyrillic-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; +} +/* cyrillic */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +/* greek-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + unicode-range: U+1F00-1FFF; +} +/* greek */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + unicode-range: U+0370-03FF; +} +/* vietnamese */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* cyrillic-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; +} +/* cyrillic */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +/* greek-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + unicode-range: U+1F00-1FFF; +} +/* greek */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + unicode-range: U+0370-03FF; +} +/* vietnamese */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* cyrillic-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; +} +/* cyrillic */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +/* greek-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + unicode-range: U+1F00-1FFF; +} +/* greek */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + unicode-range: U+0370-03FF; +} +/* vietnamese */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} @font-face { font-family: 'Montserrat Regular'; diff --git a/old-ui/app/css/output/index.css b/old-ui/app/css/output/index.css index 84ceb3bd7..a0e987a7b 100644 --- a/old-ui/app/css/output/index.css +++ b/old-ui/app/css/output/index.css @@ -26,8 +26,345 @@ /* Responsive Breakpoints */ -@import url("https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"); -@import url("https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css"); + + @import url('/fonts/Font_Awesome/font-awesome.min.css'); + + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; + } + /* cyrillic */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; + } + /* greek-ext */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + unicode-range: U+1F00-1FFF; + } + /* greek */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + unicode-range: U+0370-03FF; + } + /* vietnamese */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; + } + /* latin-ext */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; + } + /* latin */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; + } + /* cyrillic-ext */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; + } + /* cyrillic */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; + } + /* greek-ext */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + unicode-range: U+1F00-1FFF; + } + /* greek */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + unicode-range: U+0370-03FF; + } + /* vietnamese */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; + } + /* latin-ext */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; + } + /* latin */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; + } + /* cyrillic-ext */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; + } + /* cyrillic */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; + } + /* greek-ext */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + unicode-range: U+1F00-1FFF; + } + /* greek */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + unicode-range: U+0370-03FF; + } + /* vietnamese */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; + } + /* latin-ext */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; + } + /* latin */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; + } + /* cyrillic-ext */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; + } + /* cyrillic */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; + } + /* greek-ext */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + unicode-range: U+1F00-1FFF; + } + /* greek */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + unicode-range: U+0370-03FF; + } + /* vietnamese */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; + } + /* latin-ext */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; + } + /* latin */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; + } + /* cyrillic-ext */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; + } + /* cyrillic */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; + } + /* greek-ext */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + unicode-range: U+1F00-1FFF; + } + /* greek */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + unicode-range: U+0370-03FF; + } + /* vietnamese */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; + } + /* latin-ext */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; + } + /* latin */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; + } + /* cyrillic-ext */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; + } + /* cyrillic */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; + } + /* greek-ext */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + unicode-range: U+1F00-1FFF; + } + /* greek */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + unicode-range: U+0370-03FF; + } + /* vietnamese */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; + } + /* latin-ext */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; + } + /* latin */ + @font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; + } + @font-face { font-family: 'Montserrat Regular'; src: url("/fonts/Montserrat/Montserrat-Regular.woff") format("woff"); diff --git a/ui/app/css/itcss/settings/typography.scss b/ui/app/css/itcss/settings/typography.scss index ac8c41336..9d08756d1 100644 --- a/ui/app/css/itcss/settings/typography.scss +++ b/ui/app/css/itcss/settings/typography.scss @@ -1,6 +1,340 @@ -@import url('https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900'); +@import url('/fonts/Font_Awesome/font-awesome.min.css'); -@import url('https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css'); +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; +} +/* cyrillic */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +/* greek-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + unicode-range: U+1F00-1FFF; +} +/* greek */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + unicode-range: U+0370-03FF; +} +/* vietnamese */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 100; + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* cyrillic-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; +} +/* cyrillic */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +/* greek-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + unicode-range: U+1F00-1FFF; +} +/* greek */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + unicode-range: U+0370-03FF; +} +/* vietnamese */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* cyrillic-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; +} +/* cyrillic */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +/* greek-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + unicode-range: U+1F00-1FFF; +} +/* greek */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + unicode-range: U+0370-03FF; +} +/* vietnamese */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 400; + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* cyrillic-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; +} +/* cyrillic */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +/* greek-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + unicode-range: U+1F00-1FFF; +} +/* greek */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + unicode-range: U+0370-03FF; +} +/* vietnamese */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* cyrillic-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; +} +/* cyrillic */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +/* greek-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + unicode-range: U+1F00-1FFF; +} +/* greek */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + unicode-range: U+0370-03FF; +} +/* vietnamese */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 700; + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} +/* cyrillic-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; +} +/* cyrillic */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; +} +/* greek-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + unicode-range: U+1F00-1FFF; +} +/* greek */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + unicode-range: U+0370-03FF; +} +/* vietnamese */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; +} +/* latin-ext */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; +} +/* latin */ +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 900; + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; +} @font-face { font-family: 'Montserrat Regular'; -- cgit v1.2.3 From 40537f9290e2b41453e0f496e27eaf03eca021a0 Mon Sep 17 00:00:00 2001 From: kumavis Date: Wed, 28 Feb 2018 14:04:32 -0800 Subject: add token - check for logo url before trying to use --- ui/app/add-token.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/app/add-token.js b/ui/app/add-token.js index 3a806d34b..230ab35fe 100644 --- a/ui/app/add-token.js +++ b/ui/app/add-token.js @@ -240,7 +240,7 @@ AddTokenScreen.prototype.renderTokenList = function () { }, [ h('div.add-token__token-icon', { style: { - backgroundImage: `url(images/contract/${logo})`, + backgroundImage: logo && `url(images/contract/${logo})`, }, }), h('div.add-token__token-data', [ -- cgit v1.2.3 From cf6a2f65ab38fe84bcc8218aa9088ff4cb6e5290 Mon Sep 17 00:00:00 2001 From: kumavis Date: Wed, 28 Feb 2018 14:09:35 -0800 Subject: changelog - add entry about 'Add Token' screen fix --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index abc89f9c7..d33ddb2f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Current Master +- Fix "Add Token" screen referencing missing token logo urls + ## 4.1.0 2018-2-27 - Report failed txs to Sentry with more specific message -- cgit v1.2.3 From 190389a068b9005b52e9012bce48b93397007e26 Mon Sep 17 00:00:00 2001 From: kumavis Date: Wed, 28 Feb 2018 14:26:14 -0800 Subject: v4.1.1 --- CHANGELOG.md | 6 ++++++ app/manifest.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d33ddb2f0..c34ea510a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,13 @@ ## Current Master +## 4.1.1 2018-2-28 + - Fix "Add Token" screen referencing missing token logo urls +- Prevent user from switching network during signature request +- Fix misleading language "Contract Published" -> "Contract Deployment" +- Fix cancel button on "Buy Eth" screen +- Improve new-ui onboarding flow style ## 4.1.0 2018-2-27 diff --git a/app/manifest.json b/app/manifest.json index eab6c7063..80be01759 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "MetaMask", "short_name": "Metamask", - "version": "4.1.0", + "version": "4.1.1", "manifest_version": 2, "author": "https://metamask.io", "description": "Ethereum Browser Extension", -- cgit v1.2.3 From 00cd5a340d81da7f3cd6098ca6b16b4400c71efa Mon Sep 17 00:00:00 2001 From: kumavis Date: Wed, 28 Feb 2018 16:11:58 -0800 Subject: 4.1.2 --- CHANGELOG.md | 4 ++++ app/manifest.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c34ea510a..59f116aed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Current Master +## 4.1.2 2018-2-28 + +- Actually includes all the fixes mentioned in 4.1.1 (sorry) + ## 4.1.1 2018-2-28 - Fix "Add Token" screen referencing missing token logo urls diff --git a/app/manifest.json b/app/manifest.json index 80be01759..1c9c420f9 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "MetaMask", "short_name": "Metamask", - "version": "4.1.1", + "version": "4.1.2", "manifest_version": 2, "author": "https://metamask.io", "description": "Ethereum Browser Extension", -- cgit v1.2.3 From 94a60fe4a951b15e46baf928d79d9a8aad20145f Mon Sep 17 00:00:00 2001 From: Dan Date: Thu, 1 Mar 2018 16:31:38 -0330 Subject: Correct ttf format name to 'truetype' --- old-ui/app/css/fonts.css | 84 +++++++++++++++---------------- old-ui/app/css/output/index.css | 84 +++++++++++++++---------------- ui/app/css/itcss/settings/typography.scss | 84 +++++++++++++++---------------- 3 files changed, 126 insertions(+), 126 deletions(-) diff --git a/old-ui/app/css/fonts.css b/old-ui/app/css/fonts.css index 822f8cfc9..b1d701ee5 100644 --- a/old-ui/app/css/fonts.css +++ b/old-ui/app/css/fonts.css @@ -5,7 +5,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 100; - src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('truetype'); unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; } /* cyrillic */ @@ -13,7 +13,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 100; - src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('truetype'); unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } /* greek-ext */ @@ -21,7 +21,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 100; - src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('truetype'); unicode-range: U+1F00-1FFF; } /* greek */ @@ -29,7 +29,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 100; - src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('truetype'); unicode-range: U+0370-03FF; } /* vietnamese */ @@ -37,7 +37,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 100; - src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('truetype'); unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @@ -45,7 +45,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 100; - src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('truetype'); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -53,7 +53,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 100; - src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('truetype'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } /* cyrillic-ext */ @@ -61,7 +61,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 300; - src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('truetype'); unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; } /* cyrillic */ @@ -69,7 +69,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 300; - src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('truetype'); unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } /* greek-ext */ @@ -77,7 +77,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 300; - src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('truetype'); unicode-range: U+1F00-1FFF; } /* greek */ @@ -85,7 +85,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 300; - src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('truetype'); unicode-range: U+0370-03FF; } /* vietnamese */ @@ -93,7 +93,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 300; - src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('truetype'); unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @@ -101,7 +101,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 300; - src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('truetype'); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -109,7 +109,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 300; - src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('truetype'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } /* cyrillic-ext */ @@ -117,7 +117,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('truetype'); unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; } /* cyrillic */ @@ -125,7 +125,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('truetype'); unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } /* greek-ext */ @@ -133,7 +133,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('truetype'); unicode-range: U+1F00-1FFF; } /* greek */ @@ -141,7 +141,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('truetype'); unicode-range: U+0370-03FF; } /* vietnamese */ @@ -149,7 +149,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('truetype'); unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @@ -157,7 +157,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('truetype'); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -165,7 +165,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('truetype'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } /* cyrillic-ext */ @@ -173,7 +173,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('truetype'); unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; } /* cyrillic */ @@ -181,7 +181,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('truetype'); unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } /* greek-ext */ @@ -189,7 +189,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('truetype'); unicode-range: U+1F00-1FFF; } /* greek */ @@ -197,7 +197,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('truetype'); unicode-range: U+0370-03FF; } /* vietnamese */ @@ -205,7 +205,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('truetype'); unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @@ -213,7 +213,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('truetype'); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -221,7 +221,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('truetype'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } /* cyrillic-ext */ @@ -229,7 +229,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 700; - src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('truetype'); unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; } /* cyrillic */ @@ -237,7 +237,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 700; - src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('truetype'); unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } /* greek-ext */ @@ -245,7 +245,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 700; - src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('truetype'); unicode-range: U+1F00-1FFF; } /* greek */ @@ -253,7 +253,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 700; - src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('truetype'); unicode-range: U+0370-03FF; } /* vietnamese */ @@ -261,7 +261,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 700; - src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('truetype'); unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @@ -269,7 +269,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 700; - src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('truetype'); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -277,7 +277,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 700; - src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('truetype'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } /* cyrillic-ext */ @@ -285,7 +285,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 900; - src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('truetype'); unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; } /* cyrillic */ @@ -293,7 +293,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 900; - src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('truetype'); unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } /* greek-ext */ @@ -301,7 +301,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 900; - src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('truetype'); unicode-range: U+1F00-1FFF; } /* greek */ @@ -309,7 +309,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 900; - src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('truetype'); unicode-range: U+0370-03FF; } /* vietnamese */ @@ -317,7 +317,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 900; - src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('truetype'); unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @@ -325,7 +325,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 900; - src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('truetype'); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -333,7 +333,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 900; - src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('truetype'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } diff --git a/old-ui/app/css/output/index.css b/old-ui/app/css/output/index.css index a0e987a7b..bed689ecb 100644 --- a/old-ui/app/css/output/index.css +++ b/old-ui/app/css/output/index.css @@ -33,7 +33,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 100; - src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('truetype'); unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; } /* cyrillic */ @@ -41,7 +41,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 100; - src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('truetype'); unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } /* greek-ext */ @@ -49,7 +49,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 100; - src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('truetype'); unicode-range: U+1F00-1FFF; } /* greek */ @@ -57,7 +57,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 100; - src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('truetype'); unicode-range: U+0370-03FF; } /* vietnamese */ @@ -65,7 +65,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 100; - src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('truetype'); unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @@ -73,7 +73,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 100; - src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('truetype'); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -81,7 +81,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 100; - src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('truetype'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } /* cyrillic-ext */ @@ -89,7 +89,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 300; - src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('truetype'); unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; } /* cyrillic */ @@ -97,7 +97,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 300; - src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('truetype'); unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } /* greek-ext */ @@ -105,7 +105,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 300; - src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('truetype'); unicode-range: U+1F00-1FFF; } /* greek */ @@ -113,7 +113,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 300; - src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('truetype'); unicode-range: U+0370-03FF; } /* vietnamese */ @@ -121,7 +121,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 300; - src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('truetype'); unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @@ -129,7 +129,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 300; - src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('truetype'); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -137,7 +137,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 300; - src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('truetype'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } /* cyrillic-ext */ @@ -145,7 +145,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('truetype'); unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; } /* cyrillic */ @@ -153,7 +153,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('truetype'); unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } /* greek-ext */ @@ -161,7 +161,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('truetype'); unicode-range: U+1F00-1FFF; } /* greek */ @@ -169,7 +169,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('truetype'); unicode-range: U+0370-03FF; } /* vietnamese */ @@ -177,7 +177,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('truetype'); unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @@ -185,7 +185,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('truetype'); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -193,7 +193,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('truetype'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } /* cyrillic-ext */ @@ -201,7 +201,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('truetype'); unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; } /* cyrillic */ @@ -209,7 +209,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('truetype'); unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } /* greek-ext */ @@ -217,7 +217,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('truetype'); unicode-range: U+1F00-1FFF; } /* greek */ @@ -225,7 +225,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('truetype'); unicode-range: U+0370-03FF; } /* vietnamese */ @@ -233,7 +233,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('truetype'); unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @@ -241,7 +241,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('truetype'); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -249,7 +249,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('truetype'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } /* cyrillic-ext */ @@ -257,7 +257,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 700; - src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('truetype'); unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; } /* cyrillic */ @@ -265,7 +265,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 700; - src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('truetype'); unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } /* greek-ext */ @@ -273,7 +273,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 700; - src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('truetype'); unicode-range: U+1F00-1FFF; } /* greek */ @@ -281,7 +281,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 700; - src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('truetype'); unicode-range: U+0370-03FF; } /* vietnamese */ @@ -289,7 +289,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 700; - src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('truetype'); unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @@ -297,7 +297,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 700; - src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('truetype'); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -305,7 +305,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 700; - src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('truetype'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } /* cyrillic-ext */ @@ -313,7 +313,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 900; - src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('truetype'); unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; } /* cyrillic */ @@ -321,7 +321,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 900; - src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('truetype'); unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } /* greek-ext */ @@ -329,7 +329,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 900; - src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('truetype'); unicode-range: U+1F00-1FFF; } /* greek */ @@ -337,7 +337,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 900; - src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('truetype'); unicode-range: U+0370-03FF; } /* vietnamese */ @@ -345,7 +345,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 900; - src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('truetype'); unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @@ -353,7 +353,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 900; - src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('truetype'); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -361,7 +361,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 900; - src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('truetype'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } diff --git a/ui/app/css/itcss/settings/typography.scss b/ui/app/css/itcss/settings/typography.scss index 9d08756d1..8a56d9c6c 100644 --- a/ui/app/css/itcss/settings/typography.scss +++ b/ui/app/css/itcss/settings/typography.scss @@ -4,7 +4,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 100; - src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('truetype'); unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; } /* cyrillic */ @@ -12,7 +12,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 100; - src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('truetype'); unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } /* greek-ext */ @@ -20,7 +20,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 100; - src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('truetype'); unicode-range: U+1F00-1FFF; } /* greek */ @@ -28,7 +28,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 100; - src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('truetype'); unicode-range: U+0370-03FF; } /* vietnamese */ @@ -36,7 +36,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 100; - src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('truetype'); unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @@ -44,7 +44,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 100; - src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('truetype'); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -52,7 +52,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 100; - src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('ttf'); + src: local('Roboto Thin'), local('Roboto-Thin'), url('fonts/Roboto/Roboto-Thin.ttf') format('truetype'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } /* cyrillic-ext */ @@ -60,7 +60,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 300; - src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('truetype'); unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; } /* cyrillic */ @@ -68,7 +68,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 300; - src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('truetype'); unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } /* greek-ext */ @@ -76,7 +76,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 300; - src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('truetype'); unicode-range: U+1F00-1FFF; } /* greek */ @@ -84,7 +84,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 300; - src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('truetype'); unicode-range: U+0370-03FF; } /* vietnamese */ @@ -92,7 +92,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 300; - src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('truetype'); unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @@ -100,7 +100,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 300; - src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('truetype'); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -108,7 +108,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 300; - src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('ttf'); + src: local('Roboto Light'), local('Roboto-Light'), url('fonts/Roboto/Roboto-Light.ttf') format('truetype'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } /* cyrillic-ext */ @@ -116,7 +116,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('truetype'); unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; } /* cyrillic */ @@ -124,7 +124,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('truetype'); unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } /* greek-ext */ @@ -132,7 +132,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('truetype'); unicode-range: U+1F00-1FFF; } /* greek */ @@ -140,7 +140,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('truetype'); unicode-range: U+0370-03FF; } /* vietnamese */ @@ -148,7 +148,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('truetype'); unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @@ -156,7 +156,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('truetype'); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -164,7 +164,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 400; - src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('ttf'); + src: local('Roboto'), local('Roboto-Regular'), url('fonts/Roboto/Roboto-Regular.ttf') format('truetype'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } /* cyrillic-ext */ @@ -172,7 +172,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('truetype'); unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; } /* cyrillic */ @@ -180,7 +180,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('truetype'); unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } /* greek-ext */ @@ -188,7 +188,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('truetype'); unicode-range: U+1F00-1FFF; } /* greek */ @@ -196,7 +196,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('truetype'); unicode-range: U+0370-03FF; } /* vietnamese */ @@ -204,7 +204,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('truetype'); unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @@ -212,7 +212,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('truetype'); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -220,7 +220,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 500; - src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('ttf'); + src: local('Roboto Medium'), local('Roboto-Medium'), url('fonts/Roboto/Roboto-Medium.ttf') format('truetype'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } /* cyrillic-ext */ @@ -228,7 +228,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 700; - src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('truetype'); unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; } /* cyrillic */ @@ -236,7 +236,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 700; - src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('truetype'); unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } /* greek-ext */ @@ -244,7 +244,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 700; - src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('truetype'); unicode-range: U+1F00-1FFF; } /* greek */ @@ -252,7 +252,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 700; - src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('truetype'); unicode-range: U+0370-03FF; } /* vietnamese */ @@ -260,7 +260,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 700; - src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('truetype'); unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @@ -268,7 +268,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 700; - src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('truetype'); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -276,7 +276,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 700; - src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('ttf'); + src: local('Roboto Bold'), local('Roboto-Bold'), url('fonts/Roboto/Roboto-Bold.ttf') format('truetype'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } /* cyrillic-ext */ @@ -284,7 +284,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 900; - src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('truetype'); unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; } /* cyrillic */ @@ -292,7 +292,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 900; - src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('truetype'); unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; } /* greek-ext */ @@ -300,7 +300,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 900; - src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('truetype'); unicode-range: U+1F00-1FFF; } /* greek */ @@ -308,7 +308,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 900; - src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('truetype'); unicode-range: U+0370-03FF; } /* vietnamese */ @@ -316,7 +316,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 900; - src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('truetype'); unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; } /* latin-ext */ @@ -324,7 +324,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 900; - src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('truetype'); unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; } /* latin */ @@ -332,7 +332,7 @@ font-family: 'Roboto'; font-style: normal; font-weight: 900; - src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('ttf'); + src: local('Roboto Black'), local('Roboto-Black'), url('fonts/Roboto/Roboto-Black.ttf') format('truetype'); unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } -- cgit v1.2.3 From ace4f0d998d75e9df8c31641a292abc4f703582f Mon Sep 17 00:00:00 2001 From: Alexander Tseung Date: Thu, 1 Mar 2018 13:11:35 -0800 Subject: Fix exception thrown when styleOverride is not present (#3364) --- ui/app/components/eth-balance.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/app/components/eth-balance.js b/ui/app/components/eth-balance.js index 1be8c9731..c3d084bdc 100644 --- a/ui/app/components/eth-balance.js +++ b/ui/app/components/eth-balance.js @@ -46,7 +46,7 @@ EthBalanceComponent.prototype.renderBalance = function (value) { incoming, currentCurrency, hideTooltip, - styleOveride, + styleOveride = {}, showFiat = true, } = this.props const { fontSize, color, fontFamily, lineHeight } = styleOveride -- cgit v1.2.3 From f22dfd4ae8031e3f7b4972a1cc8f119b99007717 Mon Sep 17 00:00:00 2001 From: Alexander Tseung Date: Thu, 1 Mar 2018 13:12:10 -0800 Subject: Fix network menu for custom URLs (#3366) --- ui/app/components/dropdowns/network-dropdown.js | 40 +++-- ui/app/css/itcss/components/network.scss | 5 +- yarn.lock | 191 ++++++++++++++++++++---- 3 files changed, 190 insertions(+), 46 deletions(-) diff --git a/ui/app/components/dropdowns/network-dropdown.js b/ui/app/components/dropdowns/network-dropdown.js index dfaa6b22c..9be5cc5d1 100644 --- a/ui/app/components/dropdowns/network-dropdown.js +++ b/ui/app/components/dropdowns/network-dropdown.js @@ -84,7 +84,7 @@ NetworkDropdown.prototype.render = function () { style: { position: 'absolute', top: '58px', - minWidth: '309px', + width: '309px', zIndex: '55px', }, innerStyle: { @@ -276,11 +276,21 @@ NetworkDropdown.prototype.renderCommonRpc = function (rpcList, provider) { key: `common${rpc}`, closeMenu: () => this.props.hideNetworkDropdown(), onClick: () => props.setRpcTarget(rpc), + style: { + fontFamily: 'DIN OT', + fontSize: '16px', + lineHeight: '20px', + padding: '12px 0', + }, }, [ - h('i.fa.fa-question-circle.fa-lg.menu-icon'), - rpc, - rpcTarget === rpc ? h('.check', '✓') : null, + rpcTarget === rpc ? h('i.fa.fa-check') : h('.network-check__transparent', '✓'), + h('i.fa.fa-question-circle.fa-med.menu-icon-circle'), + h('span.network-name-item', { + style: { + color: rpcTarget === rpc ? '#ffffff' : '#9b9b9b', + }, + }, rpc), ] ) } @@ -293,12 +303,6 @@ NetworkDropdown.prototype.renderCustomOption = function (provider) { if (type !== 'rpc') return null - // Concatenate long URLs - let label = rpcTarget - if (rpcTarget.length > 31) { - label = label.substr(0, 34) + '...' - } - switch (rpcTarget) { case 'http://localhost:8545': @@ -311,11 +315,21 @@ NetworkDropdown.prototype.renderCustomOption = function (provider) { key: rpcTarget, onClick: () => props.setRpcTarget(rpcTarget), closeMenu: () => this.props.hideNetworkDropdown(), + style: { + fontFamily: 'DIN OT', + fontSize: '16px', + lineHeight: '20px', + padding: '12px 0', + }, }, [ - h('i.fa.fa-question-circle.fa-lg.menu-icon'), - label, - h('.check', '✓'), + h('i.fa.fa-check'), + h('i.fa.fa-question-circle.fa-med.menu-icon-circle'), + h('span.network-name-item', { + style: { + color: '#ffffff', + }, + }, rpcTarget), ] ) } diff --git a/ui/app/css/itcss/components/network.scss b/ui/app/css/itcss/components/network.scss index d9a39b8d5..c32d1de5e 100644 --- a/ui/app/css/itcss/components/network.scss +++ b/ui/app/css/itcss/components/network.scss @@ -76,8 +76,11 @@ .network-name-item { font-weight: 100; - flex: 1 0 auto; + flex: 1; color: $dusty-gray; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; } .network-check, diff --git a/yarn.lock b/yarn.lock index a24806923..d9e456aa9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -292,6 +292,13 @@ anymatch@^1.3.0: micromatch "^2.1.5" normalize-path "^2.0.0" +anymatch@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" + dependencies: + micromatch "^3.1.4" + normalize-path "^2.1.1" + append-buffer@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz#d8220cf466081525efea50614f3de6514dfa58f1" @@ -1660,6 +1667,23 @@ braces@^2.3.0: split-string "^3.0.2" to-regex "^3.0.1" +braces@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.1.tgz#7086c913b4e5a08dbe37ac0ee6a2500c4ba691bb" + dependencies: + arr-flatten "^1.1.0" + array-unique "^0.3.2" + define-property "^1.0.0" + extend-shallow "^2.0.1" + fill-range "^4.0.0" + isobject "^3.0.1" + kind-of "^6.0.2" + repeat-element "^1.1.2" + snapdragon "^0.8.1" + snapdragon-node "^2.0.1" + split-string "^3.0.2" + to-regex "^3.0.1" + brfs@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/brfs/-/brfs-1.4.3.tgz#db675d6f5e923e6df087fca5859c9090aaed3216" @@ -2144,7 +2168,7 @@ chokidar@1.6.1: optionalDependencies: fsevents "^1.0.0" -chokidar@^1.0.0, chokidar@^1.4.1, chokidar@^1.4.3, chokidar@^1.6.1, chokidar@^1.7.0: +chokidar@^1.0.0, chokidar@^1.4.1, chokidar@^1.4.3, chokidar@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" dependencies: @@ -2159,6 +2183,24 @@ chokidar@^1.0.0, chokidar@^1.4.1, chokidar@^1.4.3, chokidar@^1.6.1, chokidar@^1. optionalDependencies: fsevents "^1.0.0" +chokidar@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.2.tgz#4dc65139eeb2714977735b6a35d06e97b494dfd7" + dependencies: + anymatch "^2.0.0" + async-each "^1.0.0" + braces "^2.3.0" + glob-parent "^3.1.0" + inherits "^2.0.1" + is-binary-path "^1.0.0" + is-glob "^4.0.0" + normalize-path "^2.1.1" + path-is-absolute "^1.0.0" + readdirp "^2.0.0" + upath "^1.0.0" + optionalDependencies: + fsevents "^1.0.0" + cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" @@ -2929,6 +2971,13 @@ define-property@^1.0.0: dependencies: is-descriptor "^1.0.0" +define-property@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" + dependencies: + is-descriptor "^1.0.2" + isobject "^3.0.1" + defined@^1.0.0, defined@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" @@ -3432,7 +3481,7 @@ enzyme-adapter-utils@^1.1.0: object.assign "^4.0.4" prop-types "^15.6.0" -enzyme@^3.2.0: +enzyme@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.3.0.tgz#0971abd167f2d4bf3f5bd508229e1c4b6dc50479" dependencies: @@ -3801,9 +3850,9 @@ eth-json-rpc-filters@^1.2.5: json-rpc-engine "^3.4.0" lodash.flatmap "^4.5.0" -eth-json-rpc-infura@^2.0.11: - version "2.0.11" - resolved "https://registry.yarnpkg.com/eth-json-rpc-infura/-/eth-json-rpc-infura-2.0.11.tgz#134bf54ff15e96a9116424c0db9b66aa079bfbbe" +eth-json-rpc-infura@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/eth-json-rpc-infura/-/eth-json-rpc-infura-3.0.0.tgz#75746cd4027f947b8b3fe0b4dcfd306fc24d7127" dependencies: eth-json-rpc-middleware "^1.5.0" json-rpc-engine "^3.4.0" @@ -4223,6 +4272,18 @@ execa@^0.7.0: signal-exit "^3.0.0" strip-eof "^1.0.0" +execa@^0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-0.9.0.tgz#adb7ce62cf985071f60580deb4a88b9e34712d01" + dependencies: + cross-spawn "^5.0.1" + get-stream "^3.0.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + execall@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/execall/-/execall-1.0.0.tgz#73d0904e395b3cab0658b08d09ec25307f29bb73" @@ -4331,7 +4392,7 @@ extend-shallow@^2.0.1: dependencies: is-extendable "^0.1.0" -extend-shallow@^3.0.0: +extend-shallow@^3.0.0, extend-shallow@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" dependencies: @@ -4383,6 +4444,19 @@ extglob@^2.0.2: snapdragon "^0.8.1" to-regex "^3.0.1" +extglob@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" + dependencies: + array-unique "^0.3.2" + define-property "^1.0.0" + expand-brackets "^2.1.4" + extend-shallow "^2.0.1" + fragment-cache "^0.2.1" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + extsprintf@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" @@ -5278,19 +5352,19 @@ gulp-util@^3.0, gulp-util@^3.0.0, gulp-util@^3.0.2, gulp-util@^3.0.7, gulp-util@ through2 "^2.0.0" vinyl "^0.5.0" -gulp-watch@^4.3.5: - version "4.3.11" - resolved "https://registry.yarnpkg.com/gulp-watch/-/gulp-watch-4.3.11.tgz#162fc563de9fc770e91f9a7ce3955513a9a118c0" +gulp-watch@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/gulp-watch/-/gulp-watch-5.0.0.tgz#6fb03ab1735972e0d2866475b568555836dfd0eb" dependencies: anymatch "^1.3.0" - chokidar "^1.6.1" + chokidar "^2.0.0" glob-parent "^3.0.1" gulp-util "^3.0.7" object-assign "^4.1.0" path-is-absolute "^1.0.1" readable-stream "^2.2.2" slash "^1.0.0" - vinyl "^1.2.0" + vinyl "^2.1.0" vinyl-file "^2.0.0" gulp-zip@^4.0.0: @@ -5888,7 +5962,7 @@ is-descriptor@^0.1.0: is-data-descriptor "^0.1.4" kind-of "^5.0.0" -is-descriptor@^1.0.0: +is-descriptor@^1.0.0, is-descriptor@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" dependencies: @@ -5924,7 +5998,7 @@ is-extglob@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" -is-extglob@^2.1.0: +is-extglob@^2.1.0, is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" @@ -5964,6 +6038,12 @@ is-glob@^3.1.0: dependencies: is-extglob "^2.1.0" +is-glob@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0" + dependencies: + is-extglob "^2.1.1" + is-hex-prefixed@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz#7d8d37e6ad77e5d127148913c573e082d777f554" @@ -6019,6 +6099,12 @@ is-odd@^1.0.0: dependencies: is-number "^3.0.0" +is-odd@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24" + dependencies: + is-number "^4.0.0" + is-path-cwd@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d" @@ -6137,6 +6223,10 @@ is-windows@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9" +is-windows@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" + is-word-character@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-word-character/-/is-word-character-1.0.1.tgz#5a03fa1ea91ace8a6eb0c7cd770eb86d65c8befb" @@ -6855,6 +6945,10 @@ lodash.assignin@^4.1.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" +lodash.castarray@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.castarray/-/lodash.castarray-4.4.0.tgz#c02513515e309daddd4c24c60cfddcf5976d9115" + lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.4.1: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" @@ -7313,6 +7407,24 @@ micromatch@^3.0.4: snapdragon "^0.8.1" to-regex "^3.0.1" +micromatch@^3.1.4: + version "3.1.9" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.9.tgz#15dc93175ae39e52e93087847096effc73efcf89" + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + braces "^2.3.1" + define-property "^2.0.2" + extend-shallow "^3.0.2" + extglob "^2.0.4" + fragment-cache "^0.2.1" + kind-of "^6.0.2" + nanomatch "^1.2.9" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + miller-rabin@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d" @@ -7457,9 +7569,9 @@ mocha-sinon@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/mocha-sinon/-/mocha-sinon-2.0.0.tgz#723a9310e7d737d7b77c7a66821237425b032d48" -mocha@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-4.1.0.tgz#7d86cfbcf35cb829e2754c32e17355ec05338794" +mocha@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-5.0.1.tgz#759b62c836b0732382a62b6b1fb245ec1bc943ac" dependencies: browser-stdout "1.3.0" commander "2.11.0" @@ -7569,6 +7681,23 @@ nanomatch@^1.2.5: snapdragon "^0.8.1" to-regex "^3.0.1" +nanomatch@^1.2.9: + version "1.2.9" + resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2" + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + define-property "^2.0.2" + extend-shallow "^3.0.2" + fragment-cache "^0.2.1" + is-odd "^2.0.0" + is-windows "^1.0.2" + kind-of "^6.0.2" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" @@ -7695,7 +7824,7 @@ node-pre-gyp@^0.6.39: tar "^2.2.1" tar-pack "^3.4.0" -node-sass@^4.2.0: +node-sass@^4.2.0, node-sass@^4.7.2: version "4.7.2" resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.7.2.tgz#9366778ba1469eb01438a9e8592f4262bcb6794e" dependencies: @@ -8979,13 +9108,6 @@ react-tooltip-component@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/react-tooltip-component/-/react-tooltip-component-0.3.0.tgz#fb3ec78c3270fe919692bc31f1404108bcf4785e" -react-tooltip@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/react-tooltip/-/react-tooltip-3.4.0.tgz#037f38f797c3e6b1b58d2534ccc8c2c76af4f52d" - dependencies: - classnames "^2.2.5" - prop-types "^15.6.0" - react-transition-group@^1.2.0: version "1.2.1" resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-1.2.1.tgz#e11f72b257f921b213229a774df46612346c7ca6" @@ -9176,9 +9298,9 @@ redux-logger@^3.0.6: dependencies: deep-diff "^0.3.5" -redux-test-utils@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/redux-test-utils/-/redux-test-utils-0.1.3.tgz#0d89100f100f86c7c7214976eaece88e7e45bf74" +redux-test-utils@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/redux-test-utils/-/redux-test-utils-0.2.2.tgz#593213f30173c5908f72315f08b705e1606094fe" redux-thunk@^2.2.0: version "2.2.0" @@ -10705,22 +10827,23 @@ test-exclude@^4.1.1: read-pkg-up "^1.0.1" require-main-filename "^1.0.1" -testem@^1.10.3: - version "1.18.4" - resolved "https://registry.yarnpkg.com/testem/-/testem-1.18.4.tgz#e45fed922bec2f54a616c43f11922598ac97eb41" +testem@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/testem/-/testem-2.0.0.tgz#b05c96200c7ac98bae998d71c94c0c5345907d13" dependencies: backbone "^1.1.2" bluebird "^3.4.6" charm "^1.0.0" commander "^2.6.0" consolidate "^0.14.0" - cross-spawn "^5.1.0" + execa "^0.9.0" express "^4.10.7" fireworm "^0.7.0" glob "^7.0.4" http-proxy "^1.13.1" js-yaml "^3.2.5" lodash.assignin "^4.1.0" + lodash.castarray "^4.4.0" lodash.clonedeep "^4.4.1" lodash.find "^4.5.1" lodash.uniqby "^4.7.0" @@ -11187,6 +11310,10 @@ unset-value@^1.0.0: has-value "^0.3.1" isobject "^3.0.0" +upath@^1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.4.tgz#ee2321ba0a786c50973db043a50b7bcba822361d" + urix@^0.1.0, urix@~0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" @@ -11379,7 +11506,7 @@ vinyl@^0.5.0: clone-stats "^0.0.1" replace-ext "0.0.1" -vinyl@^1.1.0, vinyl@^1.2.0: +vinyl@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884" dependencies: -- cgit v1.2.3 From 81fa0742f7e1702eae866c1915319b0de3a2430d Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Fri, 2 Mar 2018 10:32:53 -0800 Subject: Fix inpage provider name regression Fixes #3372 by not minifying the name of our inpage provider, which some people were using to identify MetaMask (not our preferred, supported method of web3.currentProvider.isMetaMask). --- CHANGELOG.md | 2 ++ gulpfile.js | 4 +++- package.json | 2 +- yarn.lock | 6 +++--- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59f116aed..776af1f26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Current Master +- Ensure MetaMask's inpage provider is named MetamaskInpageProvider to keep some sites from breaking. + ## 4.1.2 2018-2-28 - Actually includes all the fixes mentioned in 4.1.1 (sorry) diff --git a/gulpfile.js b/gulpfile.js index 3ade82f87..adfb148a9 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -407,7 +407,9 @@ function bundleTask(opts) { // loads map from browserify file .pipe(gulpif(debug, sourcemaps.init({ loadMaps: true }))) // Minification - .pipe(gulpif(opts.isBuild, uglify())) + .pipe(gulpif(opts.isBuild, uglify({ + mangle: { reserved: [ 'MetamaskInpageProvider' ] }, + }))) // writes .map file .pipe(gulpif(debug, sourcemaps.write('./'))) // write completed bundles diff --git a/package.json b/package.json index d712e00ac..354b3abd2 100644 --- a/package.json +++ b/package.json @@ -211,7 +211,7 @@ "gulp-stylefmt": "^1.1.0", "gulp-stylelint": "^4.0.0", "gulp-uglify": "^3.0.0", - "gulp-uglify-es": "^1.0.0", + "gulp-uglify-es": "^1.0.1", "gulp-util": "^3.0.7", "gulp-watch": "^5.0.0", "gulp-zip": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index d9e456aa9..028ffa44e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7348,9 +7348,9 @@ mersenne-twister@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/mersenne-twister/-/mersenne-twister-1.1.0.tgz#f916618ee43d7179efcf641bec4531eb9670978a" -metamascara@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/metamascara/-/metamascara-1.3.1.tgz#a84d6f20ef4ba401ce44eba120857ee1d680747b" +metamascara@^2.0.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/metamascara/-/metamascara-2.2.1.tgz#f97b87045a245e1bd2e1bcae7a3d4dcd4e17c02a" dependencies: iframe "^1.0.0" iframe-stream "^3.0.0" -- cgit v1.2.3 From cb109a8233819f23fab46c96d1d5f124e0164585 Mon Sep 17 00:00:00 2001 From: Thomas Huang Date: Fri, 2 Mar 2018 12:08:13 -0800 Subject: Add retry transaction back into old ui transaction list item (#3381) * Add retry transaction back into old ui transaction list item * Update Changelog --- CHANGELOG.md | 1 + old-ui/app/components/transaction-list-item.js | 127 ++++++++++++++++++------- 2 files changed, 93 insertions(+), 35 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 776af1f26..a24ae926d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Current Master - Ensure MetaMask's inpage provider is named MetamaskInpageProvider to keep some sites from breaking. +- Add retry transaction button back into classic ui. ## 4.1.2 2018-2-28 diff --git a/old-ui/app/components/transaction-list-item.js b/old-ui/app/components/transaction-list-item.js index 95670bd54..e7251df8d 100644 --- a/old-ui/app/components/transaction-list-item.js +++ b/old-ui/app/components/transaction-list-item.js @@ -1,6 +1,7 @@ const Component = require('react').Component const h = require('react-hyperscript') const inherits = require('util').inherits +const connect = require('react-redux').connect const EthBalance = require('./eth-balance') const addressSummary = require('../util').addressSummary @@ -9,18 +10,33 @@ const CopyButton = require('./copyButton') const vreme = new (require('vreme'))() const Tooltip = require('./tooltip') const numberToBN = require('number-to-bn') +const actions = require('../../../ui/app/actions') const TransactionIcon = require('./transaction-list-item-icon') const ShiftListItem = require('./shift-list-item') -module.exports = TransactionListItem + +const mapDispatchToProps = dispatch => { + return { + retryTransaction: transactionId => dispatch(actions.retryTransaction(transactionId)), + } +} + +module.exports = connect(null, mapDispatchToProps)(TransactionListItem) inherits(TransactionListItem, Component) function TransactionListItem () { Component.call(this) } +TransactionListItem.prototype.showRetryButton = function () { + const { transaction = {} } = this.props + const { status, time } = transaction + return status === 'submitted' && Date.now() - time > 30000 +} + TransactionListItem.prototype.render = function () { const { transaction, network, conversionRate, currentCurrency } = this.props + const { status } = transaction if (transaction.key === 'shapeshift') { if (network === '1') return h(ShiftListItem, transaction) } @@ -32,7 +48,7 @@ TransactionListItem.prototype.render = function () { var isMsg = ('msgParams' in transaction) var isTx = ('txParams' in transaction) - var isPending = transaction.status === 'unapproved' + var isPending = status === 'unapproved' let txParams if (isTx) { txParams = transaction.txParams @@ -44,7 +60,7 @@ TransactionListItem.prototype.render = function () { const isClickable = ('hash' in transaction && isLinkable) || isPending return ( - h(`.transaction-list-item.flex-row.flex-space-between${isClickable ? '.pointer' : ''}`, { + h('.transaction-list-item.flex-column', { onClick: (event) => { if (isPending) { this.props.showTx(transaction.id) @@ -56,51 +72,92 @@ TransactionListItem.prototype.render = function () { }, style: { padding: '20px 0', - display: 'flex', - justifyContent: 'space-between', + alignItems: 'center', }, }, [ + h(`.flex-row.flex-space-between${isClickable ? '.pointer' : ''}`, { + style: { + width: '100%', + }, + }, [ + h('.identicon-wrapper.flex-column.flex-center.select-none', [ + h(TransactionIcon, { txParams, transaction, isTx, isMsg }), + ]), - h('.identicon-wrapper.flex-column.flex-center.select-none', [ - h(TransactionIcon, { txParams, transaction, isTx, isMsg }), + h(Tooltip, { + title: 'Transaction Number', + position: 'right', + }, [ + h('span', { + style: { + display: 'flex', + cursor: 'normal', + flexDirection: 'column', + alignItems: 'center', + justifyContent: 'center', + padding: '10px', + }, + }, nonce), + ]), + + h('.flex-column', {style: {width: '200px', overflow: 'hidden'}}, [ + domainField(txParams), + h('div', date), + recipientField(txParams, transaction, isTx, isMsg), + ]), + + // Places a copy button if tx is successful, else places a placeholder empty div. + transaction.hash ? h(CopyButton, { value: transaction.hash }) : h('div', {style: { display: 'flex', alignItems: 'center', width: '26px' }}), + + isTx ? h(EthBalance, { + value: txParams.value, + conversionRate, + currentCurrency, + width: '55px', + shorten: true, + showFiat: false, + style: {fontSize: '15px'}, + }) : h('.flex-column'), ]), - h(Tooltip, { - title: 'Transaction Number', - position: 'right', + this.showRetryButton() && h('.transition-list-item__retry.grow-on-hover', { + onClick: event => { + event.stopPropagation() + this.resubmit() + }, + style: { + height: '22px', + borderRadius: '22px', + color: '#F9881B', + padding: '0 20px', + backgroundColor: '#FFE3C9', + display: 'flex', + justifyContent: 'center', + alignItems: 'center', + fontSize: '8px', + cursor: 'pointer', + }, }, [ - h('span', { + h('div', { style: { - display: 'flex', - cursor: 'normal', - flexDirection: 'column', - alignItems: 'center', - justifyContent: 'center', + paddingRight: '2px', }, - }, nonce), - ]), - - h('.flex-column', {style: {width: '150px', overflow: 'hidden'}}, [ - domainField(txParams), - h('div', date), - recipientField(txParams, transaction, isTx, isMsg), + }, 'Taking too long?'), + h('div', { + style: { + textDecoration: 'underline', + }, + }, 'Retry with a higher gas price here'), ]), - - // Places a copy button if tx is successful, else places a placeholder empty div. - transaction.hash ? h(CopyButton, { value: transaction.hash }) : h('div', {style: { display: 'flex', alignItems: 'center', width: '26px' }}), - - isTx ? h(EthBalance, { - value: txParams.value, - conversionRate, - currentCurrency, - shorten: true, - showFiat: false, - style: {fontSize: '15px'}, - }) : h('.flex-column'), ]) ) } +TransactionListItem.prototype.resubmit = function () { + const { transaction } = this.props + this.props.retryTransaction(transaction.id) +} + function domainField (txParams) { return h('div', { style: { -- cgit v1.2.3 From 452c5d0513a14419b71ffd92d253fef661b74300 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Fri, 2 Mar 2018 12:47:40 -0800 Subject: Version 4.1.3 --- CHANGELOG.md | 2 ++ app/manifest.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a24ae926d..8fc9d2145 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Current Master +## 4.1.3 2018-2-28 + - Ensure MetaMask's inpage provider is named MetamaskInpageProvider to keep some sites from breaking. - Add retry transaction button back into classic ui. diff --git a/app/manifest.json b/app/manifest.json index 1c9c420f9..2b3acf1b5 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "MetaMask", "short_name": "Metamask", - "version": "4.1.2", + "version": "4.1.3", "manifest_version": 2, "author": "https://metamask.io", "description": "Ethereum Browser Extension", -- cgit v1.2.3 From bf17d7e1153180fe68cc568a6f4ffa8db66010dc Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Fri, 2 Mar 2018 13:55:56 -0800 Subject: Add version bumping script One step towards automating our deploy process is automating our version bumping scheme. This PR does that. --- development/run-version-bump.js | 51 ++ development/version-bump.js | 53 ++ docs/bumping_version.md | 33 + docs/publishing.md | 6 +- package.json | 1 + test/unit/development/sample-changelog.md | 914 +++++++++++++++++++++ test/unit/development/sample-manifest.json | 71 ++ .../development/version\342\200\223bump-test.js" | 46 ++ 8 files changed, 1172 insertions(+), 3 deletions(-) create mode 100644 development/run-version-bump.js create mode 100644 development/version-bump.js create mode 100644 docs/bumping_version.md create mode 100644 test/unit/development/sample-changelog.md create mode 100644 test/unit/development/sample-manifest.json create mode 100644 "test/unit/development/version\342\200\223bump-test.js" diff --git a/development/run-version-bump.js b/development/run-version-bump.js new file mode 100644 index 000000000..3b26b00db --- /dev/null +++ b/development/run-version-bump.js @@ -0,0 +1,51 @@ +const { promisify } = require('util') +const fs = require('fs') +const readFile = promisify(fs.readFile) +const writeFile = promisify(fs.writeFile) +const path = require('path') +const changelogPath = path.join(__dirname, '..', 'CHANGELOG.md') +const manifestPath = path.join(__dirname, '..', 'app', 'manifest.json') +const manifest = require('../app/manifest.json') +const versionBump = require('./version-bump') + +console.dir(process.argv) +const bumpType = normalizeType(process.argv[2]) + + +readFile(changelogPath) +.then(async (changeBuffer) => { + const changelog = changeBuffer.toString() + + const newData = await versionBump(bumpType, changelog, manifest) + console.dir(newData) + + const manifestString = JSON.stringify(newData.manifest, null, 2) + + console.log('now writing files to ', changelogPath, manifestPath) + console.log(typeof newData.manifest) + await writeFile(changelogPath, newData.changelog) + await writeFile(manifestPath, manifestString) + + return newData.version +}) +.then((version) => console.log(`Bumped ${bumpType} to version ${version}`)) +.catch(console.error) + + +function normalizeType (userInput) { + console.log(`user inputted ${userInput}`) + const err = new Error('First option must be a type (major, minor, or patch)') + if (!userInput || typeof userInput !== 'string') { + console.log('first no') + throw err + } + + const lower = userInput.toLowerCase() + + if (lower !== 'major' && lower !== 'minor' && lower !== 'patch') { + console.log('second no') + throw err + } + + return lower +} diff --git a/development/version-bump.js b/development/version-bump.js new file mode 100644 index 000000000..63dd802d1 --- /dev/null +++ b/development/version-bump.js @@ -0,0 +1,53 @@ +const clone = require('clone') + +async function versionBump(bumpType, changelog, oldManifest) { + const manifest = clone(oldManifest) + const newVersion = newVersionFrom(manifest, bumpType) + + manifest.version = newVersion + const date = (new Date()).toDateString() + + const logHeader = `\n## ${newVersion} ${date}` + const logLines = changelog.split('\n') + for (let i = 0; i < logLines.length; i++) { + if (logLines[i].includes('Current Master')) { + logLines.splice(i + 1, 0, logHeader) + break + } + } + + return { + version: newVersion, + manifest: manifest, + changelog: logLines.join('\n') + } +} + +function newVersionFrom (manifest, bumpType) { + const string = manifest.version + let segments = string.split('.').map((str) => parseInt(str)) + + console.log('bump type is ' + bumpType) + switch (bumpType) { + case 'major': + segments[0] += 1 + segments[1] = 0 + segments[2] = 0 + break + case 'minor': + segments[1] += 1 + segments[2] = 0 + break + case 'patch': + segments[2] += 1 + break + } + + return segments.map(String).join('.') +} + +function bumpManifest (manifest, bumpType) { + +} + +module.exports = versionBump diff --git a/docs/bumping_version.md b/docs/bumping_version.md new file mode 100644 index 000000000..df38369a2 --- /dev/null +++ b/docs/bumping_version.md @@ -0,0 +1,33 @@ +# How to Bump MetaMask's Version Automatically + +``` +npm run version:bump patch +``` + +MetaMask publishes using a loose [semver](https://semver.org/) interpretation. We divide the three segments of our version into three types of version bump: + +## Major + +Means a breaking change, either an API removed, or a major user expectation changed. + +## Minor + +Means a new API or new user feature. + +## Patch + +Means a fix for a bug, or correcting something that should have been assumed to work a different way. + +# Bumping the version + +`npm run version:bump $BUMP_TYPE` where `$BUMP_TYPE` is one of `major`, `minor`, or `patch`. + +This will increment the version in the `app/manifest.json` and `CHANGELOG.md` files according to our current protocol, where the manifest's version is updated, and any line items currently under the changelog's "master" section are now under the new dated version section. + +# Modifying the bump script + +The script that is executed lives [here](../development/run-version-bump.js). +The main functions all live [here](../development/version-bump.js). +The test for this behavior is at `test/unit/development/version-bump-test.js`. + + diff --git a/docs/publishing.md b/docs/publishing.md index 00369acf9..3022b7eda 100644 --- a/docs/publishing.md +++ b/docs/publishing.md @@ -4,15 +4,15 @@ When publishing a new version of MetaMask, we follow this procedure: ## Incrementing Version & Changelog - You must be authorized already on the MetaMask plugin. +Version can be automatically incremented [using our bump script](./bumping-version.md). -1. Update the version in `app/manifest.json` and the Changelog in `CHANGELOG.md`. -2. Visit [the chrome developer dashboard](https://chrome.google.com/webstore/developer/dashboard?authuser=2). +npm run version:bump $BUMP_TYPE` where `$BUMP_TYPE` is one of `major`, `minor`, or `patch`. ## Publishing 1. `npm run dist` to generate the latest build. 2. Publish to chrome store. + - Visit [the chrome developer dashboard](https://chrome.google.com/webstore/developer/dashboard?authuser=2). 3. Publish to firefox addon marketplace. 4. Post on Github releases page. 5. `npm run announce`, post that announcement in our public places. diff --git a/package.json b/package.json index 354b3abd2..d4b498bc8 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "lint:fix": "gulp lint:fix", "disc": "gulp disc --debug", "announce": "node development/announcer.js", + "version:bump": "node development/run-version-bump.js", "generateNotice": "node notices/notice-generator.js", "deleteNotice": "node notices/notice-delete.js" }, diff --git a/test/unit/development/sample-changelog.md b/test/unit/development/sample-changelog.md new file mode 100644 index 000000000..8fc9d2145 --- /dev/null +++ b/test/unit/development/sample-changelog.md @@ -0,0 +1,914 @@ +# Changelog + +## Current Master + +## 4.1.3 2018-2-28 + +- Ensure MetaMask's inpage provider is named MetamaskInpageProvider to keep some sites from breaking. +- Add retry transaction button back into classic ui. + +## 4.1.2 2018-2-28 + +- Actually includes all the fixes mentioned in 4.1.1 (sorry) + +## 4.1.1 2018-2-28 + +- Fix "Add Token" screen referencing missing token logo urls +- Prevent user from switching network during signature request +- Fix misleading language "Contract Published" -> "Contract Deployment" +- Fix cancel button on "Buy Eth" screen +- Improve new-ui onboarding flow style + +## 4.1.0 2018-2-27 + +- Report failed txs to Sentry with more specific message +- Fix internal feature flags being sometimes undefined +- Standardized license to MIT + +## 4.0.0 2018-2-22 + +- Introduce new MetaMask user interface. + +## 3.14.2 2018-2-15 + +- Fix bug where log subscriptions would break when switching network. +- Fix bug where storage values were cached across blocks. +- Add MetaMask light client [testing container](https://github.com/MetaMask/mesh-testing) + +## 3.14.1 2018-2-1 + +- Further fix scrolling for Firefox. + +## 3.14.0 2018-2-1 + +- Removed unneeded data from storage +- Add a "reset account" feature to Settings +- Add warning for importing some kinds of files. +- Scrollable Setting view for Firefox. + +## 3.13.8 2018-1-29 + +- Fix provider for Kovan network. +- Bump limit for EventEmitter listeners before warning. +- Display Error when empty string is entered as a token address. + +## 3.13.7 2018-1-22 + +- Add ability to bypass gas estimation loading indicator. +- Forward failed transactions to Sentry error reporting service +- Re-add changes from 3.13.5 + +## 3.13.6 2017-1-18 + +- Roll back changes to 3.13.4 to fix some issues with the new Infura REST provider. + +## 3.13.5 2018-1-16 + +- Estimating gas limit for simple ether sends now faster & cheaper, by avoiding VM usage on recipients with no code. +- Add an extra px to address for Firefox clipping. +- Fix Firefox scrollbar. +- Open metamask popup for transaction confirmation before gas estimation finishes and add a loading screen over transaction confirmation. +- Fix bug that prevented eth_signTypedData from signing bytes. +- Further improve gas price estimation. + +## 3.13.4 2018-1-9 + +- Remove recipient field if application initializes a tx with an empty string, or 0x, and tx data. Throw an error with the same condition, but without tx data. +- Improve gas price suggestion to be closer to the lowest that will be accepted. +- Throw an error if a application tries to submit a tx whose value is a decimal, and inform that it should be in wei. +- Fix bug that prevented updating custom token details. +- No longer mark long-pending transactions as failed, since we now have button to retry with higher gas. +- Fix rounding error when specifying an ether amount that has too much precision. +- Fix bug where incorrectly inputting seed phrase would prevent any future attempts from succeeding. + +## 3.13.3 2017-12-14 + +- Show tokens that are held that have no balance. +- Reduce load on Infura by using a new block polling endpoint. + +## 3.13.2 2017-12-9 + +- Reduce new block polling interval to 8000 ms, to ease server load. + +## 3.13.1 2017-12-7 + +- Allow Dapps to specify a transaction nonce, allowing dapps to propose resubmit and force-cancel transactions. + +## 3.13.0 2017-12-7 + +- Allow resubmitting transactions that are taking long to complete. + +## 3.12.1 2017-11-29 + +- Fix bug where a user could be shown two different seed phrases. +- Detect when multiple web3 extensions are active, and provide useful error. +- Adds notice about seed phrase backup. + +## 3.12.0 2017-10-25 + +- Add support for alternative ENS TLDs (Ethereum Name Service Top-Level Domains). +- Lower minimum gas price to 0.1 GWEI. +- Remove web3 injection message from production (thanks to @ChainsawBaby) +- Add additional debugging info to our state logs, specifically OS version and browser version. + +## 3.11.2 2017-10-21 + +- Fix bug where reject button would sometimes not work. +- Fixed bug where sometimes MetaMask's connection to a page would be unreliable. + +## 3.11.1 2017-10-20 + +- Fix bug where log filters were not populated correctly +- Fix bug where web3 API was sometimes injected after the page loaded. +- Fix bug where first account was sometimes not selected correctly after creating or restoring a vault. +- Fix bug where imported accounts could not use new eth_signTypedData method. + +## 3.11.0 2017-10-11 + +- Add support for new eth_signTypedData method per EIP 712. +- Fix bug where some transactions would be shown as pending forever, even after successfully mined. +- Fix bug where a transaction might be shown as pending forever if another tx with the same nonce was mined. +- Fix link to support article on token addresses. + +## 3.10.9 2017-10-5 + +- Only rebrodcast transactions for a day not a days worth of blocks +- Remove Slack link from info page, since it is a big phishing target. +- Stop computing balance based on pending transactions, to avoid edge case where users are unable to send transactions. + +## 3.10.8 2017-9-28 + +- Fixed usage of new currency fetching API. + +## 3.10.7 2017-9-28 + +- Fixed bug where sometimes the current account was not correctly set and exposed to web apps. +- Added AUD, HKD, SGD, IDR, PHP to currency conversion list + +## 3.10.6 2017-9-27 + +- Fix bug where newly created accounts were not selected. +- Fix bug where selected account was not persisted between lockings. + +## 3.10.5 2017-9-27 + +- Fix block gas limit estimation. + +## 3.10.4 2017-9-27 + +- Fix bug that could mis-render token balances when very small. (Not actually included in 3.9.9) +- Fix memory leak warning. +- Fix bug where new event filters would not include historical events. + +## 3.10.3 2017-9-21 + +- Fix bug where metamask-dapp connections are lost on rpc error +- Fix bug that would sometimes display transactions as failed that could be successfully mined. + +## 3.10.2 2017-9-18 + +rollback to 3.10.0 due to bug + +## 3.10.1 2017-9-18 + +- Add ability to export private keys as a file. +- Add ability to export seed words as a file. +- Changed state logs to a file download than a clipboard copy. +- Add specific error for failed recipient address checksum. +- Fixed a long standing memory leak associated with filters installed by dapps +- Fix link to support center. +- Fixed tooltip icon locations to avoid overflow. +- Warn users when a dapp proposes a high gas limit (90% of blockGasLimit or higher +- Sort currencies by currency name (thanks to strelok1: https://github.com/strelok1). + +## 3.10.0 2017-9-11 + +- Readded loose keyring label back into the account list. +- Remove cryptonator from chrome permissions. +- Add info on token contract addresses. +- Add validation preventing users from inputting their own addresses as token tracking addresses. +- Added button to reject all transactions (thanks to davidp94! https://github.com/davidp94) + + +## 3.9.13 2017-9-8 + +- Changed the way we initialize the inpage provider to fix a bug affecting some developers. + +## 3.9.12 2017-9-6 + +- Fix bug that prevented Web3 1.0 compatibility +- Make eth_sign deprecation warning less noisy +- Add useful link to eth_sign deprecation warning. +- Fix bug with network version serialization over synchronous RPC +- Add MetaMask version to state logs. +- Add the total amount of tokens when multiple tokens are added under the token list +- Use HTTPS links for Etherscan. +- Update Support center link to new one with HTTPS. +- Make web3 deprecation notice more useful by linking to a descriptive article. + +## 3.9.11 2017-8-24 + +- Fix nonce calculation bug that would sometimes generate very wrong nonces. +- Give up resubmitting a transaction after 3500 blocks. + +## 3.9.10 2017-8-23 + +- Improve nonce calculation, to prevent bug where people are unable to send transactions reliably. +- Remove link to eth-tx-viz from identicons in tx history. + +## 3.9.9 2017-8-18 + +- Fix bug where some transaction submission errors would show an empty screen. +- Fix bug that could mis-render token balances when very small. +- Fix formatting of eth_sign "Sign Message" view. +- Add deprecation warning to eth_sign "Sign Message" view. + +## 3.9.8 2017-8-16 + +- Reenable token list. +- Remove default tokens. + +## 3.9.7 2017-8-15 + +- hotfix - disable token list +- Added a deprecation warning for web3 https://github.com/ethereum/mist/releases/tag/v0.9.0 + +## 3.9.6 2017-8-09 + +- Replace account screen with an account drop-down menu. +- Replace account buttons with a new account-specific drop-down menu. + +## 3.9.5 2017-8-04 + +- Improved phishing detection configuration update rate + +## 3.9.4 2017-8-03 + +- Fixed bug that prevented transactions from being rejected. + +## 3.9.3 2017-8-03 + +- Add support for EGO ujo token +- Continuously update blacklist for known phishing sites in background. +- Automatically detect suspicious URLs too similar to common phishing targets, and blacklist them. + +## 3.9.2 2017-7-26 + +- Fix bugs that could sometimes result in failed transactions after switching networks. +- Include stack traces in txMeta's to better understand the life cycle of transactions +- Enhance blacklister functionality to include levenshtein logic. (credit to @sogoiii and @409H for their help!) + +## 3.9.1 2017-7-19 + +- No longer automatically request 1 ropsten ether for the first account in a new vault. +- Now redirects from known malicious sites faster. +- Added a link to our new support page to the help screen. +- Fixed bug where a new transaction would be shown over the current transaction, creating a possible timing attack against user confirmation. +- Fixed bug in nonce tracker where an incorrect nonce would be calculated. +- Lowered minimum gas price to 1 Gwei. + +## 3.9.0 2017-7-12 + +- Now detects and blocks known phishing sites. + +## 3.8.6 2017-7-11 + +- Make transaction resubmission more resilient. +- No longer validate nonce client-side in retry loop. +- Fix bug where insufficient balance error was sometimes shown on successful transactions. + +## 3.8.5 2017-7-7 + +- Fix transaction resubmit logic to fail slightly less eagerly. + +## 3.8.4 2017-7-7 + +- Improve transaction resubmit logic to fail more eagerly when a user would expect it to. + +## 3.8.3 2017-7-6 + +- Re-enable default token list. +- Add origin header to dapp-bound requests to allow providers to throttle sites. +- Fix bug that could sometimes resubmit a transaction that had been stalled due to low balance after balance was restored. + +## 3.8.2 2017-7-3 + +- No longer show network loading indication on config screen, to allow selecting custom RPCs. +- Visually indicate that network spinner is a menu. +- Indicate what network is being searched for when disconnected. + +## 3.8.1 2017-6-30 + +- Temporarily disabled loading popular tokens by default to improve performance. +- Remove SEND token button until a better token sending form can be built, due to some precision issues. +- Fix precision bug in token balances. +- Cache token symbol and precisions to reduce network load. +- Transpile some newer JavaScript, restores compatibility with some older browsers. + +## 3.8.0 2017-6-28 + +- No longer stop rebroadcasting transactions +- Add list of popular tokens held to the account detail view. +- Add ability to add Tokens to token list. +- Add a warning to JSON file import. +- Add "send" link to token list, which goes to TokenFactory. +- Fix bug where slowly mined txs would sometimes be incorrectly marked as failed. +- Fix bug where badge count did not reflect personal_sign pending messages. +- Seed word confirmation wording is now scarier. +- Fix error for invalid seed words. +- Prevent users from submitting two duplicate transactions by disabling submit. +- Allow Dapps to specify gas price as hex string. +- Add button for copying state logs to clipboard. + +## 3.7.8 2017-6-12 + +- Add an `ethereum:` prefix to the QR code address +- The default network on installation is now MainNet +- Fix currency API URL from cryptonator. +- Update gasLimit params with every new block seen. +- Fix ENS resolver symbol UI. + +## 3.7.7 2017-6-8 + +- Fix bug where metamask would show old data after computer being asleep or disconnected from the internet. + +## 3.7.6 2017-6-5 + +- Fix bug that prevented publishing contracts. + +## 3.7.5 2017-6-5 + +- Prevent users from sending to the `0x0` address. +- Provide useful errors when entering bad characters in ENS name. +- Add ability to copy addresses from transaction confirmation view. + +## 3.7.4 2017-6-2 + +- Fix bug with inflight cache that caused some block lookups to return bad values (affected OasisDex). +- Fixed bug with gas limit calculation that would sometimes create unsubmittable gas limits. + +## 3.7.3 2017-6-1 + +- Rebuilt to fix cache clearing bug. + +## 3.7.2 2017-5-31 + +- Now when switching networks sites that use web3 will reload +- Now when switching networks the extension does not restart +- Cleanup decimal bugs in our gas inputs. +- Fix bug where submit button was enabled for invalid gas inputs. +- Now enforce 95% of block's gasLimit to protect users. +- Removing provider-engine from the inpage provider. This fixes some error handling inconsistencies introduced in 3.7.0. +- Added "inflight cache", which prevents identical requests from clogging up the network, dramatically improving ENS performance. +- Fixed bug where filter subscriptions would sometimes fail to unsubscribe. +- Some contracts will now display logos instead of jazzicons. +- Some contracts will now have names displayed in the confirmation view. + +## 3.7.0 2017-5-23 + +- Add Transaction Number (nonce) to transaction list. +- Label the pending tx icon with a tooltip. +- Fix bug where website filters would pile up and not deallocate when leaving a site. +- Continually resubmit pending txs for a period of time to ensure successful broadcast. +- ENS names will no longer resolve to their owner if no resolver is set. Resolvers must be explicitly set and configured. + +## 3.6.5 2017-5-17 + +- Fix bug where edited gas parameters would not take effect. +- Trim currency list. +- Enable decimals in our gas prices. +- Fix reset button. +- Fix event filter bug introduced by newer versions of Geth. +- Fix bug where decimals in gas inputs could result in strange values. + +## 3.6.4 2017-5-8 + +- Fix main-net ENS resolution. + +## 3.6.3 2017-5-8 + +- Fix bug that could stop newer versions of Geth from working with MetaMask. + +## 3.6.2 2017-5-8 + +- Input gas price in Gwei. +- Enforce Safe Gas Minimum recommended by EthGasStation. +- Fix bug where block-tracker could stop polling for new blocks. +- Reduce UI size by removing internal web3. +- Fix bug where gas parameters would not properly update on adjustment. + +## 3.6.1 2017-4-30 + +- Made fox less nosy. +- Fix bug where error was reported in debugger console when Chrome opened a new window. + +## 3.6.0 2017-4-26 + +- Add Rinkeby Test Network to our network list. + +## 3.5.4 2017-4-25 + +- Fix occasional nonce tracking issue. +- Fix bug where some events would not be emitted by web3. +- Fix bug where an error would be thrown when composing signatures for networks with large ID values. + +## 3.5.3 2017-4-24 + +- Popup new transactions in Firefox. +- Fix transition issue from account detail screen. +- Revise buy screen for more modularity. +- Fixed some other small bugs. + +## 3.5.2 2017-3-28 + +- Fix bug where gas estimate totals were sometimes wrong. +- Add link to Kovan Test Faucet instructions on buy view. +- Inject web3 into loaded iFrames. + +## 3.5.1 2017-3-27 + +- Fix edge case where users were unable to enable the notice button if notices were short enough to not require a scrollbar. + +## 3.5.0 2017-3-27 + +- Add better error messages for when a transaction fails on approval +- Allow sending to ENS names in send form on Ropsten. +- Added an address book functionality that remembers the last 15 unique addresses sent to. +- Can now change network to custom RPC URL from lock screen. +- Removed support for old, lightwallet based vault. Users who have not opened app in over a month will need to recover with their seed phrase. This will allow Firefox support sooner. +- Fixed bug where spinner wouldn't disappear on incorrect password submission on seed word reveal. +- Polish the private key UI. +- Enforce minimum values for gas price and gas limit. +- Fix bug where total gas was sometimes not live-updated. +- Fix bug where editing gas value could have some abrupt behaviors (#1233) +- Add Kovan as an option on our network list. +- Fixed bug where transactions on other networks would disappear when submitting a transaction on another network. + +## 3.4.0 2017-3-8 + +- Add two most recently used custom RPCs to network dropdown menu. +- Add personal_sign method support. +- Add personal_ecRecover method support. +- Add ability to customize gas and gasPrice on the transaction approval screen. +- Increase default gas buffer to 1.5x estimated gas value. + +## 3.3.0 2017-2-20 + +- net_version has been made synchronous. +- Test suite for migrations expanded. +- Network now changeable from lock screen. +- Improve test coverage of eth.sign behavior, including a code example of verifying a signature. + +## 3.2.2 2017-2-8 + +- Revert eth.sign behavior to the previous one with a big warning. We will be gradually implementing the new behavior over the coming time. https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_sign + +- Improve test coverage of eth.sign behavior, including a code example of verifying a signature. + +## 3.2.2 2017-2-8 + +- Revert eth.sign behavior to the previous one with a big warning. We will be gradually implementing the new behavior over the coming time. https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_sign + +## 3.2.1 2017-2-8 + +- Revert back to old style message signing. +- Fixed some build errors that were causing a variety of bugs. + +## 3.2.0 2017-2-8 + +- Add ability to import accounts in JSON file format (used by Mist, Geth, MyEtherWallet, and more!) +- Fix unapproved messages not being included in extension badge. +- Fix rendering bug where the Confirm transaction view would let you approve transactions when the account has insufficient balance. + +## 3.1.2 2017-1-24 + +- Fix "New Account" default keychain + +## 3.1.1 2017-1-20 + +- Fix HD wallet seed export + +## 3.1.0 2017-1-18 + +- Add ability to import accounts by private key. +- Fixed bug that returned the wrong transaction hashes on private networks that had not implemented EIP 155 replay protection (like TestRPC). + +## 3.0.1 2017-1-17 + +- Fixed bug that prevented eth.sign from working. +- Fix the displaying of transactions that have been submitted to the network in Transaction History + +## 3.0.0 2017-1-16 + +- Fix seed word account generation (https://medium.com/metamask/metamask-3-migration-guide-914b79533cdd#.t4i1qmmsz). +- Fix Bug where you see an empty transaction flash by on the confirm transaction view. +- Create visible difference in transaction history between an approved but not yet included in a block transaction and a transaction who has been confirmed. +- Fix memory leak in RPC Cache +- Override RPC commands eth_syncing and web3_clientVersion +- Remove certain non-essential permissions from certain builds. +- Add a check for when a tx is included in a block. +- Fix bug where browser-solidity would sometimes warn of a contract creation error when there was none. +- Minor modifications to network display. +- Network now displays properly for pending transactions. +- Implement replay attack protections allowed by EIP 155. +- Fix bug where sometimes loading account data would fail by querying a future block. + +## 2.14.1 2016-12-20 + +- Update Coinbase info. and increase the buy amount to $15 +- Fixed ropsten transaction links +- Temporarily disable extension reload detection causing infinite reload bug. +- Implemented basic checking for valid RPC URIs. + +## 2.14.0 2016-12-16 + +- Removed Morden testnet provider from provider menu. +- Add support for notices. +- Fix broken reload detection. +- Fix transaction forever cached-as-pending bug. + +## 2.13.11 2016-11-23 + +- Add support for synchronous RPC method "eth_uninstallFilter". +- Forgotten password prompts now send users directly to seed word restoration. + +## 2.13.10 2016-11-22 + +- Improve gas calculation logic. +- Default to Dapp-specified gas limits for transactions. +- Ropsten networks now properly point to the faucet when attempting to buy ether. +- Ropsten transactions now link to etherscan correctly. + +## 2.13.9 2016-11-21 + +- Add support for the new, default Ropsten Test Network. +- Fix bug that would cause MetaMask to occasionally lose its StreamProvider connection and drop requests. +- Fix bug that would cause the Custom RPC menu item to not appear when Localhost 8545 was selected. +- Point ropsten faucet button to actual faucet. +- Phase out ethereumjs-util from our encryptor module. + +## 2.13.8 2016-11-16 + +- Show a warning when a transaction fails during simulation. +- Fix bug where 20% of gas estimate was not being added properly. +- Render error messages in confirmation screen more gracefully. + +## 2.13.7 2016-11-8 + +- Fix bug where gas estimate would sometimes be very high. +- Increased our gas estimate from 100k gas to 20% of estimate. +- Fix GitHub link on info page to point at current repository. + +## 2.13.6 2016-10-26 + +- Add a check for improper Transaction data. +- Inject up to date version of web3.js +- Now nicknaming new accounts "Account #" instead of "Wallet #" for clarity. +- Fix bug where custom provider selection could show duplicate items. +- Fix bug where connecting to a local morden node would make two providers appear selected. +- Fix bug that was sometimes preventing transactions from being sent. + +## 2.13.5 2016-10-18 + +- Increase default max gas to `100000` over the RPC's `estimateGas` response. +- Fix bug where slow-loading dapps would sometimes trigger infinite reload loops. + +## 2.13.4 2016-10-17 + +- Add custom transaction fee field to send form. +- Fix bug where web3 was being injected into XML files. +- Fix bug where changing network would not reload current Dapps. + +## 2.13.3 2016-10-4 + +- Fix bug where log queries were filtered out. +- Decreased vault confirmation button font size to help some Linux users who could not see it. +- Made popup a little taller because it would sometimes cut off buttons. +- Fix bug where long account lists would get scrunched instead of scrolling. +- Add legal information to relevant pages. +- Rename UI elements to be more consistent with one another. +- Updated Terms of Service and Usage. +- Prompt users to re-agree to the Terms of Service when they are updated. + +## 2.13.2 2016-10-4 + +- Fix bug where chosen FIAT exchange rate does no persist when switching networks +- Fix additional parameters that made MetaMask sometimes receive errors from Parity. +- Fix bug where invalid transactions would still open the MetaMask popup. +- Removed hex prefix from private key export, to increase compatibility with Geth, MyEtherWallet, and Jaxx. + +## 2.13.1 2016-09-23 + +- Fix a bug with estimating gas on Parity +- Show loading indication when selecting ShapeShift as purchasing method. + +## 2.13.0 2016-09-18 + +- Add Parity compatibility, fixing Geth dependency issues. +- Add a link to the transaction in history that goes to https://metamask.github.io/eth-tx-viz +too help visualize transactions and to where they are going. +- Show "Buy Ether" button and warning on tx confirmation when sender balance is insufficient + +## 2.12.1 2016-09-14 + +- Fixed bug where if you send a transaction from within MetaMask extension the +popup notification opens up. +- Fixed bug where some tx errors would block subsequent txs until the plugin was refreshed. + +## 2.12.0 2016-09-14 + +- Add a QR button to the Account detail screen +- Fixed bug where opening MetaMask could close a non-metamask popup. +- Fixed memory leak that caused occasional crashes. + +## 2.11.1 2016-09-12 + +- Fix bug that prevented caches from being cleared in Opera. + +## 2.11.0 2016-09-12 + +- Fix bug where pending transactions from Test net (or other networks) show up In Main net. +- Add fiat conversion values to more views. +- On fresh install, open a new tab with the MetaMask Introduction video. Does not open on update. +- Block negative values from transactions. +- Fixed a memory leak. +- MetaMask logo now renders as super lightweight SVG, improving compatibility and performance. +- Now showing loading indication during vault unlocking, to clarify behavior for users who are experiencing slow unlocks. +- Now only initially creates one wallet when restoring a vault, to reduce some users' confusion. + +## 2.10.2 2016-09-02 + +- Fix bug where notification popup would not display. + +## 2.10.1 2016-09-02 + +- Fix bug where provider menu did not allow switching to custom network from a custom network. +- Sending a transaction from within MetaMask no longer triggers a popup. +- The ability to build without livereload features (such as for production) can be enabled with the gulp --disableLiveReload flag. +- Fix Ethereum JSON RPC Filters bug. + +## 2.10.0 2016-08-29 + +- Changed transaction approval from notifications system to popup system. +- Add a back button to locked screen to allow restoring vault from seed words when password is forgotten. +- Forms now retain their values even when closing the popup and reopening it. +- Fixed a spelling error in provider menu. + +## 2.9.2 2016-08-24 + +- Fixed shortcut bug from preventing installation. + +## 2.9.1 2016-08-24 + +- Added static image as fallback for when WebGL isn't supported. +- Transaction history now has a hard limit. +- Added info link on account screen that visits Etherscan. +- Fixed bug where a message signing request would be lost if the vault was locked. +- Added shortcut to open MetaMask (Ctrl+Alt+M or Cmd+Opt/Alt+M) +- Prevent API calls in tests. +- Fixed bug where sign message confirmation would sometimes render blank. + +## 2.9.0 2016-08-22 + +- Added ShapeShift to the transaction history +- Added affiliate key to Shapeshift requests +- Added feature to reflect current conversion rates of current vault balance. +- Modify balance display logic. + +## 2.8.0 2016-08-15 + +- Integrate ShapeShift +- Add a form for Coinbase to specify amount to buy +- Fix various typos. +- Make dapp-metamask connection more reliable +- Remove Ethereum Classic from provider menu. + +## 2.7.3 2016-07-29 + +- Fix bug where changing an account would not update in a live Dapp. + +## 2.7.2 2016-07-29 + +- Add Ethereum Classic to provider menu +- Fix bug where host store would fail to receive updates. + +## 2.7.1 2016-07-27 + +- Fix bug where web3 would sometimes not be injected in time for the application. +- Fixed bug where sometimes when opening the plugin, it would not fully open until closing and re-opening. +- Got most functionality working within Firefox (still working on review process before it can be available). +- Fixed menu dropdown bug introduced in Chrome 52. + +## 2.7.0 2016-07-21 + +- Added a Warning screen about storing ETH +- Add buy Button! +- MetaMask now throws descriptive errors when apps try to use synchronous web3 methods. +- Removed firefox-specific line in manifest. + +## 2.6.2 2016-07-20 + +- Fixed bug that would prevent the plugin from reopening on the first try after receiving a new transaction while locked. +- Fixed bug that would render 0 ETH as a non-exact amount. + +## 2.6.1 2016-07-13 + +- Fix tool tips on Eth balance to show the 6 decimals +- Fix rendering of recipient SVG in tx approval notification. +- New vaults now generate only one wallet instead of three. +- Bumped version of web3 provider engine. +- Fixed bug where some lowercase or uppercase addresses were not being recognized as valid. +- Fixed bug where gas cost was misestimated on the tx confirmation view. + +## 2.6.0 2016-07-11 + +- Fix formatting of ETH balance +- Fix formatting of account details. +- Use web3 minified dist for faster inject times +- Fix issue where dropdowns were not in front of icons. +- Update transaction approval styles. +- Align failed and successful transaction history text. +- Fix issue where large domain names and large transaction values would misalign the transaction history. +- Abbreviate ether balances on transaction details to maintain formatting. +- General code cleanup. + +## 2.5.0 2016-06-29 + +- Implement new account design. +- Added a network indicator mark in dropdown menu +- Added network name next to network indicator +- Add copy transaction hash button to completed transaction list items. +- Unify wording for transaction approve/reject options on notifications and the extension. +- Fix bug where confirmation view would be shown twice. + +## 2.4.5 2016-06-29 + +- Fixed bug where MetaMask interfered with PDF loading. +- Moved switch account icon into menu bar. +- Changed status shapes to be a yellow warning sign for failure and ellipsis for pending transactions. +- Now enforce 20 character limit on wallet names. +- Wallet titles are now properly truncated in transaction confirmation. +- Fix formatting on terms & conditions page. +- Now enforce 30 character limit on wallet names. +- Fix out-of-place positioning of pending transaction badges on wallet list. +- Change network status icons to reflect current design. + +## 2.4.4 2016-06-23 + +- Update web3-stream-provider for batch payload bug fix + +## 2.4.3 2016-06-23 + +- Remove redundant network option buttons from settings page +- Switch out font family Transat for Montserrat + +## 2.4.2 2016-06-22 + +- Change out export icon for key. +- Unify copy to clipboard icon +- Fixed eth.sign behavior. +- Fix behavior of batched outbound transactions. + +## 2.4.0 2016-06-20 + +- Clean up UI. +- Remove nonfunctional QR code button. +- Make network loading indicator clickable to select accessible network. +- Show more characters of addresses when space permits. +- Fixed bug when signing messages under 64 hex characters long. +- Add disclaimer view with placeholder text for first time users. + +## 2.3.1 2016-06-09 + +- Style up the info page +- Cache identicon images to optimize for long lists of transactions. +- Fix out of gas errors + +## 2.3.0 2016-06-06 + +- Show network status in title bar +- Added seed word recovery to config screen. +- Clicking network status indicator now reveals a provider menu. + +## 2.2.0 2016-06-02 + +- Redesigned init, vault create, vault restore and seed confirmation screens. +- Added pending transactions to transaction list on account screen. +- Clicking a pending transaction takes you back to the transaction approval screen. +- Update provider-engine to fix intermittent out of gas errors. + +## 2.1.0 2016-05-26 + +- Added copy address button to account list. +- Fixed back button on confirm transaction screen. +- Add indication of pending transactions to account list screen. +- Fixed bug where error warning was sometimes not cleared on view transition. +- Updated eth-lightwallet to fix a critical security issue. + +## 2.0.0 2016-05-23 + +- UI Overhaul per Vlad Todirut's designs. +- Replaced identicons with jazzicons. +- Fixed glitchy transitions. +- Added support for capitalization-based address checksums. +- Send value is no longer limited by javascript number precision, and is always in ETH. +- Added ability to generate new accounts. +- Added ability to locally nickname accounts. + +## 1.8.4 2016-05-13 + +- Point rpc servers to https endpoints. + +## 1.8.3 2016-05-12 + +- Bumped web3 to 0.6.0 +- Really fixed `eth_syncing` method response. + +## 1.8.2 2016-05-11 + +- Fixed bug where send view would not load correctly the first time it was visited per account. +- Migrated all users to new scalable backend. +- Fixed `eth_syncing` method response. + +## 1.8.1 2016-05-10 + +- Initial usage of scalable blockchain backend. +- Made official providers more easily configurable for us internally. + +## 1.8.0 2016-05-10 + +- Add support for calls to `eth.sign`. +- Moved account exporting within subview of the account detail view. +- Added buttons to the account export process. +- Improved visual appearance of account detail transition where button heights would change. +- Restored back button to account detail view. +- Show transaction list always, never collapsed. +- Changing provider now reloads current Dapps +- Improved appearance of transaction list in account detail view. + +## 1.7.0 2016-04-29 + +- Account detail view is now the primary view. +- The account detail view now has a "Change acct" button which shows the account list. +- Clicking accounts in the account list now both selects that account and displays that account's detail view. +- Selected account is now persisted between sessions, so the current account stays selected. +- Account icons are now "identicons" (deterministically generated from the address). +- Fixed link to Slack channel. +- Added a context guard for "define" to avoid UMD's exporting themselves to the wrong module system, fixing interference with some websites. +- Transaction list now only shows transactions for the current account. +- Transaction list now only shows transactions for the current network (mainnet, testnet, testrpc). +- Fixed transaction links to etherscan blockchain explorer. +- Fixed some UI transitions that had weird behavior. + +## 1.6.0 2016-04-22 + +- Pending transactions are now persisted to localStorage and resume even after browser is closed. +- Completed transactions are now persisted and can be displayed via UI. +- Added transaction list to account detail view. +- Fix bug on config screen where current RPC address was always displayed wrong. +- Fixed bug where entering a decimal value when sending a transaction would result in sending the wrong amount. +- Add save button to custom RPC input field. +- Add quick-select button for RPC on `localhost:8545`. +- Improve config view styling. +- Users have been migrated from old test-net RPC to a newer test-net RPC. + +## 1.5.1 2016-04-15 + +- Corrected text above account list. Selected account is visible to all sites, not just the current domain. +- Merged the UI codebase into the main plugin codebase for simpler maintenance. +- Fix Ether display rounding error. Now rendering to four decimal points. +- Fix some inpage synchronous methods +- Change account rendering to show four decimals and a leading zero. + +## 1.5.0 2016-04-13 + +- Added ability to send ether. +- Fixed bugs related to using Javascript numbers, which lacked appropriate precision. +- Replaced Etherscan main-net provider with our own production RPC. + +## 1.4.0 2016-04-08 + +- Removed extra entropy text field for simplified vault creation. +- Now supports exporting an account's private key. +- Unified button and input styles across the app. +- Removed some non-working placeholder UI until it works. +- Fix popup's web3 stream provider +- Temporarily deactivated fauceting indication because it would activate when restoring an empty account. + +## 1.3.2 2016-04-04 + + - When unlocking, first account is auto-selected. + - When creating a first vault on the test-net, the first account is auto-funded. + - Fixed some styling issues. + +## 1.0.1-1.3.1 + +Many changes not logged. Hopefully beginning to log consistently now! + +## 1.0.0 + +Made seed word restoring BIP44 compatible. + +## 0.14.0 + +Added the ability to restore accounts from seed words. diff --git a/test/unit/development/sample-manifest.json b/test/unit/development/sample-manifest.json new file mode 100644 index 000000000..2b3acf1b5 --- /dev/null +++ b/test/unit/development/sample-manifest.json @@ -0,0 +1,71 @@ +{ + "name": "MetaMask", + "short_name": "Metamask", + "version": "4.1.3", + "manifest_version": 2, + "author": "https://metamask.io", + "description": "Ethereum Browser Extension", + "commands": { + "_execute_browser_action": { + "suggested_key": { + "windows": "Alt+Shift+M", + "mac": "Alt+Shift+M", + "chromeos": "Alt+Shift+M", + "linux": "Alt+Shift+M" + } + } + }, + "icons": { + "16": "images/icon-16.png", + "128": "images/icon-128.png" + }, + "applications": { + "gecko": { + "id": "webextension@metamask.io" + } + }, + "default_locale": "en", + "background": { + "scripts": [ + "scripts/chromereload.js", + "scripts/background.js" + ], + "persistent": true + }, + "browser_action": { + "default_icon": { + "19": "images/icon-19.png", + "38": "images/icon-38.png" + }, + "default_title": "MetaMask", + "default_popup": "popup.html" + }, + "content_scripts": [ + { + "matches": [ + "file://*/*", + "http://*/*", + "https://*/*" + ], + "js": [ + "scripts/contentscript.js" + ], + "run_at": "document_start", + "all_frames": true + } + ], + "permissions": [ + "storage", + "clipboardWrite", + "http://localhost:8545/", + "https://*.infura.io/" + ], + "web_accessible_resources": [ + "scripts/inpage.js" + ], + "externally_connectable": { + "matches": [ + "https://metamask.io/*" + ] + } +} diff --git "a/test/unit/development/version\342\200\223bump-test.js" "b/test/unit/development/version\342\200\223bump-test.js" new file mode 100644 index 000000000..de29851ce --- /dev/null +++ "b/test/unit/development/version\342\200\223bump-test.js" @@ -0,0 +1,46 @@ +const assert = require('assert') +const versionBump = require('../../../development/version-bump') +const { promisify } = require('util') +const fs = require('fs') +const readFile = promisify(fs.readFile) +const path = require('path') +const changelogPath = path.join(__dirname, 'sample-changelog.md') +const manifest = require('./sample-manifest.json') +let changelog + + +describe('version bumper', function () { + + beforeEach(async () => { + // load changelog. Mock version is 4.1.3 + const changeBuffer = await readFile(changelogPath) + changelog = changeBuffer.toString() + }) + + it('returns a properly bumped major version', async function () { + const result = await versionBump('major', changelog, manifest) + const expected = '5.0.0' + assert.equal(result.version, expected, 'major bumps correctly') + assert.equal(result.manifest.version, expected, 'major bumps correctly') + console.dir(result.changelog) + assert.ok(result.changelog.includes(expected)) + }) + + it('returns a properly bumped minor version', async function () { + const result = await versionBump('minor', changelog, manifest) + const expected = '4.2.0' + assert.equal(result.version, expected, 'minor bumps correctly') + assert.equal(result.manifest.version, expected, 'minor bumps correctly') + assert.ok(result.changelog.includes(expected)) + }) + + it('returns a properly bumped patch version', async function () { + const result = await versionBump('patch', changelog, manifest) + const expected = '4.1.4' + assert.equal(result.version, expected, 'patch bumps correctly') + assert.equal(result.manifest.version, expected, 'patch bumps correctly') + assert.ok(result.changelog.includes(expected)) + }) +}) + + -- cgit v1.2.3 From 3a9b3794ebccbe3369a67e797186141dc011dd9d Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Fri, 2 Mar 2018 13:59:08 -0800 Subject: Remove logs --- development/run-version-bump.js | 7 ------- development/version-bump.js | 1 - "test/unit/development/version\342\200\223bump-test.js" | 1 - 3 files changed, 9 deletions(-) diff --git a/development/run-version-bump.js b/development/run-version-bump.js index 3b26b00db..e06c00db3 100644 --- a/development/run-version-bump.js +++ b/development/run-version-bump.js @@ -8,7 +8,6 @@ const manifestPath = path.join(__dirname, '..', 'app', 'manifest.json') const manifest = require('../app/manifest.json') const versionBump = require('./version-bump') -console.dir(process.argv) const bumpType = normalizeType(process.argv[2]) @@ -17,12 +16,9 @@ readFile(changelogPath) const changelog = changeBuffer.toString() const newData = await versionBump(bumpType, changelog, manifest) - console.dir(newData) const manifestString = JSON.stringify(newData.manifest, null, 2) - console.log('now writing files to ', changelogPath, manifestPath) - console.log(typeof newData.manifest) await writeFile(changelogPath, newData.changelog) await writeFile(manifestPath, manifestString) @@ -33,17 +29,14 @@ readFile(changelogPath) function normalizeType (userInput) { - console.log(`user inputted ${userInput}`) const err = new Error('First option must be a type (major, minor, or patch)') if (!userInput || typeof userInput !== 'string') { - console.log('first no') throw err } const lower = userInput.toLowerCase() if (lower !== 'major' && lower !== 'minor' && lower !== 'patch') { - console.log('second no') throw err } diff --git a/development/version-bump.js b/development/version-bump.js index 63dd802d1..bedf87c01 100644 --- a/development/version-bump.js +++ b/development/version-bump.js @@ -27,7 +27,6 @@ function newVersionFrom (manifest, bumpType) { const string = manifest.version let segments = string.split('.').map((str) => parseInt(str)) - console.log('bump type is ' + bumpType) switch (bumpType) { case 'major': segments[0] += 1 diff --git "a/test/unit/development/version\342\200\223bump-test.js" "b/test/unit/development/version\342\200\223bump-test.js" index de29851ce..1c445c8b4 100644 --- "a/test/unit/development/version\342\200\223bump-test.js" +++ "b/test/unit/development/version\342\200\223bump-test.js" @@ -22,7 +22,6 @@ describe('version bumper', function () { const expected = '5.0.0' assert.equal(result.version, expected, 'major bumps correctly') assert.equal(result.manifest.version, expected, 'major bumps correctly') - console.dir(result.changelog) assert.ok(result.changelog.includes(expected)) }) -- cgit v1.2.3 From 0c163dcb32ddafde8a8ed3e9e21be552a5eeeed5 Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Fri, 2 Mar 2018 19:07:25 -0330 Subject: Allow adding 0 balance tokens in old ui and editing custom token info in new (#3395) * Shows tokens with 0 balance in old ui; goHome after adding tokens. * Allow users to edit custom token info when not autofilled. (New UI add token screen). --- old-ui/app/add-token.js | 3 +++ old-ui/app/components/token-list.js | 5 +---- ui/app/add-token.js | 26 +++++++++++++++++++++----- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/old-ui/app/add-token.js b/old-ui/app/add-token.js index 8a3e66978..e869ac39a 100644 --- a/old-ui/app/add-token.js +++ b/old-ui/app/add-token.js @@ -156,6 +156,9 @@ AddTokenScreen.prototype.render = function () { const { address, symbol, decimals } = this.state this.props.dispatch(actions.addToken(address.trim(), symbol.trim(), decimals)) + .then(() => { + this.props.dispatch(actions.goHome()) + }) }, }, 'Add'), ]), diff --git a/old-ui/app/components/token-list.js b/old-ui/app/components/token-list.js index 998ec901d..149733b89 100644 --- a/old-ui/app/components/token-list.js +++ b/old-ui/app/components/token-list.js @@ -194,10 +194,7 @@ TokenList.prototype.componentWillUpdate = function (nextProps) { } TokenList.prototype.updateBalances = function (tokens) { - const heldTokens = tokens.filter(token => { - return token.balance !== '0' && token.string !== '0.000' - }) - this.setState({ tokens: heldTokens, isLoading: false }) + this.setState({ tokens, isLoading: false }) } TokenList.prototype.componentWillUnmount = function () { diff --git a/ui/app/add-token.js b/ui/app/add-token.js index 230ab35fe..a1729ba8e 100644 --- a/ui/app/add-token.js +++ b/ui/app/add-token.js @@ -52,13 +52,16 @@ function AddTokenScreen () { isShowingConfirmation: false, customAddress: '', customSymbol: '', - customDecimals: 0, + customDecimals: null, searchQuery: '', isCollapsed: true, selectedTokens: {}, errors: {}, + autoFilled: false, } this.tokenAddressDidChange = this.tokenAddressDidChange.bind(this) + this.tokenSymbolDidChange = this.tokenSymbolDidChange.bind(this) + this.tokenDecimalsDidChange = this.tokenDecimalsDidChange.bind(this) this.onNext = this.onNext.bind(this) Component.call(this) } @@ -103,6 +106,16 @@ AddTokenScreen.prototype.tokenAddressDidChange = function (e) { } } +AddTokenScreen.prototype.tokenSymbolDidChange = function (e) { + const customSymbol = e.target.value.trim() + this.setState({ customSymbol }) +} + +AddTokenScreen.prototype.tokenDecimalsDidChange = function (e) { + const customDecimals = e.target.value.trim() + this.setState({ customDecimals }) +} + AddTokenScreen.prototype.checkExistingAddresses = function (address) { if (!address) return false const tokensList = this.props.tokens @@ -125,7 +138,7 @@ AddTokenScreen.prototype.validate = function () { errors.customAddress = 'Address is invalid. ' } - const validDecimals = customDecimals >= 0 && customDecimals < 36 + const validDecimals = customDecimals !== null && customDecimals >= 0 && customDecimals < 36 if (!validDecimals) { errors.customDecimals = 'Decimals must be at least 0, and not over 36.' } @@ -166,12 +179,13 @@ AddTokenScreen.prototype.attemptToAutoFillTokenParams = async function (address) this.setState({ customSymbol: symbol, customDecimals: decimals.toString(), + autoFilled: true, }) } } AddTokenScreen.prototype.renderCustomForm = function () { - const { customAddress, customSymbol, customDecimals, errors } = this.state + const { autoFilled, customAddress, customSymbol, customDecimals, errors } = this.state return !this.state.isCollapsed && ( h('div.add-token__add-custom-form', [ @@ -196,8 +210,9 @@ AddTokenScreen.prototype.renderCustomForm = function () { h('div.add-token__add-custom-label', 'Token Symbol'), h('input.add-token__add-custom-input', { type: 'text', + onChange: this.tokenSymbolDidChange, value: customSymbol, - disabled: true, + disabled: autoFilled, }), h('div.add-token__add-custom-error-message', errors.customSymbol), ]), @@ -209,8 +224,9 @@ AddTokenScreen.prototype.renderCustomForm = function () { h('div.add-token__add-custom-label', 'Decimals of Precision'), h('input.add-token__add-custom-input', { type: 'number', + onChange: this.tokenDecimalsDidChange, value: customDecimals, - disabled: true, + disabled: autoFilled, }), h('div.add-token__add-custom-error-message', errors.customDecimals), ]), -- cgit v1.2.3 From 92453f8715b78c0e6e2cdb9b2e1cfe48c0b013ad Mon Sep 17 00:00:00 2001 From: Csaba Solya Date: Sat, 3 Mar 2018 00:32:57 +0100 Subject: seed phrase verifier --- app/scripts/lib/seed-phrase-verifier.js | 43 ++++++++++ app/scripts/metamask-controller.js | 20 ++++- test/unit/seed-phrase-verifier-test.js | 136 ++++++++++++++++++++++++++++++++ 3 files changed, 197 insertions(+), 2 deletions(-) create mode 100644 app/scripts/lib/seed-phrase-verifier.js create mode 100644 test/unit/seed-phrase-verifier-test.js diff --git a/app/scripts/lib/seed-phrase-verifier.js b/app/scripts/lib/seed-phrase-verifier.js new file mode 100644 index 000000000..9bea2910e --- /dev/null +++ b/app/scripts/lib/seed-phrase-verifier.js @@ -0,0 +1,43 @@ +const KeyringController = require('eth-keyring-controller') + +const seedPhraseVerifier = { + + verifyAccounts(createdAccounts, seedWords) { + + return new Promise((resolve, reject) => { + + if (!createdAccounts || createdAccounts.length < 1) { + return reject(new Error('No created accounts defined.')) + } + + let keyringController = new KeyringController({}) + let Keyring = keyringController.getKeyringClassForType('HD Key Tree') + let opts = { + mnemonic: seedWords, + numberOfAccounts: createdAccounts.length, + } + + let keyring = new Keyring(opts) + keyring.getAccounts() + .then((restoredAccounts) => { + + log.debug('Created accounts: ' + JSON.stringify(createdAccounts)) + log.debug('Restored accounts: ' + JSON.stringify(restoredAccounts)) + + if (restoredAccounts.length != createdAccounts.length) { + // this should not happen... + return reject(new Error("Wrong number of accounts")) + } + + for (let i = 0; i < restoredAccounts.length; i++) { + if (restoredAccounts[i] !== createdAccounts[i]) { + return reject(new Error('Not identical accounts! Original: ' + createdAccounts[i] + ', Restored: ' + restoredAccounts[i])) + } + } + return resolve() + }) + }) + } +} + +module.exports = seedPhraseVerifier \ No newline at end of file diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index ad4e71792..89bcbd51b 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -37,6 +37,7 @@ const version = require('../manifest.json').version const BN = require('ethereumjs-util').BN const GWEI_BN = new BN('1000000000') const percentile = require('percentile') +const seedPhraseVerifier = require('./lib/seed-phrase-verifier') module.exports = class MetamaskController extends EventEmitter { @@ -592,8 +593,23 @@ module.exports = class MetamaskController extends EventEmitter { primaryKeyring.serialize() .then((serialized) => { const seedWords = serialized.mnemonic - this.configManager.setSeedWords(seedWords) - cb(null, seedWords) + + primaryKeyring.getAccounts() + .then((accounts) => { + if (accounts.length < 1) { + return cb(new Error('MetamaskController - No accounts found')) + } + + seedPhraseVerifier.verifyAccounts(accounts, seedWords) + .then(() => { + this.configManager.setSeedWords(seedWords) + cb(null, seedWords) + }) + .catch((err) => { + log.error(err) + cb(err) + }) + }) }) } diff --git a/test/unit/seed-phrase-verifier-test.js b/test/unit/seed-phrase-verifier-test.js new file mode 100644 index 000000000..a7a463dd3 --- /dev/null +++ b/test/unit/seed-phrase-verifier-test.js @@ -0,0 +1,136 @@ +const assert = require('assert') +const clone = require('clone') +const KeyringController = require('eth-keyring-controller') +const firstTimeState = require('../../app/scripts/first-time-state') +const seedPhraseVerifier = require('../../app/scripts/lib/seed-phrase-verifier') +const mockEncryptor = require('../lib/mock-encryptor') + +describe('SeedPhraseVerifier', function () { + + describe('verifyAccounts', function () { + + var password = 'passw0rd1' + let hdKeyTree = 'HD Key Tree' + + it('should be able to verify created account with seed words', async function () { + + let keyringController = new KeyringController({ + initState: clone(firstTimeState), + encryptor: mockEncryptor, + }) + assert(keyringController) + + let vault = await keyringController.createNewVaultAndKeychain(password) + let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0] + + let createdAccounts = await primaryKeyring.getAccounts() + assert.equal(createdAccounts.length, 1) + + let serialized = await primaryKeyring.serialize() + let seedWords = serialized.mnemonic + assert.notEqual(seedWords.length, 0) + + let result = await seedPhraseVerifier.verifyAccounts(createdAccounts, seedWords) + }) + + it('should return error with good but different seed words', async function () { + + let keyringController = new KeyringController({ + initState: clone(firstTimeState), + encryptor: mockEncryptor, + }) + assert(keyringController) + + let vault = await keyringController.createNewVaultAndKeychain(password) + let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0] + + let createdAccounts = await primaryKeyring.getAccounts() + assert.equal(createdAccounts.length, 1) + + let serialized = await primaryKeyring.serialize() + let seedWords = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium' + + try { + let result = await seedPhraseVerifier.verifyAccounts(createdAccounts, seedWords) + assert.fail("Should reject") + } catch (err) { + assert.ok(err.message.indexOf('Not identical accounts!') >= 0, 'Wrong error message') + } + }) + + it('should return error with undefined existing accounts', async function () { + + let keyringController = new KeyringController({ + initState: clone(firstTimeState), + encryptor: mockEncryptor, + }) + assert(keyringController) + + let vault = await keyringController.createNewVaultAndKeychain(password) + let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0] + + let createdAccounts = await primaryKeyring.getAccounts() + assert.equal(createdAccounts.length, 1) + + let serialized = await primaryKeyring.serialize() + let seedWords = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium' + + try { + let result = await seedPhraseVerifier.verifyAccounts(undefined, seedWords) + assert.fail("Should reject") + } catch (err) { + assert.equal(err.message, 'No created accounts defined.') + } + }) + + it('should return error with empty accounts array', async function () { + + let keyringController = new KeyringController({ + initState: clone(firstTimeState), + encryptor: mockEncryptor, + }) + assert(keyringController) + + let vault = await keyringController.createNewVaultAndKeychain(password) + let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0] + + let createdAccounts = await primaryKeyring.getAccounts() + assert.equal(createdAccounts.length, 1) + + let serialized = await primaryKeyring.serialize() + let seedWords = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium' + + try { + let result = await seedPhraseVerifier.verifyAccounts([], seedWords) + assert.fail("Should reject") + } catch (err) { + assert.equal(err.message, 'No created accounts defined.') + } + }) + + it('should be able to verify more than one created account with seed words', async function () { + + let keyringController = new KeyringController({ + initState: clone(firstTimeState), + encryptor: mockEncryptor, + }) + assert(keyringController) + + let vault = await keyringController.createNewVaultAndKeychain(password) + + let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0] + + const keyState = await keyringController.addNewAccount(primaryKeyring) + const keyState2 = await keyringController.addNewAccount(primaryKeyring) + + let createdAccounts = await primaryKeyring.getAccounts() + assert.equal(createdAccounts.length, 3) + + let serialized = await primaryKeyring.serialize() + let seedWords = serialized.mnemonic + assert.notEqual(seedWords.length, 0) + + let result = await seedPhraseVerifier.verifyAccounts(createdAccounts, seedWords) + }) + }) +}) -- cgit v1.2.3 From 4bd7f1a37abcd09dc8816fc5b28ad41bc86b1aea Mon Sep 17 00:00:00 2001 From: Csaba Solya Date: Sat, 3 Mar 2018 00:40:40 +0100 Subject: fix lint issues --- app/scripts/lib/seed-phrase-verifier.js | 18 +++++++++--------- app/scripts/metamask-controller.js | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/scripts/lib/seed-phrase-verifier.js b/app/scripts/lib/seed-phrase-verifier.js index 9bea2910e..97a433fd8 100644 --- a/app/scripts/lib/seed-phrase-verifier.js +++ b/app/scripts/lib/seed-phrase-verifier.js @@ -2,7 +2,7 @@ const KeyringController = require('eth-keyring-controller') const seedPhraseVerifier = { - verifyAccounts(createdAccounts, seedWords) { + verifyAccounts (createdAccounts, seedWords) { return new Promise((resolve, reject) => { @@ -10,23 +10,23 @@ const seedPhraseVerifier = { return reject(new Error('No created accounts defined.')) } - let keyringController = new KeyringController({}) - let Keyring = keyringController.getKeyringClassForType('HD Key Tree') - let opts = { + const keyringController = new KeyringController({}) + const Keyring = keyringController.getKeyringClassForType('HD Key Tree') + const opts = { mnemonic: seedWords, numberOfAccounts: createdAccounts.length, } - let keyring = new Keyring(opts) + const keyring = new Keyring(opts) keyring.getAccounts() .then((restoredAccounts) => { log.debug('Created accounts: ' + JSON.stringify(createdAccounts)) log.debug('Restored accounts: ' + JSON.stringify(restoredAccounts)) - if (restoredAccounts.length != createdAccounts.length) { + if (restoredAccounts.length !== createdAccounts.length) { // this should not happen... - return reject(new Error("Wrong number of accounts")) + return reject(new Error('Wrong number of accounts')) } for (let i = 0; i < restoredAccounts.length; i++) { @@ -37,7 +37,7 @@ const seedPhraseVerifier = { return resolve() }) }) - } + }, } -module.exports = seedPhraseVerifier \ No newline at end of file +module.exports = seedPhraseVerifier diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 89bcbd51b..b9231aa3d 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -599,9 +599,9 @@ module.exports = class MetamaskController extends EventEmitter { if (accounts.length < 1) { return cb(new Error('MetamaskController - No accounts found')) } - + seedPhraseVerifier.verifyAccounts(accounts, seedWords) - .then(() => { + .then(() => { this.configManager.setSeedWords(seedWords) cb(null, seedWords) }) -- cgit v1.2.3 From bdbe29906976915196f347861e913f3f5b523d0e Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Fri, 2 Mar 2018 14:33:29 -0800 Subject: Clean up run version bump script --- development/run-version-bump.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/development/run-version-bump.js b/development/run-version-bump.js index e06c00db3..fde14566e 100644 --- a/development/run-version-bump.js +++ b/development/run-version-bump.js @@ -7,12 +7,13 @@ const changelogPath = path.join(__dirname, '..', 'CHANGELOG.md') const manifestPath = path.join(__dirname, '..', 'app', 'manifest.json') const manifest = require('../app/manifest.json') const versionBump = require('./version-bump') - const bumpType = normalizeType(process.argv[2]) +start().catch(console.error) + +async function start() { -readFile(changelogPath) -.then(async (changeBuffer) => { + const changeBuffer = await readFile(changelogPath) const changelog = changeBuffer.toString() const newData = await versionBump(bumpType, changelog, manifest) @@ -22,10 +23,8 @@ readFile(changelogPath) await writeFile(changelogPath, newData.changelog) await writeFile(manifestPath, manifestString) - return newData.version -}) -.then((version) => console.log(`Bumped ${bumpType} to version ${version}`)) -.catch(console.error) + console.log(`Bumped ${bumpType} to version ${newData.version}`) +} function normalizeType (userInput) { -- cgit v1.2.3 From 0d97ff221017b78ccfa02defdb7a52ad701981a5 Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Fri, 2 Mar 2018 22:44:05 -0330 Subject: Fix NewUI reveal seed flow. (#3410) --- ui/app/actions.js | 5 +++-- ui/app/app.js | 14 +++++++++++--- ui/app/reducers/app.js | 4 ++-- ui/app/reducers/metamask.js | 7 ++++++- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/ui/app/actions.js b/ui/app/actions.js index 64d5b67e0..4f902a6a2 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -853,15 +853,16 @@ function markPasswordForgotten () { function unMarkPasswordForgotten () { return (dispatch) => { return background.unMarkPasswordForgotten(() => { - dispatch(actions.forgotPassword()) + dispatch(actions.forgotPassword(false)) forceUpdateMetamaskState(dispatch) }) } } -function forgotPassword () { +function forgotPassword (forgotPasswordState = true) { return { type: actions.FORGOT_PASSWORD, + value: forgotPasswordState, } } diff --git a/ui/app/app.js b/ui/app/app.js index 5d37b9bdf..bfa8d8aa7 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -89,6 +89,7 @@ function mapStateToProps (state) { currentCurrency: state.metamask.currentCurrency, isMouseUser: state.appState.isMouseUser, betaUI: state.metamask.featureFlags.betaUI, + isRevealingSeedWords: state.metamask.isRevealingSeedWords, // state needed to get account dropdown temporarily rendering from app bar identities, @@ -362,9 +363,16 @@ App.prototype.renderBackButton = function (style, justArrow = false) { App.prototype.renderPrimary = function () { log.debug('rendering primary') var props = this.props - const {isMascara, isOnboarding, betaUI} = props + const { + isMascara, + isOnboarding, + betaUI, + isRevealingSeedWords, + } = props + const isMascaraOnboarding = isMascara && isOnboarding + const isBetaUIOnboarding = betaUI && isOnboarding && !props.isPopup && !isRevealingSeedWords - if ((isMascara || betaUI) && isOnboarding && !props.isPopup) { + if (isMascaraOnboarding || isBetaUIOnboarding) { return h(MascaraFirstTime) } @@ -388,7 +396,7 @@ App.prototype.renderPrimary = function () { if (props.isInitialized && props.forgottenPassword) { log.debug('rendering restore vault screen') return h(HDRestoreVaultScreen, {key: 'HDRestoreVaultScreen'}) - } else if (!props.isInitialized && !props.isUnlocked) { + } else if (!props.isInitialized && !props.isUnlocked && !isRevealingSeedWords) { log.debug('rendering menu screen') return props.isPopup ? h(OldUIInitializeMenuScreen, {key: 'menuScreenInit'}) diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index 02f024f7c..4dda839a2 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -140,10 +140,10 @@ function reduceApp (state, action) { case actions.FORGOT_PASSWORD: return extend(appState, { currentView: { - name: 'restoreVault', + name: action.value ? 'restoreVault' : 'accountDetail', }, transForward: false, - forgottenPassword: true, + forgottenPassword: action.value, }) case actions.SHOW_INIT_MENU: diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js index beeba948d..cddcd0c1f 100644 --- a/ui/app/reducers/metamask.js +++ b/ui/app/reducers/metamask.js @@ -43,12 +43,15 @@ function reduceMetamask (state, action) { useBlockie: false, featureFlags: {}, networkEndpointType: OLD_UI_NETWORK_TYPE, + isRevealingSeedWords: false, }, state.metamask) switch (action.type) { case actions.SHOW_ACCOUNTS_PAGE: - newState = extend(metamaskState) + newState = extend(metamaskState, { + isRevealingSeedWords: false, + }) delete newState.seedWords return newState @@ -124,10 +127,12 @@ function reduceMetamask (state, action) { }, }) + case actions.SHOW_NEW_VAULT_SEED: return extend(metamaskState, { isUnlocked: true, isInitialized: false, + isRevealingSeedWords: true, seedWords: action.value, }) -- cgit v1.2.3 From 6f8077f587fe16ebdb8ce3ffe7a0df9f58c74ffb Mon Sep 17 00:00:00 2001 From: Thomas Date: Fri, 2 Mar 2018 18:23:27 -0800 Subject: Swap color scheme for import account label --- ui/app/css/itcss/components/account-menu.scss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/app/css/itcss/components/account-menu.scss b/ui/app/css/itcss/components/account-menu.scss index 8ad7481c7..4752741aa 100644 --- a/ui/app/css/itcss/components/account-menu.scss +++ b/ui/app/css/itcss/components/account-menu.scss @@ -66,8 +66,9 @@ .keyring-label { margin-top: 5px; - background-color: $black; - color: $dusty-gray; + background-color: $dusty-gray; + color: $black; + font-weight: normal; } } -- cgit v1.2.3 From ee254b4f6feeb040607472a0f4d69c7e4173c25e Mon Sep 17 00:00:00 2001 From: Thomas Date: Fri, 2 Mar 2018 18:24:09 -0800 Subject: Import Account disclaimer --- ui/app/accounts/import/index.js | 11 ++--------- ui/app/css/itcss/components/new-account.scss | 10 ++++++++++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ui/app/accounts/import/index.js b/ui/app/accounts/import/index.js index 7e7d3aa91..adb52db74 100644 --- a/ui/app/accounts/import/index.js +++ b/ui/app/accounts/import/index.js @@ -35,17 +35,10 @@ AccountImportSubview.prototype.render = function () { return ( h('div.new-account-import-form', [ - h('.warning', { - style: { - display: 'inline-block', - alignItems: 'center', - padding: '15px 15px 0px 15px', - }, - }, [ + h('.new-account-import-disclaimer', [ h('span', 'Imported accounts will not be associated with your originally created MetaMask account seedphrase. Learn more about imported accounts '), h('span', { style: { - color: 'rgba(247, 134, 28, 1)', cursor: 'pointer', textDecoration: 'underline', }, @@ -54,7 +47,7 @@ AccountImportSubview.prototype.render = function () { url: 'https://metamask.helpscoutdocs.com/article/17-what-are-loose-accounts', }) }, - }, 'here.'), + }, 'here'), ]), h('div.new-account-import-form__select-section', [ diff --git a/ui/app/css/itcss/components/new-account.scss b/ui/app/css/itcss/components/new-account.scss index 81f919df3..c6c254ede 100644 --- a/ui/app/css/itcss/components/new-account.scss +++ b/ui/app/css/itcss/components/new-account.scss @@ -54,6 +54,16 @@ } +.new-account-import-disclaimer { + width: 120%; + background-color: #F4F9FC; + display: inline-block; + align-items: center; + padding: 20px 30px 20px; + font-size: 12px; + line-height: 1.5; +} + .new-account-import-form { display: flex; flex-flow: column; -- cgit v1.2.3 From 3e05b693dbf55ea7ecb791e8f31b7599a6b89ffd Mon Sep 17 00:00:00 2001 From: Csaba Solya Date: Sat, 3 Mar 2018 14:11:02 +0100 Subject: verify addresses regardless case --- app/scripts/lib/seed-phrase-verifier.js | 2 +- test/unit/seed-phrase-verifier-test.js | 44 +++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/app/scripts/lib/seed-phrase-verifier.js b/app/scripts/lib/seed-phrase-verifier.js index 97a433fd8..1f35c2c67 100644 --- a/app/scripts/lib/seed-phrase-verifier.js +++ b/app/scripts/lib/seed-phrase-verifier.js @@ -30,7 +30,7 @@ const seedPhraseVerifier = { } for (let i = 0; i < restoredAccounts.length; i++) { - if (restoredAccounts[i] !== createdAccounts[i]) { + if (restoredAccounts[i].toLowerCase() !== createdAccounts[i].toLowerCase()) { return reject(new Error('Not identical accounts! Original: ' + createdAccounts[i] + ', Restored: ' + restoredAccounts[i])) } } diff --git a/test/unit/seed-phrase-verifier-test.js b/test/unit/seed-phrase-verifier-test.js index a7a463dd3..3e9acfa82 100644 --- a/test/unit/seed-phrase-verifier-test.js +++ b/test/unit/seed-phrase-verifier-test.js @@ -33,6 +33,50 @@ describe('SeedPhraseVerifier', function () { let result = await seedPhraseVerifier.verifyAccounts(createdAccounts, seedWords) }) + it('should be able to verify created account (upper case) with seed words', async function () { + + let keyringController = new KeyringController({ + initState: clone(firstTimeState), + encryptor: mockEncryptor, + }) + assert(keyringController) + + let vault = await keyringController.createNewVaultAndKeychain(password) + let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0] + + let createdAccounts = await primaryKeyring.getAccounts() + assert.equal(createdAccounts.length, 1) + let upperCaseAccounts = [createdAccounts[0].toUpperCase()] + + let serialized = await primaryKeyring.serialize() + let seedWords = serialized.mnemonic + assert.notEqual(seedWords.length, 0) + + let result = await seedPhraseVerifier.verifyAccounts(upperCaseAccounts, seedWords) + }) + + it('should be able to verify created account (lower case) with seed words', async function () { + + let keyringController = new KeyringController({ + initState: clone(firstTimeState), + encryptor: mockEncryptor, + }) + assert(keyringController) + + let vault = await keyringController.createNewVaultAndKeychain(password) + let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0] + + let createdAccounts = await primaryKeyring.getAccounts() + assert.equal(createdAccounts.length, 1) + let lowerCaseAccounts = [createdAccounts[0].toLowerCase()] + + let serialized = await primaryKeyring.serialize() + let seedWords = serialized.mnemonic + assert.notEqual(seedWords.length, 0) + + let result = await seedPhraseVerifier.verifyAccounts(lowerCaseAccounts, seedWords) + }) + it('should return error with good but different seed words', async function () { let keyringController = new KeyringController({ -- cgit v1.2.3 From 2b86d65d0c3266e8ddfe814abe1d1755fbf23fda Mon Sep 17 00:00:00 2001 From: Csaba Solya Date: Sat, 3 Mar 2018 22:08:10 +0100 Subject: verify seedwords on log in --- app/scripts/metamask-controller.js | 19 +++++++++++--- test/unit/seed-phrase-verifier-test.js | 48 ++++++---------------------------- ui/app/actions.js | 7 +++++ 3 files changed, 31 insertions(+), 43 deletions(-) diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index b9231aa3d..df9adc248 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -345,6 +345,7 @@ module.exports = class MetamaskController extends EventEmitter { // primary HD keyring management addNewAccount: nodeify(this.addNewAccount, this), placeSeedWords: this.placeSeedWords.bind(this), + verifySeedPhrase: this.verifySeedPhrase.bind(this), clearSeedWordCache: this.clearSeedWordCache.bind(this), resetAccount: this.resetAccount.bind(this), importAccountWithStrategy: this.importAccountWithStrategy.bind(this), @@ -588,6 +589,19 @@ module.exports = class MetamaskController extends EventEmitter { // Used when creating a first vault, to allow confirmation. // Also used when revealing the seed words in the confirmation view. placeSeedWords (cb) { + + this.verifySeedPhrase((err, seedWords) => { + + if (err) { + return cb(err) + } + this.configManager.setSeedWords(seedWords) + return cb(null, seedWords) + }) + } + + verifySeedPhrase (cb) { + const primaryKeyring = this.keyringController.getKeyringsByType('HD Key Tree')[0] if (!primaryKeyring) return cb(new Error('MetamaskController - No HD Key Tree found')) primaryKeyring.serialize() @@ -602,12 +616,11 @@ module.exports = class MetamaskController extends EventEmitter { seedPhraseVerifier.verifyAccounts(accounts, seedWords) .then(() => { - this.configManager.setSeedWords(seedWords) - cb(null, seedWords) + return cb(null, seedWords) }) .catch((err) => { log.error(err) - cb(err) + return cb(err) }) }) }) diff --git a/test/unit/seed-phrase-verifier-test.js b/test/unit/seed-phrase-verifier-test.js index 3e9acfa82..654fb5994 100644 --- a/test/unit/seed-phrase-verifier-test.js +++ b/test/unit/seed-phrase-verifier-test.js @@ -9,16 +9,20 @@ describe('SeedPhraseVerifier', function () { describe('verifyAccounts', function () { - var password = 'passw0rd1' + let password = 'passw0rd1' let hdKeyTree = 'HD Key Tree' - it('should be able to verify created account with seed words', async function () { - - let keyringController = new KeyringController({ + let keyringController + beforeEach(function () { + keyringController = new KeyringController({ initState: clone(firstTimeState), encryptor: mockEncryptor, }) + assert(keyringController) + }) + + it('should be able to verify created account with seed words', async function () { let vault = await keyringController.createNewVaultAndKeychain(password) let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0] @@ -35,12 +39,6 @@ describe('SeedPhraseVerifier', function () { it('should be able to verify created account (upper case) with seed words', async function () { - let keyringController = new KeyringController({ - initState: clone(firstTimeState), - encryptor: mockEncryptor, - }) - assert(keyringController) - let vault = await keyringController.createNewVaultAndKeychain(password) let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0] @@ -57,12 +55,6 @@ describe('SeedPhraseVerifier', function () { it('should be able to verify created account (lower case) with seed words', async function () { - let keyringController = new KeyringController({ - initState: clone(firstTimeState), - encryptor: mockEncryptor, - }) - assert(keyringController) - let vault = await keyringController.createNewVaultAndKeychain(password) let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0] @@ -79,12 +71,6 @@ describe('SeedPhraseVerifier', function () { it('should return error with good but different seed words', async function () { - let keyringController = new KeyringController({ - initState: clone(firstTimeState), - encryptor: mockEncryptor, - }) - assert(keyringController) - let vault = await keyringController.createNewVaultAndKeychain(password) let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0] @@ -104,12 +90,6 @@ describe('SeedPhraseVerifier', function () { it('should return error with undefined existing accounts', async function () { - let keyringController = new KeyringController({ - initState: clone(firstTimeState), - encryptor: mockEncryptor, - }) - assert(keyringController) - let vault = await keyringController.createNewVaultAndKeychain(password) let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0] @@ -129,12 +109,6 @@ describe('SeedPhraseVerifier', function () { it('should return error with empty accounts array', async function () { - let keyringController = new KeyringController({ - initState: clone(firstTimeState), - encryptor: mockEncryptor, - }) - assert(keyringController) - let vault = await keyringController.createNewVaultAndKeychain(password) let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0] @@ -154,12 +128,6 @@ describe('SeedPhraseVerifier', function () { it('should be able to verify more than one created account with seed words', async function () { - let keyringController = new KeyringController({ - initState: clone(firstTimeState), - encryptor: mockEncryptor, - }) - assert(keyringController) - let vault = await keyringController.createNewVaultAndKeychain(password) let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0] diff --git a/ui/app/actions.js b/ui/app/actions.js index 64d5b67e0..9606841ae 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -296,6 +296,13 @@ function tryUnlockMetamask (password) { dispatch(actions.unlockSucceeded()) dispatch(actions.transitionForward()) forceUpdateMetamaskState(dispatch) + + background.verifySeedPhrase((err) => { + if (err) { + dispatch(actions.displayWarning(err.message)) + } + }) + } }) } -- cgit v1.2.3 From f7d4a1080df6d1c8ea5f68f88b01caea065b5e92 Mon Sep 17 00:00:00 2001 From: Csaba Solya Date: Sun, 4 Mar 2018 08:47:46 +0100 Subject: add documentation --- app/scripts/lib/seed-phrase-verifier.js | 5 +++++ app/scripts/metamask-controller.js | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/app/scripts/lib/seed-phrase-verifier.js b/app/scripts/lib/seed-phrase-verifier.js index 1f35c2c67..9cea22029 100644 --- a/app/scripts/lib/seed-phrase-verifier.js +++ b/app/scripts/lib/seed-phrase-verifier.js @@ -2,6 +2,11 @@ const KeyringController = require('eth-keyring-controller') const seedPhraseVerifier = { + // Verifies if the seed words can restore the accounts. + // + // The seed words can recreate the primary keyring and the accounts belonging to it. + // The created accounts in the primary keyring are always the same. + // The keyring always creates the accounts in the same sequence. verifyAccounts (createdAccounts, seedWords) { return new Promise((resolve, reject) => { diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index df9adc248..f523e3919 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -600,6 +600,10 @@ module.exports = class MetamaskController extends EventEmitter { }) } + // Verifies the current vault's seed words if they can restore the + // accounts belonging to the current vault. + // + // Called when the first account is created and on unlocking the vault. verifySeedPhrase (cb) { const primaryKeyring = this.keyringController.getKeyringsByType('HD Key Tree')[0] -- cgit v1.2.3 From 8fde208f0b1da39ccd63b5f256902786e73e9368 Mon Sep 17 00:00:00 2001 From: Csaba Solya Date: Sun, 4 Mar 2018 08:57:55 +0100 Subject: move more test code to beforeEach --- test/unit/seed-phrase-verifier-test.js | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/test/unit/seed-phrase-verifier-test.js b/test/unit/seed-phrase-verifier-test.js index 654fb5994..4e314806b 100644 --- a/test/unit/seed-phrase-verifier-test.js +++ b/test/unit/seed-phrase-verifier-test.js @@ -13,20 +13,23 @@ describe('SeedPhraseVerifier', function () { let hdKeyTree = 'HD Key Tree' let keyringController - beforeEach(function () { + let vault + let primaryKeyring + + beforeEach(async function () { keyringController = new KeyringController({ initState: clone(firstTimeState), encryptor: mockEncryptor, }) assert(keyringController) + + vault = await keyringController.createNewVaultAndKeychain(password) + primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0] }) it('should be able to verify created account with seed words', async function () { - let vault = await keyringController.createNewVaultAndKeychain(password) - let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0] - let createdAccounts = await primaryKeyring.getAccounts() assert.equal(createdAccounts.length, 1) @@ -39,11 +42,9 @@ describe('SeedPhraseVerifier', function () { it('should be able to verify created account (upper case) with seed words', async function () { - let vault = await keyringController.createNewVaultAndKeychain(password) - let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0] - let createdAccounts = await primaryKeyring.getAccounts() assert.equal(createdAccounts.length, 1) + let upperCaseAccounts = [createdAccounts[0].toUpperCase()] let serialized = await primaryKeyring.serialize() @@ -55,9 +56,6 @@ describe('SeedPhraseVerifier', function () { it('should be able to verify created account (lower case) with seed words', async function () { - let vault = await keyringController.createNewVaultAndKeychain(password) - let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0] - let createdAccounts = await primaryKeyring.getAccounts() assert.equal(createdAccounts.length, 1) let lowerCaseAccounts = [createdAccounts[0].toLowerCase()] @@ -71,9 +69,6 @@ describe('SeedPhraseVerifier', function () { it('should return error with good but different seed words', async function () { - let vault = await keyringController.createNewVaultAndKeychain(password) - let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0] - let createdAccounts = await primaryKeyring.getAccounts() assert.equal(createdAccounts.length, 1) @@ -90,9 +85,6 @@ describe('SeedPhraseVerifier', function () { it('should return error with undefined existing accounts', async function () { - let vault = await keyringController.createNewVaultAndKeychain(password) - let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0] - let createdAccounts = await primaryKeyring.getAccounts() assert.equal(createdAccounts.length, 1) @@ -109,9 +101,6 @@ describe('SeedPhraseVerifier', function () { it('should return error with empty accounts array', async function () { - let vault = await keyringController.createNewVaultAndKeychain(password) - let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0] - let createdAccounts = await primaryKeyring.getAccounts() assert.equal(createdAccounts.length, 1) @@ -128,10 +117,6 @@ describe('SeedPhraseVerifier', function () { it('should be able to verify more than one created account with seed words', async function () { - let vault = await keyringController.createNewVaultAndKeychain(password) - - let primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0] - const keyState = await keyringController.addNewAccount(primaryKeyring) const keyState2 = await keyringController.addNewAccount(primaryKeyring) -- cgit v1.2.3 From 1bd18cebd7e08edbbcf35407b962e71dcd2c3399 Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Mon, 5 Mar 2018 13:33:46 -0330 Subject: Fixes shapeshift coin selection dropdown. (#3416) --- ui/app/app.js | 4 +++- ui/app/components/shapeshift-form.js | 9 ++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ui/app/app.js b/ui/app/app.js index bfa8d8aa7..d243e72a4 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -90,6 +90,7 @@ function mapStateToProps (state) { isMouseUser: state.appState.isMouseUser, betaUI: state.metamask.featureFlags.betaUI, isRevealingSeedWords: state.metamask.isRevealingSeedWords, + Qr: state.appState.Qr, // state needed to get account dropdown temporarily rendering from app bar identities, @@ -368,6 +369,7 @@ App.prototype.renderPrimary = function () { isOnboarding, betaUI, isRevealingSeedWords, + Qr, } = props const isMascaraOnboarding = isMascara && isOnboarding const isBetaUIOnboarding = betaUI && isOnboarding && !props.isPopup && !isRevealingSeedWords @@ -508,7 +510,7 @@ App.prototype.renderPrimary = function () { width: '285px', }, }, [ - h(QrView, {key: 'qr'}), + h(QrView, {key: 'qr', Qr}), ]), ]) diff --git a/ui/app/components/shapeshift-form.js b/ui/app/components/shapeshift-form.js index 2270b8236..648b05049 100644 --- a/ui/app/components/shapeshift-form.js +++ b/ui/app/components/shapeshift-form.js @@ -51,8 +51,7 @@ ShapeshiftForm.prototype.componentWillMount = function () { this.props.shapeShiftSubview() } -ShapeshiftForm.prototype.onCoinChange = function (e) { - const coin = e.target.value +ShapeshiftForm.prototype.onCoinChange = function (coin) { this.setState({ depositCoin: coin, errorMessage: '', @@ -133,7 +132,7 @@ ShapeshiftForm.prototype.renderMarketInfo = function () { } ShapeshiftForm.prototype.renderQrCode = function () { - const { depositAddress, isLoading } = this.state + const { depositAddress, isLoading, depositCoin } = this.state const qrImage = qrcode(4, 'M') qrImage.addData(depositAddress) qrImage.make() @@ -141,7 +140,7 @@ ShapeshiftForm.prototype.renderQrCode = function () { return h('div.shapeshift-form', {}, [ h('div.shapeshift-form__deposit-instruction', [ - 'Deposit your BTC to the address below:', + `Deposit your ${depositCoin.toUpperCase()} to the address below:`, ]), h('div', depositAddress), @@ -182,7 +181,7 @@ ShapeshiftForm.prototype.render = function () { h(SimpleDropdown, { selectedOption: this.state.depositCoin, - onSelect: this.onCoinChange, + onSelect: (coin) => this.onCoinChange(coin), options: Object.entries(coinOptions).map(([coin]) => ({ value: coin.toLowerCase(), displayValue: coin, -- cgit v1.2.3 From 68604b53dde23eaeb44657153244928627b723ab Mon Sep 17 00:00:00 2001 From: Dan Date: Mon, 5 Mar 2018 23:12:06 -0330 Subject: Prevent user from selecting max amount until there is an estimated gas total. --- ui/app/send-v2.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/app/send-v2.js b/ui/app/send-v2.js index 1d67150e3..3667e9d73 100644 --- a/ui/app/send-v2.js +++ b/ui/app/send-v2.js @@ -396,14 +396,15 @@ SendTransactionScreen.prototype.renderAmountRow = function () { amount, setMaxModeTo, maxModeOn, + gasTotal, } = this.props return h('div.send-v2__form-row', [ - h('div.send-v2__form-label', [ + h('div.send-v2__form-label', [ 'Amount:', this.renderErrorMessage('amount'), - !errors.amount && h('div.send-v2__amount-max', { + !errors.amount && gasTotal && h('div.send-v2__amount-max', { onClick: (event) => { event.preventDefault() setMaxModeTo(true) -- cgit v1.2.3 From b393b54e35091efd3f49e9eccaf472c91f5bd0d1 Mon Sep 17 00:00:00 2001 From: criw Date: Tue, 6 Mar 2018 04:43:12 +0100 Subject: FIX #3440 improved verification of restore from seed phrase --- old-ui/app/keychains/hd/restore-vault.js | 13 +++++++++++++ ui/app/keychains/hd/restore-vault.js | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/old-ui/app/keychains/hd/restore-vault.js b/old-ui/app/keychains/hd/restore-vault.js index 222172dfd..dcadcccad 100644 --- a/old-ui/app/keychains/hd/restore-vault.js +++ b/old-ui/app/keychains/hd/restore-vault.js @@ -140,6 +140,19 @@ RestoreVaultScreen.prototype.createNewVaultAndRestore = function () { // check seed var seedBox = document.querySelector('textarea.twelve-word-phrase') var seed = seedBox.value.trim() + + // true if the string has more than a space between words. + if (seed.split(' ').length > 1) { + this.warning = 'there can only a space between words' + this.props.dispatch(actions.displayWarning(this.warning)) + return + } + // true if seed contains a character that is not between a-z or a space + if(!seed.match(/^[a-z ]+$/)) { + this.warning = 'seed words only have lowercase characters' + this.props.dispatch(actions.displayWarning(this.warning)) + return + } if (seed.split(' ').length !== 12) { this.warning = 'seed phrases are 12 words long' this.props.dispatch(actions.displayWarning(this.warning)) diff --git a/ui/app/keychains/hd/restore-vault.js b/ui/app/keychains/hd/restore-vault.js index a4ed137f9..c4ba0d8fd 100644 --- a/ui/app/keychains/hd/restore-vault.js +++ b/ui/app/keychains/hd/restore-vault.js @@ -141,6 +141,19 @@ RestoreVaultScreen.prototype.createNewVaultAndRestore = function () { // check seed var seedBox = document.querySelector('textarea.twelve-word-phrase') var seed = seedBox.value.trim() + + // true if the string has more than a space between words. + if (seed.split(' ').length > 1) { + this.warning = 'there can only a space between words' + this.props.dispatch(actions.displayWarning(this.warning)) + return + } + // true if seed contains a character that is not between a-z or a space + if(!seed.match(/^[a-z ]+$/)) { + this.warning = 'seed words only have lowercase characters' + this.props.dispatch(actions.displayWarning(this.warning)) + return + } if (seed.split(' ').length !== 12) { this.warning = 'seed phrases are 12 words long' this.props.dispatch(actions.displayWarning(this.warning)) -- cgit v1.2.3 From 462d57cb6aaeab233bcade5ef1804eeaa290bae2 Mon Sep 17 00:00:00 2001 From: Dan Date: Tue, 6 Mar 2018 00:23:29 -0330 Subject: Gracefully handle null token balance in new ui send. --- ui/app/send-v2.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ui/app/send-v2.js b/ui/app/send-v2.js index 1d67150e3..6ee7c0ca5 100644 --- a/ui/app/send-v2.js +++ b/ui/app/send-v2.js @@ -361,8 +361,9 @@ SendTransactionScreen.prototype.validateAmount = function (value) { }) } + const verifyTokenBalance = selectedToken && tokenBalance !== null let sufficientTokens - if (selectedToken) { + if (verifyTokenBalance) { sufficientTokens = isTokenBalanceSufficient({ tokenBalance, amount, @@ -377,7 +378,7 @@ SendTransactionScreen.prototype.validateAmount = function (value) { if (conversionRate && !sufficientBalance) { amountError = 'Insufficient funds.' - } else if (selectedToken && !sufficientTokens) { + } else if (verifyTokenBalance && !sufficientTokens) { amountError = 'Insufficient tokens.' } else if (amountLessThanZero) { amountError = 'Can not send negative amounts of ETH.' @@ -491,9 +492,12 @@ SendTransactionScreen.prototype.renderFooter = function () { goHome, clearSend, gasTotal, + tokenBalance, + selectedToken, errors: { amount: amountError, to: toError }, } = this.props + const missingTokenBalance = selectedToken && !tokenBalance const noErrors = !amountError && toError === null return h('div.page-container__footer', [ @@ -504,7 +508,7 @@ SendTransactionScreen.prototype.renderFooter = function () { }, }, 'Cancel'), h('button.btn-clear.page-container__footer-button', { - disabled: !noErrors || !gasTotal, + disabled: !noErrors || !gasTotal || missingTokenBalance, onClick: event => this.onSubmit(event), }, 'Next'), ]) -- cgit v1.2.3 From d8038c0de046e7e34f019143eb74238a13a1d69e Mon Sep 17 00:00:00 2001 From: Csaba Solya Date: Tue, 6 Mar 2018 09:23:43 +0100 Subject: add browserify-unibabel to package.json --- package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4d1742d6a..145754d6b 100644 --- a/package.json +++ b/package.json @@ -64,6 +64,7 @@ "boron": "^0.2.3", "browser-passworder": "^2.0.3", "browserify-derequire": "^0.9.4", + "browserify-unibabel": "^3.0.0", "classnames": "^2.2.5", "client-sw-ready-event": "^3.3.0", "clone": "^2.1.1", @@ -78,11 +79,11 @@ "eslint-plugin-react": "^7.4.0", "eth-bin-to-ops": "^1.0.1", "eth-block-tracker": "^2.3.0", + "eth-contract-metadata": "^1.1.5", + "eth-hd-keyring": "^1.2.1", "eth-json-rpc-filters": "^1.2.5", "eth-json-rpc-infura": "^3.0.0", "eth-keyring-controller": "^2.1.4", - "eth-contract-metadata": "^1.1.5", - "eth-hd-keyring": "^1.2.1", "eth-phishing-detect": "^1.1.4", "eth-query": "^2.1.2", "eth-sig-util": "^1.4.2", -- cgit v1.2.3 From 9734969e5d09e73778f18e9842ecb4677589a722 Mon Sep 17 00:00:00 2001 From: Dan J Miller Date: Tue, 6 Mar 2018 10:51:21 -0330 Subject: Add missed changelog updates. (#3407) --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8fc9d2145..fdc7d7155 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,15 @@ ## Current Master +- Allow adding custom tokens to classic ui when balance is 0 +- Allow editing of symbol and decimal info when adding custom token in new-ui +- NewUI shapeshift form can select all coins (not just BTC) + ## 4.1.3 2018-2-28 - Ensure MetaMask's inpage provider is named MetamaskInpageProvider to keep some sites from breaking. - Add retry transaction button back into classic ui. +- Add network dropdown styles to support long custom RPC urls ## 4.1.2 2018-2-28 -- cgit v1.2.3 From 59007a6c36055f9197ad83ccb1741fa186b85f53 Mon Sep 17 00:00:00 2001 From: Csaba Solya Date: Tue, 6 Mar 2018 15:56:27 +0100 Subject: modify verifySeedPhrase to async and call it from addNewAccount also --- app/scripts/metamask-controller.js | 66 ++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index f523e3919..0a5c1d36f 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -345,7 +345,7 @@ module.exports = class MetamaskController extends EventEmitter { // primary HD keyring management addNewAccount: nodeify(this.addNewAccount, this), placeSeedWords: this.placeSeedWords.bind(this), - verifySeedPhrase: this.verifySeedPhrase.bind(this), + verifySeedPhrase: nodeify(this.verifySeedPhrase, this), clearSeedWordCache: this.clearSeedWordCache.bind(this), resetAccount: this.resetAccount.bind(this), importAccountWithStrategy: this.importAccountWithStrategy.bind(this), @@ -567,14 +567,18 @@ module.exports = class MetamaskController extends EventEmitter { // Opinionated Keyring Management // - async addNewAccount (cb) { + async addNewAccount () { const primaryKeyring = this.keyringController.getKeyringsByType('HD Key Tree')[0] - if (!primaryKeyring) return cb(new Error('MetamaskController - No HD Key Tree found')) + if (!primaryKeyring) { + throw new Error('MetamaskController - No HD Key Tree found') + } const keyringController = this.keyringController const oldAccounts = await keyringController.getAccounts() const keyState = await keyringController.addNewAccount(primaryKeyring) const newAccounts = await keyringController.getAccounts() + await this.verifySeedPhrase() + newAccounts.forEach((address) => { if (!oldAccounts.includes(address)) { this.preferencesController.setSelectedAddress(address) @@ -590,44 +594,42 @@ module.exports = class MetamaskController extends EventEmitter { // Also used when revealing the seed words in the confirmation view. placeSeedWords (cb) { - this.verifySeedPhrase((err, seedWords) => { - - if (err) { + this.verifySeedPhrase() + .then((seedWords) => { + this.configManager.setSeedWords(seedWords) + return cb(null, seedWords) + }) + .catch((err) => { return cb(err) - } - this.configManager.setSeedWords(seedWords) - return cb(null, seedWords) - }) + }) } // Verifies the current vault's seed words if they can restore the // accounts belonging to the current vault. // // Called when the first account is created and on unlocking the vault. - verifySeedPhrase (cb) { + async verifySeedPhrase () { const primaryKeyring = this.keyringController.getKeyringsByType('HD Key Tree')[0] - if (!primaryKeyring) return cb(new Error('MetamaskController - No HD Key Tree found')) - primaryKeyring.serialize() - .then((serialized) => { - const seedWords = serialized.mnemonic - - primaryKeyring.getAccounts() - .then((accounts) => { - if (accounts.length < 1) { - return cb(new Error('MetamaskController - No accounts found')) - } - - seedPhraseVerifier.verifyAccounts(accounts, seedWords) - .then(() => { - return cb(null, seedWords) - }) - .catch((err) => { - log.error(err) - return cb(err) - }) - }) - }) + if (!primaryKeyring) { + throw new Error('MetamaskController - No HD Key Tree found') + } + + const serialized = await primaryKeyring.serialize() + const seedWords = serialized.mnemonic + + const accounts = await primaryKeyring.getAccounts() + if (accounts.length < 1) { + throw new Error('MetamaskController - No accounts found') + } + + try { + await seedPhraseVerifier.verifyAccounts(accounts, seedWords) + return seedWords + } catch (err) { + log.error(err.message) + throw err + } } // ClearSeedWordCache -- cgit v1.2.3 From 5f8a632fec0e83b148e4e0b7fc95339fb870d804 Mon Sep 17 00:00:00 2001 From: Alexander Tseung Date: Tue, 6 Mar 2018 09:14:57 -0800 Subject: Fix seed phrase validation clearing form (#3417) * Fix seed phrase validation clearing form * Make new ui import seed error feedback live, and allow newlines with and without carriage returns. --- .../app/first-time/import-seed-phrase-screen.js | 191 ++++++++++++--------- mascara/src/app/first-time/index.css | 16 +- ui/app/app.js | 8 +- ui/app/css/itcss/components/header.scss | 7 +- 4 files changed, 130 insertions(+), 92 deletions(-) diff --git a/mascara/src/app/first-time/import-seed-phrase-screen.js b/mascara/src/app/first-time/import-seed-phrase-screen.js index 93c3f9203..de8d675e1 100644 --- a/mascara/src/app/first-time/import-seed-phrase-screen.js +++ b/mascara/src/app/first-time/import-seed-phrase-screen.js @@ -1,13 +1,12 @@ import React, { Component } from 'react' import PropTypes from 'prop-types' import {connect} from 'react-redux' -import LoadingScreen from './loading-screen' +import classnames from 'classnames' import { createNewVaultAndRestore, hideWarning, displayWarning, unMarkPasswordForgotten, - clearNotices, } from '../../../../ui/app/actions' class ImportSeedPhraseScreen extends Component { @@ -17,8 +16,8 @@ class ImportSeedPhraseScreen extends Component { next: PropTypes.func.isRequired, createNewVaultAndRestore: PropTypes.func.isRequired, hideWarning: PropTypes.func.isRequired, - isLoading: PropTypes.bool.isRequired, displayWarning: PropTypes.func, + leaveImportSeedScreenState: PropTypes.func, }; state = { @@ -27,98 +26,130 @@ class ImportSeedPhraseScreen extends Component { confirmPassword: '', } - onClick = () => { - const { password, seedPhrase, confirmPassword } = this.state - const { createNewVaultAndRestore, next, displayWarning, leaveImportSeedScreenState } = this.props + parseSeedPhrase = (seedPhrase) => { + return seedPhrase + .match(/\w+/g) + .join(' ') + } - if (seedPhrase.split(' ').length !== 12) { - this.warning = 'Seed Phrases are 12 words long' - displayWarning(this.warning) - return - } + onChange = ({ seedPhrase, password, confirmPassword }) => { + const { + password: prevPassword, + confirmPassword: prevConfirmPassword, + } = this.state + const { displayWarning, hideWarning } = this.props + + let warning = null - if (password.length < 8) { - this.warning = 'Passwords require a mimimum length of 8' - displayWarning(this.warning) - return + if (seedPhrase && this.parseSeedPhrase(seedPhrase).split(' ').length !== 12) { + warning = 'Seed Phrases are 12 words long' + } else if (password && password.length < 8) { + warning = 'Passwords require a mimimum length of 8' + } else if ((password || prevPassword) !== (confirmPassword || prevConfirmPassword)) { + warning = 'Confirmed password does not match' } - if (password !== confirmPassword) { - this.warning = 'Confirmed password does not match' - displayWarning(this.warning) - return + if (warning) { + displayWarning(warning) + } else { + hideWarning() } - this.warning = null + + seedPhrase && this.setState({ seedPhrase }) + password && this.setState({ password }) + confirmPassword && this.setState({ confirmPassword }) + } + + onClick = () => { + const { password, seedPhrase } = this.state + const { + createNewVaultAndRestore, + next, + displayWarning, + leaveImportSeedScreenState, + } = this.props + leaveImportSeedScreenState() - createNewVaultAndRestore(password, seedPhrase) + createNewVaultAndRestore(password, this.parseSeedPhrase(seedPhrase)) .then(next) } render () { - return this.props.isLoading - ? - : ( -
- { - e.preventDefault() - this.props.back() - }} - href="#" - > - {`< Back`} - -
- Import an Account with Seed Phrase -
-
- Enter your secret twelve word phrase here to restore your vault. -
-
- -