Merge branch 'develop' into handle-import-account-failure-in-ui
This commit is contained in:
Dan
commit
8f0a3b8311
|
|
@ -2,6 +2,13 @@
|
|||
|
||||
## Current Master
|
||||
|
||||
## 4.7.1 Fri Jun 01 2018
|
||||
|
||||
- Fix bug where errors were not returned to Dapps.
|
||||
|
||||
## 4.7.0 Wed May 30 2018
|
||||
|
||||
- Fix Brave support
|
||||
- Adds error messages when passwords don't match in onboarding flow.
|
||||
- Adds modal notification if a retry in the process of being confirmed is dropped.
|
||||
- New unlock screen design.
|
||||
|
|
|
|||
|
|
@ -27,7 +27,9 @@ If you're a web dapp developer, we've got two types of guides for you:
|
|||
## Building locally
|
||||
|
||||
- Install [Node.js](https://nodejs.org/en/) version 6.3.1 or later.
|
||||
- Install local dependencies with `npm install`.
|
||||
- Install dependencies:
|
||||
- For node versions up to and including 9, install local dependencies with `npm install`.
|
||||
- For node versions 10 and later, install [Yarn](https://yarnpkg.com/lang/en/docs/install/) and use `yarn install`.
|
||||
- Install gulp globally with `npm install -g gulp-cli`.
|
||||
- Build the project to the `./dist/` folder with `gulp build`.
|
||||
- Optionally, to rebuild on file changes, run `gulp dev`.
|
||||
|
|
|
|||
|
|
@ -523,6 +523,9 @@
|
|||
"networks": {
|
||||
"message": "Networks"
|
||||
},
|
||||
"nevermind": {
|
||||
"message": "Nevermind"
|
||||
},
|
||||
"newAccount": {
|
||||
"message": "New Account"
|
||||
},
|
||||
|
|
@ -637,9 +640,15 @@
|
|||
"rejected": {
|
||||
"message": "Rejected"
|
||||
},
|
||||
"reset": {
|
||||
"message": "Reset"
|
||||
},
|
||||
"resetAccount": {
|
||||
"message": "Reset Account"
|
||||
},
|
||||
"resetAccountDescription": {
|
||||
"message": "Resetting your account will clear your transaction history."
|
||||
},
|
||||
"restoreFromSeed": {
|
||||
"message": "Restore account?"
|
||||
},
|
||||
|
|
@ -897,7 +906,7 @@
|
|||
"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."
|
||||
"message": "You are now using the new Metamask UI."
|
||||
},
|
||||
"unapproved": {
|
||||
"message": "Unapproved"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "__MSG_appName__",
|
||||
"short_name": "__MSG_appName__",
|
||||
"version": "4.6.1",
|
||||
"version": "4.7.1",
|
||||
"manifest_version": 2,
|
||||
"author": "https://metamask.io",
|
||||
"description": "__MSG_appDescription__",
|
||||
|
|
@ -68,6 +68,8 @@
|
|||
"matches": [
|
||||
"https://metamask.io/*"
|
||||
],
|
||||
"ids": ["*"]
|
||||
"ids": [
|
||||
"*"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
const MessageManager = require('./lib/message-manager')
|
||||
const PersonalMessageManager = require('./lib/personal-message-manager')
|
||||
const TypedMessageManager = require('./lib/typed-message-manager')
|
||||
|
||||
class UserActionController {
|
||||
|
||||
constructor (opts = {}) {
|
||||
|
||||
this.messageManager = new MessageManager()
|
||||
this.personalMessageManager = new PersonalMessageManager()
|
||||
this.typedMessageManager = new TypedMessageManager()
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
module.exports = UserActionController
|
||||
|
|
@ -59,6 +59,7 @@ function createErrorMiddleware ({ override = true } = {}) {
|
|||
if (!error) { return done() }
|
||||
sanitizeRPCError(error)
|
||||
log.error(`MetaMask - RPC Error: ${error.message}`, error)
|
||||
done()
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ module.exports = {
|
|||
|
||||
function transformState (state) {
|
||||
if (!state.KeyringController || !state.PreferencesController) {
|
||||
return
|
||||
return state
|
||||
}
|
||||
|
||||
if (!state.KeyringController.walletNicknames) {
|
||||
|
|
|
|||
|
|
@ -309,7 +309,7 @@
|
|||
},
|
||||
"@sinonjs/formatio": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz",
|
||||
"resolved": "http://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz",
|
||||
"integrity": "sha512-ls6CAMA6/5gG+O/IdsBcblvnd8qcO/l1TYoNeAzp3wcISOxlPXQEus0mLcdwazEkWjaBdaJ3TaxmNgCLWwvWzg==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
|
|
@ -1500,8 +1500,7 @@
|
|||
},
|
||||
"dependencies": {
|
||||
"bignumber.js": {
|
||||
"version": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2",
|
||||
"from": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2"
|
||||
"version": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2"
|
||||
},
|
||||
"chai": {
|
||||
"version": "3.5.0",
|
||||
|
|
@ -8014,7 +8013,6 @@
|
|||
"dependencies": {
|
||||
"async-eventemitter": {
|
||||
"version": "github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c",
|
||||
"from": "async-eventemitter@github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c",
|
||||
"requires": {
|
||||
"async": "2.6.0"
|
||||
}
|
||||
|
|
@ -8169,26 +8167,28 @@
|
|||
}
|
||||
},
|
||||
"eth-keyring-controller": {
|
||||
"version": "3.1.3",
|
||||
"resolved": "https://registry.npmjs.org/eth-keyring-controller/-/eth-keyring-controller-3.1.3.tgz",
|
||||
"integrity": "sha512-5xzUeT2mq+S2GvTRnvhdZjrasZg+TqeSTH5sZRbDSXgXC9TYobFvEcK6g2wP/RkOQ3dt0xo/6/TWgwiXFfNZjw==",
|
||||
"version": "3.1.4",
|
||||
"resolved": "https://registry.npmjs.org/eth-keyring-controller/-/eth-keyring-controller-3.1.4.tgz",
|
||||
"integrity": "sha512-NNlVB/TBc8p9CblwECjPlUR+7MNQKiBa7tEFxIzZ9MjjNCEYPWDXTm0vJZzuDtVmFxYwIA53UD0QEn0QNxWNEQ==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"bip39": "^2.4.0",
|
||||
"bluebird": "^3.5.0",
|
||||
"browser-passworder": "^2.0.3",
|
||||
"eth-hd-keyring": "^1.2.2",
|
||||
"eth-sig-util": "^1.4.0",
|
||||
"eth-simple-keyring": "^1.2.1",
|
||||
"ethereumjs-util": "^5.1.2",
|
||||
"loglevel": "^1.5.0",
|
||||
"obs-store": "^2.4.1",
|
||||
"promise-filter": "^1.1.0"
|
||||
"bip39": "2.4.0",
|
||||
"bluebird": "3.5.1",
|
||||
"browser-passworder": "2.0.3",
|
||||
"eth-hd-keyring": "1.2.2",
|
||||
"eth-sig-util": "1.4.2",
|
||||
"eth-simple-keyring": "1.2.2",
|
||||
"ethereumjs-util": "5.2.0",
|
||||
"loglevel": "1.6.0",
|
||||
"obs-store": "2.4.1",
|
||||
"promise-filter": "1.1.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"babelify": {
|
||||
"version": "7.3.0",
|
||||
"resolved": "https://registry.npmjs.org/babelify/-/babelify-7.3.0.tgz",
|
||||
"integrity": "sha1-qlau3nBn/XvVSWZu4W3ChQh+iOU=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"babel-core": "^6.0.14",
|
||||
"object-assign": "^4.0.0"
|
||||
|
|
@ -8198,6 +8198,7 @@
|
|||
"version": "5.2.0",
|
||||
"resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz",
|
||||
"integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"bn.js": "^4.11.0",
|
||||
"create-hash": "^1.1.2",
|
||||
|
|
@ -8212,6 +8213,7 @@
|
|||
"version": "2.4.1",
|
||||
"resolved": "https://registry.npmjs.org/obs-store/-/obs-store-2.4.1.tgz",
|
||||
"integrity": "sha512-wpA8G4uSn8cnCKZ0pFTvqsamvy0Sm1hR2ot0Qonbfj5yBMwdAp/eD4vDI+U/ZCbV1hb2V5GapL8YKUdGCvahgg==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"babel-preset-es2015": "^6.22.0",
|
||||
"babelify": "^7.3.0",
|
||||
|
|
@ -8264,7 +8266,6 @@
|
|||
"dependencies": {
|
||||
"ethereumjs-abi": {
|
||||
"version": "git+https://github.com/ethereumjs/ethereumjs-abi.git#4ea2fdfed09e8f99117d9362d17c6b01b64a2bcf",
|
||||
"from": "git+https://github.com/ethereumjs/ethereumjs-abi.git",
|
||||
"requires": {
|
||||
"bn.js": "4.11.8",
|
||||
"ethereumjs-util": "5.1.3"
|
||||
|
|
@ -8287,21 +8288,23 @@
|
|||
}
|
||||
},
|
||||
"eth-simple-keyring": {
|
||||
"version": "1.2.1",
|
||||
"resolved": "https://registry.npmjs.org/eth-simple-keyring/-/eth-simple-keyring-1.2.1.tgz",
|
||||
"integrity": "sha1-bXs1LcWppQINYfafryHvsvY2P0U=",
|
||||
"version": "1.2.2",
|
||||
"resolved": "https://registry.npmjs.org/eth-simple-keyring/-/eth-simple-keyring-1.2.2.tgz",
|
||||
"integrity": "sha512-uQVBYshHUOaXVoat1BpLA/QNMCr4hgdFBgwIB7rRmQ+m3vQQAseUsOM+biPDYzq6end+6LjcccElLpQaIZe6dg==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"eth-sig-util": "^1.4.2",
|
||||
"ethereumjs-util": "^5.1.1",
|
||||
"ethereumjs-wallet": "^0.6.0",
|
||||
"events": "^1.1.1",
|
||||
"xtend": "^4.0.1"
|
||||
"eth-sig-util": "1.4.2",
|
||||
"ethereumjs-util": "5.2.0",
|
||||
"ethereumjs-wallet": "0.6.0",
|
||||
"events": "1.1.1",
|
||||
"xtend": "4.0.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"ethereumjs-util": {
|
||||
"version": "5.2.0",
|
||||
"resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz",
|
||||
"integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"bn.js": "^4.11.0",
|
||||
"create-hash": "^1.1.2",
|
||||
|
|
@ -8496,7 +8499,7 @@
|
|||
"eth-query": "2.1.2",
|
||||
"ethereumjs-block": "1.7.0",
|
||||
"ethereumjs-tx": "1.3.3",
|
||||
"ethereumjs-util": "^5.0.1",
|
||||
"ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
|
||||
"ethereumjs-vm": "2.3.5",
|
||||
"through2": "2.0.3",
|
||||
"treeify": "1.1.0",
|
||||
|
|
@ -8645,7 +8648,7 @@
|
|||
"async": "2.6.0",
|
||||
"ethereum-common": "0.2.0",
|
||||
"ethereumjs-tx": "1.3.3",
|
||||
"ethereumjs-util": "^5.0.0",
|
||||
"ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
|
||||
"merkle-patricia-tree": "2.3.0"
|
||||
}
|
||||
},
|
||||
|
|
@ -8655,7 +8658,7 @@
|
|||
"integrity": "sha1-7OBR0+/b53GtKlGNYWMsoqt17Ls=",
|
||||
"requires": {
|
||||
"ethereum-common": "0.0.18",
|
||||
"ethereumjs-util": "^5.0.0"
|
||||
"ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9"
|
||||
},
|
||||
"dependencies": {
|
||||
"ethereum-common": {
|
||||
|
|
@ -8667,7 +8670,6 @@
|
|||
},
|
||||
"ethereumjs-util": {
|
||||
"version": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
|
||||
"from": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
|
||||
"requires": {
|
||||
"bn.js": "4.11.8",
|
||||
"create-hash": "1.1.3",
|
||||
|
|
@ -9105,7 +9107,7 @@
|
|||
},
|
||||
"event-stream": {
|
||||
"version": "3.3.4",
|
||||
"resolved": "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
|
||||
"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
|
||||
"integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
|
|
@ -11821,7 +11823,6 @@
|
|||
},
|
||||
"gulp": {
|
||||
"version": "github:gulpjs/gulp#71c094a51c7972d26f557899ddecab0210ef3776",
|
||||
"from": "github:gulpjs/gulp#4.0",
|
||||
"requires": {
|
||||
"glob-watcher": "4.0.0",
|
||||
"gulp-cli": "2.0.1",
|
||||
|
|
@ -18204,7 +18205,7 @@
|
|||
"integrity": "sha512-LKd2OoIT9Re/OG38zXbd5pyHIk2IfcOUczCwkYXl5iJIbufg9nqpweh66VfPwMkUlrEvc7YVvtQdmSrB9V9TkQ==",
|
||||
"requires": {
|
||||
"async": "1.5.2",
|
||||
"ethereumjs-util": "^5.0.0",
|
||||
"ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9",
|
||||
"level-ws": "0.0.0",
|
||||
"levelup": "1.3.9",
|
||||
"memdown": "1.4.1",
|
||||
|
|
@ -31226,8 +31227,7 @@
|
|||
},
|
||||
"dependencies": {
|
||||
"bignumber.js": {
|
||||
"version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934",
|
||||
"from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git"
|
||||
"version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -31708,7 +31708,6 @@
|
|||
},
|
||||
"websocket": {
|
||||
"version": "git://github.com/frozeman/WebSocket-Node.git#7004c39c42ac98875ab61126e5b4a925430f592c",
|
||||
"from": "websocket@git://github.com/frozeman/WebSocket-Node.git#7004c39c42ac98875ab61126e5b4a925430f592c",
|
||||
"requires": {
|
||||
"debug": "2.6.9",
|
||||
"nan": "2.8.0",
|
||||
|
|
|
|||
|
|
@ -98,7 +98,6 @@
|
|||
"eth-hd-keyring": "^1.2.1",
|
||||
"eth-json-rpc-filters": "^1.2.6",
|
||||
"eth-json-rpc-infura": "^3.0.0",
|
||||
"eth-keyring-controller": "^3.1.3",
|
||||
"eth-phishing-detect": "^1.1.4",
|
||||
"eth-query": "^2.1.2",
|
||||
"eth-sig-util": "^1.4.2",
|
||||
|
|
@ -230,6 +229,7 @@
|
|||
"eslint-plugin-mocha": "^5.0.0",
|
||||
"eslint-plugin-react": "^7.4.0",
|
||||
"eth-json-rpc-middleware": "^1.6.0",
|
||||
"eth-keyring-controller": "^3.1.4",
|
||||
"file-loader": "^1.1.11",
|
||||
"fs-promise": "^2.0.3",
|
||||
"ganache-cli": "^6.1.0",
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ async function runAddTokenFlowTest (assert, done) {
|
|||
assert.equal(addTokenTitle[0].textContent, 'Add Tokens', 'add token title is correct')
|
||||
|
||||
// Cancel Add Token
|
||||
const cancelAddTokenButton = await queryAsync($, 'button.btn-secondary--lg.page-container__footer-button')
|
||||
const cancelAddTokenButton = await queryAsync($, 'button.btn-default.btn--large.page-container__footer-button')
|
||||
assert.ok(cancelAddTokenButton[0], 'cancel add token button present')
|
||||
cancelAddTokenButton.click()
|
||||
|
||||
|
|
@ -75,15 +75,15 @@ async function runAddTokenFlowTest (assert, done) {
|
|||
tokenWrapper[0].click()
|
||||
|
||||
// Click Next button
|
||||
let nextButton = await queryAsync($, 'button.btn-primary--lg')
|
||||
let nextButton = await queryAsync($, 'button.btn-primary.btn--large')
|
||||
assert.equal(nextButton[0].textContent, 'Next', 'next button rendered')
|
||||
nextButton[0].click()
|
||||
|
||||
// Confirm Add token
|
||||
const confirmAddToken = await queryAsync($, '.confirm-add-token')
|
||||
assert.ok(confirmAddToken[0], 'confirm add token rendered')
|
||||
assert.ok($('button.btn-primary--lg')[0], 'confirm add token button found')
|
||||
$('button.btn-primary--lg')[0].click()
|
||||
assert.ok($('button.btn-primary.btn--large')[0], 'confirm add token button found')
|
||||
$('button.btn-primary.btn--large')[0].click()
|
||||
|
||||
// Verify added token image
|
||||
let heroBalance = await queryAsync($, '.hero-balance')
|
||||
|
|
@ -120,7 +120,7 @@ async function runAddTokenFlowTest (assert, done) {
|
|||
const errorMessage = await queryAsync($, '#custom-symbol-helper-text')
|
||||
assert.ok(errorMessage[0], 'error rendered')
|
||||
|
||||
$('button.btn-secondary--lg')[0].click()
|
||||
$('button.btn-default.btn--large')[0].click()
|
||||
|
||||
// await timeout(100000)
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ async function runConfirmSigRequestsTest(assert, done) {
|
|||
let confirmSigRowValue = await queryAsync($, '.request-signature__row-value')
|
||||
assert.equal(confirmSigRowValue[0].textContent, '0x879a053d4800c6354e76c7985a865d2922c82fb5b3f4577b2fe08b998954f2e0')
|
||||
|
||||
let confirmSigSignButton = await queryAsync($, 'button.btn-primary--lg')
|
||||
let confirmSigSignButton = await queryAsync($, 'button.btn-primary.btn--large')
|
||||
confirmSigSignButton[0].click()
|
||||
|
||||
confirmSigHeadline = await queryAsync($, '.request-signature__headline')
|
||||
|
|
@ -47,7 +47,7 @@ async function runConfirmSigRequestsTest(assert, done) {
|
|||
confirmSigRowValue = await queryAsync($, '.request-signature__row-value')
|
||||
assert.ok(confirmSigRowValue[0].textContent.match(/^\#\sTerms\sof\sUse/))
|
||||
|
||||
confirmSigSignButton = await queryAsync($, 'button.btn-primary--lg')
|
||||
confirmSigSignButton = await queryAsync($, 'button.btn-primary.btn--large')
|
||||
confirmSigSignButton[0].click()
|
||||
|
||||
confirmSigHeadline = await queryAsync($, '.request-signature__headline')
|
||||
|
|
@ -57,7 +57,7 @@ async function runConfirmSigRequestsTest(assert, done) {
|
|||
assert.equal(confirmSigRowValue[0].textContent, 'Hi, Alice!')
|
||||
assert.equal(confirmSigRowValue[1].textContent, '1337')
|
||||
|
||||
confirmSigSignButton = await queryAsync($, 'button.btn-primary--lg')
|
||||
confirmSigSignButton = await queryAsync($, 'button.btn-primary.btn--large')
|
||||
confirmSigSignButton[0].click()
|
||||
|
||||
const txView = await queryAsync($, '.tx-view')
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ async function runSendFlowTest(assert, done) {
|
|||
await customizeGas(assert, 0, 21000, '0', '$0.00 USD')
|
||||
await customizeGas(assert, 500, 60000, '0.003', '$3.60 USD')
|
||||
|
||||
const sendButton = await queryAsync($, 'button.btn-primary--lg.page-container__footer-button')
|
||||
const sendButton = await queryAsync($, 'button.btn-primary.btn--large.page-container__footer-button')
|
||||
assert.equal(sendButton[0].textContent, 'Next', 'next button rendered')
|
||||
sendButton[0].click()
|
||||
await timeout()
|
||||
|
|
@ -169,13 +169,13 @@ async function runSendFlowTest(assert, done) {
|
|||
sendAmountFieldInputInEdit.val('1.0')
|
||||
reactTriggerChange(sendAmountFieldInputInEdit[0])
|
||||
|
||||
const sendButtonInEdit = await queryAsync($, '.btn-primary--lg.page-container__footer-button')
|
||||
const sendButtonInEdit = await queryAsync($, '.btn-primary.btn--large.page-container__footer-button')
|
||||
assert.equal(sendButtonInEdit[0].textContent, 'Next', 'next button in edit rendered')
|
||||
|
||||
selectState.val('send new ui')
|
||||
reactTriggerChange(selectState[0])
|
||||
|
||||
const cancelButtonInEdit = await queryAsync($, '.btn-secondary--lg.page-container__footer-button')
|
||||
const cancelButtonInEdit = await queryAsync($, '.btn-default.btn--large.page-container__footer-button')
|
||||
cancelButtonInEdit[0].click()
|
||||
// sendButtonInEdit[0].click()
|
||||
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@ async function captureAllScreens() {
|
|||
await delay(300)
|
||||
await captureLanguageScreenShots('metamask account detail export private key screen - password entered')
|
||||
|
||||
await driver.findElement(By.css('.btn-primary--lg.export-private-key__button')).click()
|
||||
await driver.findElement(By.css('.btn-primary.btn--large.export-private-key__button')).click()
|
||||
await delay(300)
|
||||
await captureLanguageScreenShots('metamask account detail export private key screen - reveal key')
|
||||
|
||||
|
|
|
|||
|
|
@ -503,17 +503,23 @@ function requestRevealSeedWords (password) {
|
|||
}
|
||||
|
||||
function resetAccount () {
|
||||
return (dispatch) => {
|
||||
background.resetAccount((err, account) => {
|
||||
dispatch(actions.hideLoadingIndication())
|
||||
if (err) {
|
||||
dispatch(actions.displayWarning(err.message))
|
||||
}
|
||||
return dispatch => {
|
||||
dispatch(actions.showLoadingIndication())
|
||||
|
||||
log.info('Transaction history reset for ' + account)
|
||||
dispatch(actions.showAccountsPage())
|
||||
})
|
||||
}
|
||||
return new Promise((resolve, reject) => {
|
||||
background.resetAccount((err, account) => {
|
||||
dispatch(actions.hideLoadingIndication())
|
||||
if (err) {
|
||||
dispatch(actions.displayWarning(err.message))
|
||||
return reject(err)
|
||||
}
|
||||
|
||||
log.info('Transaction history reset for ' + account)
|
||||
dispatch(actions.showAccountsPage())
|
||||
resolve(account)
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
function addNewKeyring (type, opts) {
|
||||
|
|
|
|||
|
|
@ -2,20 +2,15 @@ import React, { Component } from 'react'
|
|||
import PropTypes from 'prop-types'
|
||||
import classnames from 'classnames'
|
||||
|
||||
const SECONDARY = 'secondary'
|
||||
const CLASSNAME_DEFAULT = 'btn-default'
|
||||
const CLASSNAME_PRIMARY = 'btn-primary'
|
||||
const CLASSNAME_PRIMARY_LARGE = 'btn-primary--lg'
|
||||
const CLASSNAME_SECONDARY = 'btn-secondary'
|
||||
const CLASSNAME_SECONDARY_LARGE = 'btn-secondary--lg'
|
||||
const CLASSNAME_LARGE = 'btn--large'
|
||||
|
||||
const getClassName = (type, large = false) => {
|
||||
let output = type === SECONDARY ? CLASSNAME_SECONDARY : CLASSNAME_PRIMARY
|
||||
|
||||
if (large) {
|
||||
output += ` ${type === SECONDARY ? CLASSNAME_SECONDARY_LARGE : CLASSNAME_PRIMARY_LARGE}`
|
||||
}
|
||||
|
||||
return output
|
||||
const typeHash = {
|
||||
default: CLASSNAME_DEFAULT,
|
||||
primary: CLASSNAME_PRIMARY,
|
||||
secondary: CLASSNAME_SECONDARY,
|
||||
}
|
||||
|
||||
class Button extends Component {
|
||||
|
|
@ -24,7 +19,11 @@ class Button extends Component {
|
|||
|
||||
return (
|
||||
<button
|
||||
className={classnames(getClassName(type, large), className)}
|
||||
className={classnames(
|
||||
typeHash[type],
|
||||
large && CLASSNAME_LARGE,
|
||||
className
|
||||
)}
|
||||
{ ...buttonProps }
|
||||
>
|
||||
{ this.props.children }
|
||||
|
|
|
|||
|
|
@ -13,13 +13,21 @@ storiesOf('Button', module)
|
|||
{text('text', 'Click me')}
|
||||
</Button>
|
||||
)
|
||||
.add('secondary', () => (
|
||||
.add('secondary', () =>
|
||||
<Button
|
||||
onClick={action('clicked')}
|
||||
type="secondary"
|
||||
>
|
||||
{text('text', 'Click me')}
|
||||
</Button>
|
||||
)
|
||||
.add('default', () => (
|
||||
<Button
|
||||
onClick={action('clicked')}
|
||||
type="default"
|
||||
>
|
||||
{text('text', 'Click me')}
|
||||
</Button>
|
||||
))
|
||||
.add('large primary', () => (
|
||||
<Button
|
||||
|
|
@ -39,3 +47,12 @@ storiesOf('Button', module)
|
|||
{text('text', 'Click me')}
|
||||
</Button>
|
||||
))
|
||||
.add('large default', () => (
|
||||
<Button
|
||||
onClick={action('clicked')}
|
||||
type="default"
|
||||
large
|
||||
>
|
||||
{text('text', 'Click me')}
|
||||
</Button>
|
||||
))
|
||||
|
|
|
|||
|
|
@ -308,7 +308,7 @@ CustomizeGasModal.prototype.render = function () {
|
|||
}, [this.context.t('revert')]),
|
||||
|
||||
h('div.send-v2__customize-gas__buttons', [
|
||||
h('button.btn-secondary.send-v2__customize-gas__cancel', {
|
||||
h('button.btn-default.send-v2__customize-gas__cancel', {
|
||||
onClick: this.props.hideModal,
|
||||
style: {
|
||||
marginRight: '10px',
|
||||
|
|
|
|||
|
|
@ -0,0 +1,54 @@
|
|||
import React, { Component } from 'react'
|
||||
import PropTypes from 'prop-types'
|
||||
import Button from '../../button'
|
||||
|
||||
class ConfirmResetAccount extends Component {
|
||||
static propTypes = {
|
||||
hideModal: PropTypes.func.isRequired,
|
||||
resetAccount: PropTypes.func.isRequired,
|
||||
}
|
||||
|
||||
static contextTypes = {
|
||||
t: PropTypes.func,
|
||||
}
|
||||
|
||||
handleReset () {
|
||||
this.props.resetAccount()
|
||||
.then(() => this.props.hideModal())
|
||||
}
|
||||
|
||||
render () {
|
||||
const { t } = this.context
|
||||
|
||||
return (
|
||||
<div className="modal-container">
|
||||
<div className="modal-container__content">
|
||||
<div className="modal-container__title">
|
||||
{ `${t('resetAccount')}?` }
|
||||
</div>
|
||||
<div className="modal-container__description">
|
||||
{ t('resetAccountDescription') }
|
||||
</div>
|
||||
</div>
|
||||
<div className="modal-container__footer">
|
||||
<Button
|
||||
type="default"
|
||||
className="modal-container__footer-button"
|
||||
onClick={() => this.props.hideModal()}
|
||||
>
|
||||
{ t('nevermind') }
|
||||
</Button>
|
||||
<Button
|
||||
type="secondary"
|
||||
className="modal-container__footer-button"
|
||||
onClick={() => this.handleReset()}
|
||||
>
|
||||
{ t('reset') }
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
export default ConfirmResetAccount
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
import { connect } from 'react-redux'
|
||||
import ConfirmResetAccount from './confirm-reset-account.component'
|
||||
|
||||
const { hideModal, resetAccount } = require('../../../actions')
|
||||
|
||||
const mapDispatchToProps = dispatch => {
|
||||
return {
|
||||
hideModal: () => dispatch(hideModal()),
|
||||
resetAccount: () => dispatch(resetAccount()),
|
||||
}
|
||||
}
|
||||
|
||||
export default connect(null, mapDispatchToProps)(ConfirmResetAccount)
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
import ConfirmResetAccount from './confirm-reset-account.container'
|
||||
module.exports = ConfirmResetAccount
|
||||
|
|
@ -109,7 +109,7 @@ DepositEtherModal.prototype.renderRow = function ({
|
|||
]),
|
||||
|
||||
!hideButton && h('div.deposit-ether-modal__buy-row__button', [
|
||||
h('button.btn-primary--lg.deposit-ether-modal__deposit-button', {
|
||||
h('button.btn-primary.btn--large.deposit-ether-modal__deposit-button', {
|
||||
onClick: onButtonClick,
|
||||
}, [buttonLabel]),
|
||||
]),
|
||||
|
|
|
|||
|
|
@ -87,14 +87,14 @@ ExportPrivateKeyModal.prototype.renderButton = function (className, onClick, lab
|
|||
ExportPrivateKeyModal.prototype.renderButtons = function (privateKey, password, address, hideModal) {
|
||||
return h('div.export-private-key-buttons', {}, [
|
||||
!privateKey && this.renderButton(
|
||||
'btn-secondary--lg export-private-key__button export-private-key__button--cancel',
|
||||
'btn-default btn--large export-private-key__button export-private-key__button--cancel',
|
||||
() => hideModal(),
|
||||
'Cancel'
|
||||
),
|
||||
|
||||
(privateKey
|
||||
? this.renderButton('btn-primary--lg export-private-key__button', () => hideModal(), this.context.t('done'))
|
||||
: this.renderButton('btn-primary--lg export-private-key__button', () => this.exportAccountAndGetPrivateKey(this.state.password, address), this.context.t('confirm'))
|
||||
? this.renderButton('btn-primary btn--large export-private-key__button', () => hideModal(), this.context.t('done'))
|
||||
: this.renderButton('btn-primary btn--large export-private-key__button', () => this.exportAccountAndGetPrivateKey(this.state.password, address), this.context.t('confirm'))
|
||||
),
|
||||
|
||||
])
|
||||
|
|
|
|||
|
|
@ -1 +1,52 @@
|
|||
@import './transaction-confirmed/index';
|
||||
.modal-container {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background-color: #fff;
|
||||
display: flex;
|
||||
flex-flow: column;
|
||||
border-radius: 8px;
|
||||
|
||||
&__title {
|
||||
font-size: 1.5rem;
|
||||
font-weight: 500;
|
||||
padding: 16px 0;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
&__description {
|
||||
text-align: center;
|
||||
font-size: .875rem;
|
||||
}
|
||||
|
||||
&__content {
|
||||
overflow-y: auto;
|
||||
flex: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
padding: 32px;
|
||||
|
||||
@media screen and (max-width: 575px) {
|
||||
justify-content: center;
|
||||
padding: 28px 20px;
|
||||
}
|
||||
}
|
||||
|
||||
&__footer {
|
||||
display: flex;
|
||||
flex-flow: row;
|
||||
justify-content: center;
|
||||
border-top: 1px solid #d2d8dd;
|
||||
padding: 16px;
|
||||
flex: 0 0 auto;
|
||||
|
||||
&-button {
|
||||
min-width: 0;
|
||||
margin-right: 16px;
|
||||
|
||||
&:last-of-type {
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,8 +19,30 @@ 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 ConfirmResetAccount = require('./confirm-reset-account')
|
||||
const TransactionConfirmed = require('./transaction-confirmed')
|
||||
const WelcomeBeta = require('./welcome-beta')
|
||||
const Notification = require('./notification')
|
||||
|
||||
const modalContainerBaseStyle = {
|
||||
transform: 'translate3d(-50%, 0, 0px)',
|
||||
border: '1px solid #CCCFD1',
|
||||
borderRadius: '8px',
|
||||
backgroundColor: '#FFFFFF',
|
||||
boxShadow: '0 2px 22px 0 rgba(0,0,0,0.2)',
|
||||
}
|
||||
|
||||
const modalContainerLaptopStyle = {
|
||||
...modalContainerBaseStyle,
|
||||
width: '344px',
|
||||
top: '15%',
|
||||
}
|
||||
|
||||
const modalContainerMobileStyle = {
|
||||
...modalContainerBaseStyle,
|
||||
width: '309px',
|
||||
top: '12.5%',
|
||||
}
|
||||
|
||||
const accountModalStyle = {
|
||||
mobileModalStyle: {
|
||||
|
|
@ -174,18 +196,18 @@ const MODALS = {
|
|||
|
||||
BETA_UI_NOTIFICATION_MODAL: {
|
||||
contents: [
|
||||
h(NotifcationModal, {
|
||||
header: 'uiWelcome',
|
||||
message: 'uiWelcomeMessage',
|
||||
}),
|
||||
h(Notification, [
|
||||
h(WelcomeBeta),
|
||||
]),
|
||||
],
|
||||
mobileModalStyle: {
|
||||
width: '95%',
|
||||
top: getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_POPUP ? '52vh' : '36.5vh',
|
||||
...modalContainerMobileStyle,
|
||||
},
|
||||
laptopModalStyle: {
|
||||
width: '449px',
|
||||
top: 'calc(33% + 45px)',
|
||||
...modalContainerLaptopStyle,
|
||||
},
|
||||
contentStyle: {
|
||||
borderRadius: '8px',
|
||||
},
|
||||
},
|
||||
|
||||
|
|
@ -209,12 +231,13 @@ const MODALS = {
|
|||
CONFIRM_RESET_ACCOUNT: {
|
||||
contents: h(ConfirmResetAccount),
|
||||
mobileModalStyle: {
|
||||
width: '95%',
|
||||
top: getEnvironmentType(window.location.href) === ENVIRONMENT_TYPE_POPUP ? '52vh' : '36.5vh',
|
||||
...modalContainerMobileStyle,
|
||||
},
|
||||
laptopModalStyle: {
|
||||
width: '473px',
|
||||
top: 'calc(33% + 45px)',
|
||||
...modalContainerLaptopStyle,
|
||||
},
|
||||
contentStyle: {
|
||||
borderRadius: '8px',
|
||||
},
|
||||
},
|
||||
|
||||
|
|
@ -269,31 +292,18 @@ const MODALS = {
|
|||
TRANSACTION_CONFIRMED: {
|
||||
disableBackdropClick: true,
|
||||
contents: [
|
||||
h(TransactionConfirmed, {}, []),
|
||||
h(Notification, [
|
||||
h(TransactionConfirmed),
|
||||
]),
|
||||
],
|
||||
mobileModalStyle: {
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
transform: 'none',
|
||||
left: '0',
|
||||
right: '0',
|
||||
margin: '0 auto',
|
||||
boxShadow: '0 0 7px 0 rgba(0,0,0,0.08)',
|
||||
top: '0',
|
||||
display: 'flex',
|
||||
...modalContainerMobileStyle,
|
||||
},
|
||||
laptopModalStyle: {
|
||||
width: '344px',
|
||||
transform: 'translate3d(-50%, 0, 0px)',
|
||||
top: '15%',
|
||||
border: '1px solid #CCCFD1',
|
||||
borderRadius: '8px',
|
||||
backgroundColor: '#FFFFFF',
|
||||
boxShadow: '0 2px 22px 0 rgba(0,0,0,0.2)',
|
||||
...modalContainerLaptopStyle,
|
||||
},
|
||||
contentStyle: {
|
||||
borderRadius: '8px',
|
||||
height: '100%',
|
||||
},
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
const { Component } = require('react')
|
||||
const PropTypes = require('prop-types')
|
||||
const h = require('react-hyperscript')
|
||||
const connect = require('react-redux').connect
|
||||
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)
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
import Notification from './notification.container'
|
||||
module.exports = Notification
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
import React from 'react'
|
||||
import PropTypes from 'prop-types'
|
||||
import Button from '../../button'
|
||||
|
||||
const Notification = (props, context) => {
|
||||
return (
|
||||
<div className="modal-container">
|
||||
{ props.children }
|
||||
<div className="modal-container__footer">
|
||||
<Button
|
||||
type="primary"
|
||||
onClick={() => props.onHide()}
|
||||
>
|
||||
{ context.t('ok') }
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
Notification.propTypes = {
|
||||
onHide: PropTypes.func.isRequired,
|
||||
children: PropTypes.element,
|
||||
}
|
||||
|
||||
Notification.contextTypes = {
|
||||
t: PropTypes.func,
|
||||
}
|
||||
|
||||
export default Notification
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
import { connect } from 'react-redux'
|
||||
import Notification from './notification.component'
|
||||
|
||||
const { hideModal } = require('../../../actions')
|
||||
|
||||
const mapStateToProps = state => {
|
||||
const { appState: { modal: { modalState: { props } } } } = state
|
||||
const { onHide } = props
|
||||
return {
|
||||
onHide,
|
||||
}
|
||||
}
|
||||
|
||||
const mapDispatchToProps = dispatch => {
|
||||
return {
|
||||
hideModal: () => dispatch(hideModal()),
|
||||
}
|
||||
}
|
||||
|
||||
const mergeProps = (stateProps, dispatchProps, ownProps) => {
|
||||
const { onHide, ...otherStateProps } = stateProps
|
||||
const { hideModal, ...otherDispatchProps } = dispatchProps
|
||||
|
||||
return {
|
||||
...otherStateProps,
|
||||
...otherDispatchProps,
|
||||
...ownProps,
|
||||
onHide: () => {
|
||||
hideModal()
|
||||
|
||||
if (onHide && typeof onHide === 'function') {
|
||||
onHide()
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
export default connect(mapStateToProps, mapDispatchToProps, mergeProps)(Notification)
|
||||
|
|
@ -1,2 +1,2 @@
|
|||
import TransactionConfirmed from './transaction-confirmed.container'
|
||||
import TransactionConfirmed from './transaction-confirmed.component'
|
||||
module.exports = TransactionConfirmed
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
.transaction-confirmed {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
padding: 32px;
|
||||
|
||||
&__title {
|
||||
font-size: 2rem;
|
||||
padding: 16px 0;
|
||||
}
|
||||
|
||||
&__description {
|
||||
text-align: center;
|
||||
font-size: .875rem;
|
||||
line-height: 1.5rem;
|
||||
}
|
||||
|
||||
@media screen and (max-width: 575px) {
|
||||
justify-content: center;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,42 +1,20 @@
|
|||
import React, { Component } from 'react'
|
||||
import React from 'react'
|
||||
import PropTypes from 'prop-types'
|
||||
import Button from '../../button'
|
||||
|
||||
class TransactionConfirmed extends Component {
|
||||
render () {
|
||||
const { t } = this.context
|
||||
const TransactionConfirmed = (props, context) => {
|
||||
const { t } = context
|
||||
|
||||
return (
|
||||
<div className="page-container page-container--full-width page-container--full-height">
|
||||
<div className="page-container__content transaction-confirmed">
|
||||
<img src="images/check-icon.svg" />
|
||||
<div className="transaction-confirmed__title">
|
||||
{ `${t('confirmed')}!` }
|
||||
</div>
|
||||
<div className="transaction-confirmed__description">
|
||||
{ t('initialTransactionConfirmed') }
|
||||
</div>
|
||||
</div>
|
||||
<div className="page-container__footer">
|
||||
<Button
|
||||
type="primary"
|
||||
className="page-container__footer-button"
|
||||
onClick={() => {
|
||||
this.props.hideModal()
|
||||
this.props.onHide()
|
||||
}}
|
||||
>
|
||||
{ t('ok') }
|
||||
</Button>
|
||||
</div>
|
||||
return (
|
||||
<div className="modal-container__content">
|
||||
<img src="images/check-icon.svg" />
|
||||
<div className="modal-container__title">
|
||||
{ `${t('confirmed')}!` }
|
||||
</div>
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
TransactionConfirmed.propTypes = {
|
||||
hideModal: PropTypes.func.isRequired,
|
||||
onHide: PropTypes.func.isRequired,
|
||||
<div className="modal-container__description">
|
||||
{ t('initialTransactionConfirmed') }
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
TransactionConfirmed.contextTypes = {
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
import { connect } from 'react-redux'
|
||||
import TransactionConfirmed from './transaction-confirmed.component'
|
||||
|
||||
const { hideModal } = require('../../../actions')
|
||||
|
||||
const mapStateToProps = state => {
|
||||
const { appState: { modal: { modalState: { props } } } } = state
|
||||
const { onHide } = props
|
||||
return {
|
||||
onHide,
|
||||
}
|
||||
}
|
||||
|
||||
const mapDispatchToProps = dispatch => {
|
||||
return {
|
||||
hideModal: () => dispatch(hideModal()),
|
||||
}
|
||||
}
|
||||
|
||||
export default connect(mapStateToProps, mapDispatchToProps)(TransactionConfirmed)
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
import WelcomeBeta from './welcome-beta.component'
|
||||
module.exports = WelcomeBeta
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
import React from 'react'
|
||||
import PropTypes from 'prop-types'
|
||||
|
||||
const TransactionConfirmed = (props, context) => {
|
||||
const { t } = context
|
||||
|
||||
return (
|
||||
<div className="modal-container__content">
|
||||
<div className="modal-container__title">
|
||||
{ `${t('uiWelcome')}` }
|
||||
</div>
|
||||
<div className="modal-container__description">
|
||||
{ t('uiWelcomeMessage') }
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
TransactionConfirmed.contextTypes = {
|
||||
t: PropTypes.func,
|
||||
}
|
||||
|
||||
export default TransactionConfirmed
|
||||
|
|
@ -323,7 +323,7 @@ class AddToken extends Component {
|
|||
</div>
|
||||
<div className="page-container__footer">
|
||||
<Button
|
||||
type="secondary"
|
||||
type="default"
|
||||
large
|
||||
className="page-container__footer-button"
|
||||
onClick={() => {
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ export default class TokenListPlaceholder extends Component {
|
|||
</div>
|
||||
<a
|
||||
className="token-list-placeholder__link"
|
||||
href="http://metamask.helpscoutdocs.com/article/16-managing-erc20-tokens"
|
||||
href="https://consensys.zendesk.com/hc/en-us/articles/360004135092"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
>
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ export default class ConfirmAddToken extends Component {
|
|||
</div>
|
||||
<div className="page-container__footer">
|
||||
<Button
|
||||
type="secondary"
|
||||
type="default"
|
||||
large
|
||||
className="page-container__footer-button"
|
||||
onClick={() => history.push(ADD_TOKEN_ROUTE)}
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ AccountImportSubview.prototype.render = function () {
|
|||
},
|
||||
onClick: () => {
|
||||
global.platform.openWindow({
|
||||
url: 'https://metamask.helpscoutdocs.com/article/17-what-are-loose-accounts',
|
||||
url: 'https://consensys.zendesk.com/hc/en-us/articles/360004180111-What-are-imported-accounts-New-UI',
|
||||
})
|
||||
},
|
||||
}, this.context.t('here')),
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ class JsonImportSubview extends Component {
|
|||
|
||||
h('div.new-account-create-form__buttons', {}, [
|
||||
|
||||
h('button.btn-secondary.new-account-create-form__button', {
|
||||
h('button.btn-default.new-account-create-form__button', {
|
||||
onClick: () => this.props.history.push(DEFAULT_ROUTE),
|
||||
}, [
|
||||
this.context.t('cancel'),
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ PrivateKeyImportView.prototype.render = function () {
|
|||
|
||||
h('div.new-account-import-form__buttons', {}, [
|
||||
|
||||
h('button.btn-secondary--lg.new-account-create-form__button', {
|
||||
h('button.btn-default.btn--large.new-account-create-form__button', {
|
||||
onClick: () => {
|
||||
displayWarning(null)
|
||||
this.props.history.push(DEFAULT_ROUTE)
|
||||
|
|
@ -70,7 +70,7 @@ PrivateKeyImportView.prototype.render = function () {
|
|||
this.context.t('cancel'),
|
||||
]),
|
||||
|
||||
h('button.btn-primary--lg.new-account-create-form__button', {
|
||||
h('button.btn-primary.btn--large.new-account-create-form__button', {
|
||||
onClick: () => this.createNewKeychain(),
|
||||
}, [
|
||||
this.context.t('import'),
|
||||
|
|
|
|||
|
|
@ -38,13 +38,13 @@ class NewAccountCreateForm extends Component {
|
|||
|
||||
h('div.new-account-create-form__buttons', {}, [
|
||||
|
||||
h('button.btn-secondary--lg.new-account-create-form__button', {
|
||||
h('button.btn-default.btn--large.new-account-create-form__button', {
|
||||
onClick: () => history.push(DEFAULT_ROUTE),
|
||||
}, [
|
||||
this.context.t('cancel'),
|
||||
]),
|
||||
|
||||
h('button.btn-primary--lg.new-account-create-form__button', {
|
||||
h('button.btn-primary.btn--large.new-account-create-form__button', {
|
||||
onClick: () => {
|
||||
createAccount(newAccountName || defaultAccountName)
|
||||
.then(() => history.push(DEFAULT_ROUTE))
|
||||
|
|
|
|||
|
|
@ -106,10 +106,10 @@ class RevealSeedPage extends Component {
|
|||
renderPasswordPromptFooter () {
|
||||
return (
|
||||
h('.page-container__footer', [
|
||||
h('button.btn-secondary--lg.page-container__footer-button', {
|
||||
h('button.btn-default.btn--large.page-container__footer-button', {
|
||||
onClick: () => this.props.history.push(DEFAULT_ROUTE),
|
||||
}, this.context.t('cancel')),
|
||||
h('button.btn-primary--lg.page-container__footer-button', {
|
||||
h('button.btn-primary.btn--large.page-container__footer-button', {
|
||||
onClick: event => this.handleSubmit(event),
|
||||
disabled: this.state.password === '',
|
||||
}, this.context.t('next')),
|
||||
|
|
@ -120,7 +120,7 @@ class RevealSeedPage extends Component {
|
|||
renderRevealSeedFooter () {
|
||||
return (
|
||||
h('.page-container__footer', [
|
||||
h('button.btn-secondary--lg.page-container__footer-button', {
|
||||
h('button.btn-default.btn--large.page-container__footer-button', {
|
||||
onClick: () => this.props.history.push(DEFAULT_ROUTE),
|
||||
}, this.context.t('close')),
|
||||
])
|
||||
|
|
|
|||
|
|
@ -217,7 +217,7 @@ class Settings extends Component {
|
|||
]),
|
||||
h('div.settings__content-item', [
|
||||
h('div.settings__content-item-col', [
|
||||
h('button.btn-primary--lg.settings__button', {
|
||||
h('button.btn-primary.btn--large.settings__button', {
|
||||
onClick (event) {
|
||||
window.logStateString((err, result) => {
|
||||
if (err) {
|
||||
|
|
@ -242,7 +242,7 @@ class Settings extends Component {
|
|||
h('div.settings__content-item', this.context.t('revealSeedWords')),
|
||||
h('div.settings__content-item', [
|
||||
h('div.settings__content-item-col', [
|
||||
h('button.btn-primary--lg.settings__button--red', {
|
||||
h('button.btn-primary.btn--large.settings__button--red', {
|
||||
onClick: event => {
|
||||
event.preventDefault()
|
||||
history.push(REVEAL_SEED_ROUTE)
|
||||
|
|
@ -262,7 +262,7 @@ class Settings extends Component {
|
|||
h('div.settings__content-item', this.context.t('useOldUI')),
|
||||
h('div.settings__content-item', [
|
||||
h('div.settings__content-item-col', [
|
||||
h('button.btn-primary--lg.settings__button--orange', {
|
||||
h('button.btn-primary.btn--large.settings__button--orange', {
|
||||
onClick (event) {
|
||||
event.preventDefault()
|
||||
setFeatureFlagToBeta()
|
||||
|
|
@ -281,7 +281,7 @@ class Settings extends Component {
|
|||
h('div.settings__content-item', this.context.t('resetAccount')),
|
||||
h('div.settings__content-item', [
|
||||
h('div.settings__content-item-col', [
|
||||
h('button.btn-primary--lg.settings__button--orange', {
|
||||
h('button.btn-primary.btn--large.settings__button--orange', {
|
||||
onClick (event) {
|
||||
event.preventDefault()
|
||||
showResetAccountConfirmationModal()
|
||||
|
|
|
|||
|
|
@ -242,7 +242,7 @@ ShapeshiftForm.prototype.render = function () {
|
|||
|
||||
]),
|
||||
|
||||
!depositAddress && h('button.btn-primary--lg.shapeshift-form__shapeshift-buy-btn', {
|
||||
!depositAddress && h('button.btn-primary.btn--large.shapeshift-form__shapeshift-buy-btn', {
|
||||
className: btnClass,
|
||||
disabled: !token,
|
||||
onClick: () => this.onBuyWithShapeShift(),
|
||||
|
|
|
|||
|
|
@ -235,12 +235,12 @@ SignatureRequest.prototype.renderFooter = function () {
|
|||
}
|
||||
|
||||
return h('div.request-signature__footer', [
|
||||
h('button.btn-secondary--lg.request-signature__footer__cancel-button', {
|
||||
h('button.btn-default.btn--large.request-signature__footer__cancel-button', {
|
||||
onClick: event => {
|
||||
cancel(event).then(() => this.props.history.push(DEFAULT_ROUTE))
|
||||
},
|
||||
}, this.context.t('cancel')),
|
||||
h('button.btn-primary--lg', {
|
||||
h('button.btn-primary.btn--large', {
|
||||
onClick: event => {
|
||||
sign(event).then(() => this.props.history.push(DEFAULT_ROUTE))
|
||||
},
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
Buttons
|
||||
*/
|
||||
|
||||
.btn-default,
|
||||
.btn-primary,
|
||||
.btn-primary--lg,
|
||||
.btn-secondary,
|
||||
.btn-secondary--lg {
|
||||
.btn-secondary {
|
||||
height: 44px;
|
||||
background: $white;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
|
|
@ -20,10 +20,16 @@
|
|||
width: 100%;
|
||||
text-transform: uppercase;
|
||||
outline: none;
|
||||
|
||||
&--disabled,
|
||||
&[disabled] {
|
||||
cursor: auto;
|
||||
opacity: .5;
|
||||
pointer-events: none;
|
||||
}
|
||||
}
|
||||
|
||||
.btn-primary,
|
||||
.btn-primary--lg {
|
||||
.btn-primary {
|
||||
color: $curious-blue;
|
||||
border: 2px solid $spindle;
|
||||
|
||||
|
|
@ -35,17 +41,23 @@
|
|||
&:hover {
|
||||
border-color: $curious-blue;
|
||||
}
|
||||
}
|
||||
|
||||
&--disabled,
|
||||
&[disabled] {
|
||||
cursor: auto;
|
||||
opacity: .5;
|
||||
pointer-events: none;
|
||||
.btn-secondary {
|
||||
color: $monzo;
|
||||
border: 2px solid lighten($monzo, 40%);
|
||||
|
||||
&:active {
|
||||
background: lighten($monzo, 55%);
|
||||
border-color: $monzo;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
border-color: $monzo;
|
||||
}
|
||||
}
|
||||
|
||||
.btn-secondary,
|
||||
.btn-secondary--lg {
|
||||
.btn-default {
|
||||
color: $scorpion;
|
||||
border: 2px solid $dusty-gray;
|
||||
|
||||
|
|
@ -57,20 +69,9 @@
|
|||
&:hover {
|
||||
border-color: $scorpion;
|
||||
}
|
||||
|
||||
&--disabled,
|
||||
&[disabled] {
|
||||
cursor: auto;
|
||||
opacity: .5;
|
||||
pointer-events: none;
|
||||
}
|
||||
}
|
||||
|
||||
.btn-primary, .btn-secondary {
|
||||
height: 44px;
|
||||
}
|
||||
|
||||
.btn-primary--lg, .btn-secondary--lg {
|
||||
.btn--large {
|
||||
height: 54px;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -499,7 +499,7 @@ SendTransactionScreen.prototype.renderFooter = function () {
|
|||
|
||||
return h('div.page-container__footer', [
|
||||
h(Button, {
|
||||
type: 'secondary',
|
||||
type: 'default',
|
||||
large: true,
|
||||
className: 'page-container__footer-button',
|
||||
onClick: () => {
|
||||
|
|
|
|||
Loading…
Reference in New Issue