mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
Dan J Miller
GitHub
commit
b4bfdc5e6c
@ -42,6 +42,17 @@ ConfigManager.prototype.getData = function () {
|
|||||||
return this.store.getState()
|
return this.store.getState()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ConfigManager.prototype.setPasswordForgotten = function (passwordForgottenState) {
|
||||||
|
const data = this.getData()
|
||||||
|
data.forgottenPassword = passwordForgottenState
|
||||||
|
this.setData(data)
|
||||||
|
}
|
||||||
|
|
||||||
|
ConfigManager.prototype.getPasswordForgotten = function (passwordForgottenState) {
|
||||||
|
const data = this.getData()
|
||||||
|
return data.forgottenPassword
|
||||||
|
}
|
||||||
|
|
||||||
ConfigManager.prototype.setWallet = function (wallet) {
|
ConfigManager.prototype.setWallet = function (wallet) {
|
||||||
var data = this.getData()
|
var data = this.getData()
|
||||||
data.wallet = wallet
|
data.wallet = wallet
|
||||||
|
|||||||
@ -310,6 +310,7 @@ module.exports = class MetamaskController extends EventEmitter {
|
|||||||
{
|
{
|
||||||
lostAccounts: this.configManager.getLostAccounts(),
|
lostAccounts: this.configManager.getLostAccounts(),
|
||||||
seedWords: this.configManager.getSeedWords(),
|
seedWords: this.configManager.getSeedWords(),
|
||||||
|
forgottenPassword: this.configManager.getPasswordForgotten(),
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@ -332,6 +333,8 @@ module.exports = class MetamaskController extends EventEmitter {
|
|||||||
setCurrentCurrency: this.setCurrentCurrency.bind(this),
|
setCurrentCurrency: this.setCurrentCurrency.bind(this),
|
||||||
setUseBlockie: this.setUseBlockie.bind(this),
|
setUseBlockie: this.setUseBlockie.bind(this),
|
||||||
markAccountsFound: this.markAccountsFound.bind(this),
|
markAccountsFound: this.markAccountsFound.bind(this),
|
||||||
|
markPasswordForgotten: this.markPasswordForgotten.bind(this),
|
||||||
|
unMarkPasswordForgotten: this.unMarkPasswordForgotten.bind(this),
|
||||||
|
|
||||||
// coinbase
|
// coinbase
|
||||||
buyEth: this.buyEth.bind(this),
|
buyEth: this.buyEth.bind(this),
|
||||||
@ -794,6 +797,18 @@ module.exports = class MetamaskController extends EventEmitter {
|
|||||||
cb(null, this.getState())
|
cb(null, this.getState())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
markPasswordForgotten(cb) {
|
||||||
|
this.configManager.setPasswordForgotten(true)
|
||||||
|
this.sendUpdate()
|
||||||
|
cb()
|
||||||
|
}
|
||||||
|
|
||||||
|
unMarkPasswordForgotten(cb) {
|
||||||
|
this.configManager.setPasswordForgotten(false)
|
||||||
|
this.sendUpdate()
|
||||||
|
cb()
|
||||||
|
}
|
||||||
|
|
||||||
restoreOldVaultAccounts (migratorOutput) {
|
restoreOldVaultAccounts (migratorOutput) {
|
||||||
const { serialized } = migratorOutput
|
const { serialized } = migratorOutput
|
||||||
return this.keyringController.restoreKeyring(serialized)
|
return this.keyringController.restoreKeyring(serialized)
|
||||||
|
|||||||
26
development/backGroundConnectionModifiers.js
Normal file
26
development/backGroundConnectionModifiers.js
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
module.exports = {
|
||||||
|
"confirm sig requests": {
|
||||||
|
signMessage: (msgData, cb) => {
|
||||||
|
const stateUpdate = {
|
||||||
|
unapprovedMsgs: {},
|
||||||
|
unapprovedMsgCount: 0,
|
||||||
|
}
|
||||||
|
return cb(null, stateUpdate)
|
||||||
|
},
|
||||||
|
signPersonalMessage: (msgData, cb) => {
|
||||||
|
const stateUpdate = {
|
||||||
|
unapprovedPersonalMsgs: {},
|
||||||
|
unapprovedPersonalMsgsCount: 0,
|
||||||
|
}
|
||||||
|
return cb(null, stateUpdate)
|
||||||
|
},
|
||||||
|
signTypedMessage: (msgData, cb) => {
|
||||||
|
const stateUpdate = {
|
||||||
|
unapprovedTypedMessages: {},
|
||||||
|
unapprovedTypedMessagesCount: 0,
|
||||||
|
}
|
||||||
|
return cb(null, stateUpdate)
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
@ -11,7 +11,14 @@ function NewComponent () {
|
|||||||
|
|
||||||
NewComponent.prototype.render = function () {
|
NewComponent.prototype.render = function () {
|
||||||
const props = this.props
|
const props = this.props
|
||||||
let { states, selectedKey, actions, store } = props
|
let {
|
||||||
|
states,
|
||||||
|
selectedKey,
|
||||||
|
actions,
|
||||||
|
store,
|
||||||
|
modifyBackgroundConnection,
|
||||||
|
backGroundConnectionModifiers,
|
||||||
|
} = props
|
||||||
|
|
||||||
const state = this.state || {}
|
const state = this.state || {}
|
||||||
const selected = state.selected || selectedKey
|
const selected = state.selected || selectedKey
|
||||||
@ -23,6 +30,8 @@ NewComponent.prototype.render = function () {
|
|||||||
value: selected,
|
value: selected,
|
||||||
onChange:(event) => {
|
onChange:(event) => {
|
||||||
const selectedKey = event.target.value
|
const selectedKey = event.target.value
|
||||||
|
const backgroundConnectionModifier = backGroundConnectionModifiers[selectedKey]
|
||||||
|
modifyBackgroundConnection(backgroundConnectionModifier || {})
|
||||||
store.dispatch(actions.update(selectedKey))
|
store.dispatch(actions.update(selectedKey))
|
||||||
this.setState({ selected: selectedKey })
|
this.setState({ selected: selectedKey })
|
||||||
},
|
},
|
||||||
|
|||||||
132
development/states/add-token.json
Normal file
132
development/states/add-token.json
Normal file
@ -0,0 +1,132 @@
|
|||||||
|
{
|
||||||
|
"metamask": {
|
||||||
|
"isInitialized": true,
|
||||||
|
"isUnlocked": true,
|
||||||
|
"featureFlags": {"betaUI": true},
|
||||||
|
"rpcTarget": "https://rawtestrpc.metamask.io/",
|
||||||
|
"identities": {
|
||||||
|
"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
|
||||||
|
"address": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
|
||||||
|
"name": "Send Account 1"
|
||||||
|
},
|
||||||
|
"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb": {
|
||||||
|
"address": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
|
||||||
|
"name": "Send Account 2"
|
||||||
|
},
|
||||||
|
"0x2f8d4a878cfa04a6e60d46362f5644deab66572d": {
|
||||||
|
"address": "0x2f8d4a878cfa04a6e60d46362f5644deab66572d",
|
||||||
|
"name": "Send Account 3"
|
||||||
|
},
|
||||||
|
"0xd85a4b6a394794842887b8284293d69163007bbb": {
|
||||||
|
"address": "0xd85a4b6a394794842887b8284293d69163007bbb",
|
||||||
|
"name": "Send Account 4"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"unapprovedTxs": {},
|
||||||
|
"conversionRate": 1200.88200327,
|
||||||
|
"conversionDate": 1489013762,
|
||||||
|
"noActiveNotices": true,
|
||||||
|
"frequentRpcList": [],
|
||||||
|
"network": "3",
|
||||||
|
"accounts": {
|
||||||
|
"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
|
||||||
|
"code": "0x",
|
||||||
|
"balance": "0x47c9d71831c76efe",
|
||||||
|
"nonce": "0x1b",
|
||||||
|
"address": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825"
|
||||||
|
},
|
||||||
|
"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb": {
|
||||||
|
"code": "0x",
|
||||||
|
"balance": "0x37452b1315889f80",
|
||||||
|
"nonce": "0xa",
|
||||||
|
"address": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb"
|
||||||
|
},
|
||||||
|
"0x2f8d4a878cfa04a6e60d46362f5644deab66572d": {
|
||||||
|
"code": "0x",
|
||||||
|
"balance": "0x30c9d71831c76efe",
|
||||||
|
"nonce": "0x1c",
|
||||||
|
"address": "0x2f8d4a878cfa04a6e60d46362f5644deab66572d"
|
||||||
|
},
|
||||||
|
"0xd85a4b6a394794842887b8284293d69163007bbb": {
|
||||||
|
"code": "0x",
|
||||||
|
"balance": "0x0",
|
||||||
|
"nonce": "0x0",
|
||||||
|
"address": "0xd85a4b6a394794842887b8284293d69163007bbb"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"addressBook": [
|
||||||
|
{
|
||||||
|
"address": "0x06195827297c7a80a443b6894d3bdb8824b43896",
|
||||||
|
"name": "Address Book Account 1"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"tokens": [],
|
||||||
|
"transactions": {},
|
||||||
|
"selectedAddressTxList": [],
|
||||||
|
"unapprovedMsgs": {},
|
||||||
|
"unapprovedMsgCount": 0,
|
||||||
|
"unapprovedPersonalMsgs": {},
|
||||||
|
"unapprovedPersonalMsgCount": 0,
|
||||||
|
"keyringTypes": [
|
||||||
|
"Simple Key Pair",
|
||||||
|
"HD Key Tree"
|
||||||
|
],
|
||||||
|
"keyrings": [
|
||||||
|
{
|
||||||
|
"type": "HD Key Tree",
|
||||||
|
"accounts": [
|
||||||
|
"fdea65c8e26263f6d9a1b5de9555d2931a33b825",
|
||||||
|
"c5b8dbac4c1d3f152cdeb400e2313f309c410acb",
|
||||||
|
"2f8d4a878cfa04a6e60d46362f5644deab66572d"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "Simple Key Pair",
|
||||||
|
"accounts": [
|
||||||
|
"0xd85a4b6a394794842887b8284293d69163007bbb"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"selectedAddress": "0xd85a4b6a394794842887b8284293d69163007bbb",
|
||||||
|
"currentCurrency": "USD",
|
||||||
|
"provider": {
|
||||||
|
"type": "testnet"
|
||||||
|
},
|
||||||
|
"shapeShiftTxList": [],
|
||||||
|
"lostAccounts": [],
|
||||||
|
"send": {
|
||||||
|
"gasLimit": null,
|
||||||
|
"gasPrice": null,
|
||||||
|
"gasTotal": "0xb451dc41b578",
|
||||||
|
"tokenBalance": null,
|
||||||
|
"from": "",
|
||||||
|
"to": "",
|
||||||
|
"amount": "0x0",
|
||||||
|
"memo": "",
|
||||||
|
"errors": {},
|
||||||
|
"maxModeOn": false,
|
||||||
|
"editingTransactionId": null
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"appState": {
|
||||||
|
"menuOpen": false,
|
||||||
|
"currentView": {
|
||||||
|
"name": "accountDetail",
|
||||||
|
"detailView": null,
|
||||||
|
"context": "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc"
|
||||||
|
},
|
||||||
|
"accountDetail": {
|
||||||
|
"subview": "transactions"
|
||||||
|
},
|
||||||
|
"modal": {
|
||||||
|
"modalState": {},
|
||||||
|
"previousModalState": {}
|
||||||
|
},
|
||||||
|
"transForward": true,
|
||||||
|
"isLoading": false,
|
||||||
|
"warning": null,
|
||||||
|
"scrollToBottom": false,
|
||||||
|
"forgottenPassword": null
|
||||||
|
},
|
||||||
|
"identities": {}
|
||||||
|
}
|
||||||
154
development/states/confirm-new-ui.json
Normal file
154
development/states/confirm-new-ui.json
Normal file
@ -0,0 +1,154 @@
|
|||||||
|
{
|
||||||
|
"metamask": {
|
||||||
|
"isInitialized": true,
|
||||||
|
"isUnlocked": true,
|
||||||
|
"featureFlags": {"betaUI": true},
|
||||||
|
"rpcTarget": "https://rawtestrpc.metamask.io/",
|
||||||
|
"identities": {
|
||||||
|
"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
|
||||||
|
"address": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
|
||||||
|
"name": "Send Account 1"
|
||||||
|
},
|
||||||
|
"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb": {
|
||||||
|
"address": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
|
||||||
|
"name": "Send Account 2"
|
||||||
|
},
|
||||||
|
"0x2f8d4a878cfa04a6e60d46362f5644deab66572d": {
|
||||||
|
"address": "0x2f8d4a878cfa04a6e60d46362f5644deab66572d",
|
||||||
|
"name": "Send Account 3"
|
||||||
|
},
|
||||||
|
"0xd85a4b6a394794842887b8284293d69163007bbb": {
|
||||||
|
"address": "0xd85a4b6a394794842887b8284293d69163007bbb",
|
||||||
|
"name": "Send Account 4"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"unapprovedTxs": {},
|
||||||
|
"currentCurrency": "USD",
|
||||||
|
"conversionRate": 1200.88200327,
|
||||||
|
"conversionDate": 1489013762,
|
||||||
|
"noActiveNotices": true,
|
||||||
|
"frequentRpcList": [],
|
||||||
|
"network": "3",
|
||||||
|
"accounts": {
|
||||||
|
"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
|
||||||
|
"code": "0x",
|
||||||
|
"balance": "0x47c9d71831c76efe",
|
||||||
|
"nonce": "0x1b",
|
||||||
|
"address": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825"
|
||||||
|
},
|
||||||
|
"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb": {
|
||||||
|
"code": "0x",
|
||||||
|
"balance": "0x37452b1315889f80",
|
||||||
|
"nonce": "0xa",
|
||||||
|
"address": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb"
|
||||||
|
},
|
||||||
|
"0x2f8d4a878cfa04a6e60d46362f5644deab66572d": {
|
||||||
|
"code": "0x",
|
||||||
|
"balance": "0x30c9d71831c76efe",
|
||||||
|
"nonce": "0x1c",
|
||||||
|
"address": "0x2f8d4a878cfa04a6e60d46362f5644deab66572d"
|
||||||
|
},
|
||||||
|
"0xd85a4b6a394794842887b8284293d69163007bbb": {
|
||||||
|
"code": "0x",
|
||||||
|
"balance": "0x0",
|
||||||
|
"nonce": "0x0",
|
||||||
|
"address": "0xd85a4b6a394794842887b8284293d69163007bbb"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"addressBook": [
|
||||||
|
{
|
||||||
|
"address": "0x06195827297c7a80a443b6894d3bdb8824b43896",
|
||||||
|
"name": "Address Book Account 1"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"tokens": [],
|
||||||
|
"transactions": {},
|
||||||
|
"selectedAddressTxList": [],
|
||||||
|
"unapprovedTxs": {
|
||||||
|
"4768706228115573": {
|
||||||
|
"id": 4768706228115573,
|
||||||
|
"time": 1487363153561,
|
||||||
|
"status": "unapproved",
|
||||||
|
"gasMultiplier": 1,
|
||||||
|
"metamaskNetworkId": "3",
|
||||||
|
"txParams": {
|
||||||
|
"from": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
|
||||||
|
"to": "0x2f8d4a878cfa04a6e60d46362f5644deab66572d",
|
||||||
|
"value": "0x1bc16d674ec80000",
|
||||||
|
"metamaskId": 4768706228115573,
|
||||||
|
"metamaskNetworkId": "3",
|
||||||
|
"gas": "0xea60",
|
||||||
|
"gasPrice": "0xba43b7400"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"unapprovedMsgs": {},
|
||||||
|
"unapprovedMsgCount": 0,
|
||||||
|
"unapprovedPersonalMsgs": {},
|
||||||
|
"unapprovedPersonalMsgCount": 0,
|
||||||
|
"keyringTypes": [
|
||||||
|
"Simple Key Pair",
|
||||||
|
"HD Key Tree"
|
||||||
|
],
|
||||||
|
"keyrings": [
|
||||||
|
{
|
||||||
|
"type": "HD Key Tree",
|
||||||
|
"accounts": [
|
||||||
|
"fdea65c8e26263f6d9a1b5de9555d2931a33b825",
|
||||||
|
"c5b8dbac4c1d3f152cdeb400e2313f309c410acb",
|
||||||
|
"2f8d4a878cfa04a6e60d46362f5644deab66572d"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "Simple Key Pair",
|
||||||
|
"accounts": [
|
||||||
|
"0xd85a4b6a394794842887b8284293d69163007bbb"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"selectedAddress": "0xd85a4b6a394794842887b8284293d69163007bbb",
|
||||||
|
"currentCurrency": "USD",
|
||||||
|
"provider": {
|
||||||
|
"type": "testnet"
|
||||||
|
},
|
||||||
|
"shapeShiftTxList": [],
|
||||||
|
"lostAccounts": [],
|
||||||
|
"send": {
|
||||||
|
"gasLimit": "0xea60",
|
||||||
|
"gasPrice": "0xba43b7400",
|
||||||
|
"gasTotal": "0xb451dc41b578",
|
||||||
|
"tokenBalance": null,
|
||||||
|
"from": {
|
||||||
|
"address": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
|
||||||
|
"balance": "0x37452b1315889f80"
|
||||||
|
},
|
||||||
|
"to": "0x2f8d4a878cfa04a6e60d46362f5644deab66572d",
|
||||||
|
"amount": "0x1bc16d674ec80000",
|
||||||
|
"memo": "",
|
||||||
|
"errors": {},
|
||||||
|
"maxModeOn": false,
|
||||||
|
"editingTransactionId": null
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"appState": {
|
||||||
|
"menuOpen": false,
|
||||||
|
"currentView": {
|
||||||
|
"name": "confTx",
|
||||||
|
"detailView": null,
|
||||||
|
"context": 0
|
||||||
|
},
|
||||||
|
"accountDetail": {
|
||||||
|
"subview": "transactions"
|
||||||
|
},
|
||||||
|
"modal": {
|
||||||
|
"modalState": {},
|
||||||
|
"previousModalState": {}
|
||||||
|
},
|
||||||
|
"transForward": true,
|
||||||
|
"isLoading": false,
|
||||||
|
"warning": null,
|
||||||
|
"scrollToBottom": false,
|
||||||
|
"forgottenPassword": null
|
||||||
|
},
|
||||||
|
"identities": {}
|
||||||
|
}
|
||||||
175
development/states/confirm-sig-requests.json
Normal file
175
development/states/confirm-sig-requests.json
Normal file
File diff suppressed because one or more lines are too long
@ -35,7 +35,8 @@
|
|||||||
"type": "testnet"
|
"type": "testnet"
|
||||||
},
|
},
|
||||||
"shapeShiftTxList": [],
|
"shapeShiftTxList": [],
|
||||||
"lostAccounts": []
|
"lostAccounts": [],
|
||||||
|
"tokens": []
|
||||||
},
|
},
|
||||||
"appState": {
|
"appState": {
|
||||||
"menuOpen": false,
|
"menuOpen": false,
|
||||||
@ -48,7 +49,12 @@
|
|||||||
},
|
},
|
||||||
"transForward": true,
|
"transForward": true,
|
||||||
"isLoading": false,
|
"isLoading": false,
|
||||||
"warning": null
|
"warning": null,
|
||||||
|
"modal": {
|
||||||
|
"modalState": {"name": null},
|
||||||
|
"open": false,
|
||||||
|
"previousModalState": {"name": null}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"identities": {},
|
"identities": {},
|
||||||
"computedBalances": {}
|
"computedBalances": {}
|
||||||
|
|||||||
154
development/states/send-edit.json
Normal file
154
development/states/send-edit.json
Normal file
@ -0,0 +1,154 @@
|
|||||||
|
{
|
||||||
|
"metamask": {
|
||||||
|
"isInitialized": true,
|
||||||
|
"isUnlocked": true,
|
||||||
|
"featureFlags": {"betaUI": true},
|
||||||
|
"rpcTarget": "https://rawtestrpc.metamask.io/",
|
||||||
|
"identities": {
|
||||||
|
"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
|
||||||
|
"address": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
|
||||||
|
"name": "Send Account 1"
|
||||||
|
},
|
||||||
|
"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb": {
|
||||||
|
"address": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
|
||||||
|
"name": "Send Account 2"
|
||||||
|
},
|
||||||
|
"0x2f8d4a878cfa04a6e60d46362f5644deab66572d": {
|
||||||
|
"address": "0x2f8d4a878cfa04a6e60d46362f5644deab66572d",
|
||||||
|
"name": "Send Account 3"
|
||||||
|
},
|
||||||
|
"0xd85a4b6a394794842887b8284293d69163007bbb": {
|
||||||
|
"address": "0xd85a4b6a394794842887b8284293d69163007bbb",
|
||||||
|
"name": "Send Account 4"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"unapprovedTxs": {},
|
||||||
|
"currentCurrency": "USD",
|
||||||
|
"conversionRate": 1200.88200327,
|
||||||
|
"conversionDate": 1489013762,
|
||||||
|
"noActiveNotices": true,
|
||||||
|
"frequentRpcList": [],
|
||||||
|
"network": "3",
|
||||||
|
"accounts": {
|
||||||
|
"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
|
||||||
|
"code": "0x",
|
||||||
|
"balance": "0x47c9d71831c76efe",
|
||||||
|
"nonce": "0x1b",
|
||||||
|
"address": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825"
|
||||||
|
},
|
||||||
|
"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb": {
|
||||||
|
"code": "0x",
|
||||||
|
"balance": "0x37452b1315889f80",
|
||||||
|
"nonce": "0xa",
|
||||||
|
"address": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb"
|
||||||
|
},
|
||||||
|
"0x2f8d4a878cfa04a6e60d46362f5644deab66572d": {
|
||||||
|
"code": "0x",
|
||||||
|
"balance": "0x30c9d71831c76efe",
|
||||||
|
"nonce": "0x1c",
|
||||||
|
"address": "0x2f8d4a878cfa04a6e60d46362f5644deab66572d"
|
||||||
|
},
|
||||||
|
"0xd85a4b6a394794842887b8284293d69163007bbb": {
|
||||||
|
"code": "0x",
|
||||||
|
"balance": "0x0",
|
||||||
|
"nonce": "0x0",
|
||||||
|
"address": "0xd85a4b6a394794842887b8284293d69163007bbb"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"addressBook": [
|
||||||
|
{
|
||||||
|
"address": "0x06195827297c7a80a443b6894d3bdb8824b43896",
|
||||||
|
"name": "Address Book Account 1"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"tokens": [],
|
||||||
|
"transactions": {},
|
||||||
|
"selectedAddressTxList": [],
|
||||||
|
"unapprovedTxs": {
|
||||||
|
"4768706228115573": {
|
||||||
|
"id": 4768706228115573,
|
||||||
|
"time": 1487363153561,
|
||||||
|
"status": "unapproved",
|
||||||
|
"gasMultiplier": 1,
|
||||||
|
"metamaskNetworkId": "3",
|
||||||
|
"txParams": {
|
||||||
|
"from": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
|
||||||
|
"to": "0x2f8d4a878cfa04a6e60d46362f5644deab66572d",
|
||||||
|
"value": "0x1bc16d674ec80000",
|
||||||
|
"metamaskId": 4768706228115573,
|
||||||
|
"metamaskNetworkId": "3",
|
||||||
|
"gas": "0xea60",
|
||||||
|
"gasPrice": "0xba43b7400"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"unapprovedMsgs": {},
|
||||||
|
"unapprovedMsgCount": 0,
|
||||||
|
"unapprovedPersonalMsgs": {},
|
||||||
|
"unapprovedPersonalMsgCount": 0,
|
||||||
|
"keyringTypes": [
|
||||||
|
"Simple Key Pair",
|
||||||
|
"HD Key Tree"
|
||||||
|
],
|
||||||
|
"keyrings": [
|
||||||
|
{
|
||||||
|
"type": "HD Key Tree",
|
||||||
|
"accounts": [
|
||||||
|
"fdea65c8e26263f6d9a1b5de9555d2931a33b825",
|
||||||
|
"c5b8dbac4c1d3f152cdeb400e2313f309c410acb",
|
||||||
|
"2f8d4a878cfa04a6e60d46362f5644deab66572d"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "Simple Key Pair",
|
||||||
|
"accounts": [
|
||||||
|
"0xd85a4b6a394794842887b8284293d69163007bbb"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"selectedAddress": "0xd85a4b6a394794842887b8284293d69163007bbb",
|
||||||
|
"currentCurrency": "USD",
|
||||||
|
"provider": {
|
||||||
|
"type": "testnet"
|
||||||
|
},
|
||||||
|
"shapeShiftTxList": [],
|
||||||
|
"lostAccounts": [],
|
||||||
|
"send": {
|
||||||
|
"gasLimit": "0xea60",
|
||||||
|
"gasPrice": "0xba43b7400",
|
||||||
|
"gasTotal": "0xb451dc41b578",
|
||||||
|
"tokenBalance": null,
|
||||||
|
"from": {
|
||||||
|
"address": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
|
||||||
|
"balance": "0x37452b1315889f80"
|
||||||
|
},
|
||||||
|
"to": "0x2f8d4a878cfa04a6e60d46362f5644deab66572d",
|
||||||
|
"amount": "0x1bc16d674ec80000",
|
||||||
|
"memo": "",
|
||||||
|
"errors": {},
|
||||||
|
"maxModeOn": false,
|
||||||
|
"editingTransactionId": null
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"appState": {
|
||||||
|
"menuOpen": false,
|
||||||
|
"currentView": {
|
||||||
|
"name": "confTx",
|
||||||
|
"detailView": null,
|
||||||
|
"context": 0
|
||||||
|
},
|
||||||
|
"accountDetail": {
|
||||||
|
"subview": "transactions"
|
||||||
|
},
|
||||||
|
"modal": {
|
||||||
|
"modalState": {},
|
||||||
|
"previousModalState": {}
|
||||||
|
},
|
||||||
|
"transForward": true,
|
||||||
|
"isLoading": false,
|
||||||
|
"warning": null,
|
||||||
|
"scrollToBottom": false,
|
||||||
|
"forgottenPassword": null
|
||||||
|
},
|
||||||
|
"identities": {}
|
||||||
|
}
|
||||||
133
development/states/send-new-ui.json
Normal file
133
development/states/send-new-ui.json
Normal file
@ -0,0 +1,133 @@
|
|||||||
|
{
|
||||||
|
"metamask": {
|
||||||
|
"isInitialized": true,
|
||||||
|
"isUnlocked": true,
|
||||||
|
"featureFlags": {"betaUI": true},
|
||||||
|
"rpcTarget": "https://rawtestrpc.metamask.io/",
|
||||||
|
"identities": {
|
||||||
|
"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
|
||||||
|
"address": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
|
||||||
|
"name": "Send Account 1"
|
||||||
|
},
|
||||||
|
"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb": {
|
||||||
|
"address": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
|
||||||
|
"name": "Send Account 2"
|
||||||
|
},
|
||||||
|
"0x2f8d4a878cfa04a6e60d46362f5644deab66572d": {
|
||||||
|
"address": "0x2f8d4a878cfa04a6e60d46362f5644deab66572d",
|
||||||
|
"name": "Send Account 3"
|
||||||
|
},
|
||||||
|
"0xd85a4b6a394794842887b8284293d69163007bbb": {
|
||||||
|
"address": "0xd85a4b6a394794842887b8284293d69163007bbb",
|
||||||
|
"name": "Send Account 4"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"unapprovedTxs": {},
|
||||||
|
"currentCurrency": "USD",
|
||||||
|
"conversionRate": 1200.88200327,
|
||||||
|
"conversionDate": 1489013762,
|
||||||
|
"noActiveNotices": true,
|
||||||
|
"frequentRpcList": [],
|
||||||
|
"network": "3",
|
||||||
|
"accounts": {
|
||||||
|
"0xfdea65c8e26263f6d9a1b5de9555d2931a33b825": {
|
||||||
|
"code": "0x",
|
||||||
|
"balance": "0x47c9d71831c76efe",
|
||||||
|
"nonce": "0x1b",
|
||||||
|
"address": "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825"
|
||||||
|
},
|
||||||
|
"0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb": {
|
||||||
|
"code": "0x",
|
||||||
|
"balance": "0x37452b1315889f80",
|
||||||
|
"nonce": "0xa",
|
||||||
|
"address": "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb"
|
||||||
|
},
|
||||||
|
"0x2f8d4a878cfa04a6e60d46362f5644deab66572d": {
|
||||||
|
"code": "0x",
|
||||||
|
"balance": "0x30c9d71831c76efe",
|
||||||
|
"nonce": "0x1c",
|
||||||
|
"address": "0x2f8d4a878cfa04a6e60d46362f5644deab66572d"
|
||||||
|
},
|
||||||
|
"0xd85a4b6a394794842887b8284293d69163007bbb": {
|
||||||
|
"code": "0x",
|
||||||
|
"balance": "0x0",
|
||||||
|
"nonce": "0x0",
|
||||||
|
"address": "0xd85a4b6a394794842887b8284293d69163007bbb"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"addressBook": [
|
||||||
|
{
|
||||||
|
"address": "0x06195827297c7a80a443b6894d3bdb8824b43896",
|
||||||
|
"name": "Address Book Account 1"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"tokens": [],
|
||||||
|
"transactions": {},
|
||||||
|
"selectedAddressTxList": [],
|
||||||
|
"unapprovedMsgs": {},
|
||||||
|
"unapprovedMsgCount": 0,
|
||||||
|
"unapprovedPersonalMsgs": {},
|
||||||
|
"unapprovedPersonalMsgCount": 0,
|
||||||
|
"keyringTypes": [
|
||||||
|
"Simple Key Pair",
|
||||||
|
"HD Key Tree"
|
||||||
|
],
|
||||||
|
"keyrings": [
|
||||||
|
{
|
||||||
|
"type": "HD Key Tree",
|
||||||
|
"accounts": [
|
||||||
|
"fdea65c8e26263f6d9a1b5de9555d2931a33b825",
|
||||||
|
"c5b8dbac4c1d3f152cdeb400e2313f309c410acb",
|
||||||
|
"2f8d4a878cfa04a6e60d46362f5644deab66572d"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "Simple Key Pair",
|
||||||
|
"accounts": [
|
||||||
|
"0xd85a4b6a394794842887b8284293d69163007bbb"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"selectedAddress": "0xd85a4b6a394794842887b8284293d69163007bbb",
|
||||||
|
"currentCurrency": "USD",
|
||||||
|
"provider": {
|
||||||
|
"type": "testnet"
|
||||||
|
},
|
||||||
|
"shapeShiftTxList": [],
|
||||||
|
"lostAccounts": [],
|
||||||
|
"send": {
|
||||||
|
"gasLimit": null,
|
||||||
|
"gasPrice": null,
|
||||||
|
"gasTotal": "0xb451dc41b578",
|
||||||
|
"tokenBalance": null,
|
||||||
|
"from": "",
|
||||||
|
"to": "",
|
||||||
|
"amount": "0x0",
|
||||||
|
"memo": "",
|
||||||
|
"errors": {},
|
||||||
|
"maxModeOn": false,
|
||||||
|
"editingTransactionId": null
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"appState": {
|
||||||
|
"menuOpen": false,
|
||||||
|
"currentView": {
|
||||||
|
"name": "accountDetail",
|
||||||
|
"detailView": null,
|
||||||
|
"context": "0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc"
|
||||||
|
},
|
||||||
|
"accountDetail": {
|
||||||
|
"subview": "transactions"
|
||||||
|
},
|
||||||
|
"modal": {
|
||||||
|
"modalState": {},
|
||||||
|
"previousModalState": {}
|
||||||
|
},
|
||||||
|
"transForward": true,
|
||||||
|
"isLoading": false,
|
||||||
|
"warning": null,
|
||||||
|
"scrollToBottom": false,
|
||||||
|
"forgottenPassword": null
|
||||||
|
},
|
||||||
|
"identities": {}
|
||||||
|
}
|
||||||
@ -58,7 +58,7 @@ class CreatePasswordScreen extends Component {
|
|||||||
? <LoadingScreen loadingMessage="Creating your new account" />
|
? <LoadingScreen loadingMessage="Creating your new account" />
|
||||||
: (
|
: (
|
||||||
<div>
|
<div>
|
||||||
<h2 className="alpha-warning">Warning This is Experemental software and is a Developer BETA </h2>
|
<h2 className="alpha-warning">Warning: This is Experimental software and is a Developer BETA</h2>
|
||||||
<div className="first-view-main">
|
<div className="first-view-main">
|
||||||
<div className="mascara-info">
|
<div className="mascara-info">
|
||||||
<Mascot
|
<Mascot
|
||||||
|
|||||||
@ -67,27 +67,37 @@ class ImportSeedPhraseScreen extends Component {
|
|||||||
<div className="import-account__selector-label">
|
<div className="import-account__selector-label">
|
||||||
Enter your secret twelve word phrase here to restore your vault.
|
Enter your secret twelve word phrase here to restore your vault.
|
||||||
</div>
|
</div>
|
||||||
<textarea
|
<div className="import-account__input-wrapper">
|
||||||
className="import-account__secret-phrase"
|
<label className="import-account__input-label">Wallet Seed</label>
|
||||||
onChange={e => this.setState({seedPhrase: e.target.value})}
|
<textarea
|
||||||
/>
|
className="import-account__secret-phrase"
|
||||||
|
onChange={e => this.setState({seedPhrase: e.target.value})}
|
||||||
|
placeholder="Separate each word with a single space"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
<span
|
<span
|
||||||
className="error"
|
className="error"
|
||||||
>
|
>
|
||||||
{this.props.warning}
|
{this.props.warning}
|
||||||
</span>
|
</span>
|
||||||
<input
|
<div className="import-account__input-wrapper">
|
||||||
className="first-time-flow__input"
|
<label className="import-account__input-label">New Password</label>
|
||||||
type="password"
|
<input
|
||||||
placeholder="New Password (min 8 characters)"
|
className="first-time-flow__input"
|
||||||
onChange={e => this.setState({password: e.target.value})}
|
type="password"
|
||||||
/>
|
placeholder="New Password (min 8 characters)"
|
||||||
<input
|
onChange={e => this.setState({password: e.target.value})}
|
||||||
className="first-time-flow__input create-password__confirm-input"
|
/>
|
||||||
type="password"
|
</div>
|
||||||
placeholder="Confirm Password"
|
<div className="import-account__input-wrapper">
|
||||||
onChange={e => this.setState({confirmPassword: e.target.value})}
|
<label className="import-account__input-label">Confirm Password</label>
|
||||||
/>
|
<input
|
||||||
|
className="first-time-flow__input"
|
||||||
|
type="password"
|
||||||
|
placeholder="Confirm Password"
|
||||||
|
onChange={e => this.setState({confirmPassword: e.target.value})}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
<button
|
<button
|
||||||
className="first-time-flow__button"
|
className="first-time-flow__button"
|
||||||
onClick={this.onClick}
|
onClick={this.onClick}
|
||||||
|
|||||||
@ -44,10 +44,14 @@
|
|||||||
.buy-ether {
|
.buy-ether {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-flow: column nowrap;
|
flex-flow: column nowrap;
|
||||||
margin: 67px 0 0 146px;
|
margin: 67px 0 50px 146px;
|
||||||
max-width: 35rem;
|
max-width: 35rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.import-account {
|
||||||
|
max-width: initial;
|
||||||
|
}
|
||||||
|
|
||||||
@media only screen and (max-width: 575px) {
|
@media only screen and (max-width: 575px) {
|
||||||
.create-password,
|
.create-password,
|
||||||
.unique-image,
|
.unique-image,
|
||||||
@ -135,14 +139,16 @@
|
|||||||
.backup-phrase__title,
|
.backup-phrase__title,
|
||||||
.import-account__title,
|
.import-account__title,
|
||||||
.buy-ether__title {
|
.buy-ether__title {
|
||||||
width: 280px;
|
|
||||||
color: #1B344D;
|
color: #1B344D;
|
||||||
font-size: 40px;
|
font-size: 40px;
|
||||||
font-weight: 500;
|
|
||||||
line-height: 51px;
|
line-height: 51px;
|
||||||
margin-bottom: 24px;
|
margin-bottom: 24px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.import-account__title {
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
.tou__title,
|
.tou__title,
|
||||||
.backup-phrase__title {
|
.backup-phrase__title {
|
||||||
width: 480px;
|
width: 480px;
|
||||||
@ -288,9 +294,7 @@
|
|||||||
.import-account__back-button:hover {
|
.import-account__back-button:hover {
|
||||||
margin-bottom: 18px;
|
margin-bottom: 18px;
|
||||||
color: #22232C;
|
color: #22232C;
|
||||||
font-family: Montserrat Regular;
|
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
font-weight: 500;
|
|
||||||
line-height: 21px;
|
line-height: 21px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -311,6 +315,12 @@ button.backup-phrase__reveal-button:hover {
|
|||||||
|
|
||||||
.import-account__secret-phrase {
|
.import-account__secret-phrase {
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
|
margin: initial;
|
||||||
|
}
|
||||||
|
|
||||||
|
.import-account__secret-phrase::placeholder {
|
||||||
|
color: #9B9B9B;
|
||||||
|
font-weight: 200;
|
||||||
}
|
}
|
||||||
|
|
||||||
.backup-phrase__confirm-seed-options {
|
.backup-phrase__confirm-seed-options {
|
||||||
@ -350,9 +360,7 @@ button.backup-phrase__confirm-seed-option:hover {
|
|||||||
|
|
||||||
.import-account__selector-label {
|
.import-account__selector-label {
|
||||||
color: #1B344D;
|
color: #1B344D;
|
||||||
font-family: Montserrat Light;
|
font-size: 16px;
|
||||||
font-size: 18px;
|
|
||||||
line-height: 23px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.import-account__dropdown {
|
.import-account__dropdown {
|
||||||
@ -394,7 +402,6 @@ button.backup-phrase__confirm-seed-option:hover {
|
|||||||
margin-top: 10px;
|
margin-top: 10px;
|
||||||
width: 422px;
|
width: 422px;
|
||||||
color: #FF001F;
|
color: #FF001F;
|
||||||
font-family: Montserrat Light;
|
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
line-height: 21px;
|
line-height: 21px;
|
||||||
}
|
}
|
||||||
@ -402,10 +409,8 @@ button.backup-phrase__confirm-seed-option:hover {
|
|||||||
.import-account__input-label {
|
.import-account__input-label {
|
||||||
margin-bottom: 9px;
|
margin-bottom: 9px;
|
||||||
color: #1B344D;
|
color: #1B344D;
|
||||||
font-family: Montserrat Light;
|
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
line-height: 23px;
|
line-height: 23px;
|
||||||
text-transform: uppercase;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.import-account__input {
|
.import-account__input {
|
||||||
@ -549,7 +554,7 @@ button.backup-phrase__confirm-seed-option:hover {
|
|||||||
width: 350px;
|
width: 350px;
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
line-height: 24px;
|
line-height: 24px;
|
||||||
padding: 15px 28px;
|
padding: 15px;
|
||||||
border: 1px solid #CDCDCD;
|
border: 1px solid #CDCDCD;
|
||||||
background-color: #FFFFFF;
|
background-color: #FFFFFF;
|
||||||
}
|
}
|
||||||
|
|||||||
15
mock-dev.js
15
mock-dev.js
@ -20,6 +20,7 @@ const Root = require('./ui/app/root')
|
|||||||
const configureStore = require('./ui/app/store')
|
const configureStore = require('./ui/app/store')
|
||||||
const actions = require('./ui/app/actions')
|
const actions = require('./ui/app/actions')
|
||||||
const states = require('./development/states')
|
const states = require('./development/states')
|
||||||
|
const backGroundConnectionModifiers = require('./development/backGroundConnectionModifiers')
|
||||||
const Selector = require('./development/selector')
|
const Selector = require('./development/selector')
|
||||||
const MetamaskController = require('./app/scripts/metamask-controller')
|
const MetamaskController = require('./app/scripts/metamask-controller')
|
||||||
const firstTimeState = require('./app/scripts/first-time-state')
|
const firstTimeState = require('./app/scripts/first-time-state')
|
||||||
@ -85,6 +86,11 @@ actions.update = function(stateName) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function modifyBackgroundConnection(backgroundConnectionModifier) {
|
||||||
|
const modifiedBackgroundConnection = Object.assign({}, controller.getApi(), backgroundConnectionModifier)
|
||||||
|
actions._setBackgroundConnection(modifiedBackgroundConnection)
|
||||||
|
}
|
||||||
|
|
||||||
var css = MetaMaskUiCss()
|
var css = MetaMaskUiCss()
|
||||||
injectCss(css)
|
injectCss(css)
|
||||||
|
|
||||||
@ -113,7 +119,14 @@ function startApp(){
|
|||||||
},
|
},
|
||||||
}, 'Reset State'),
|
}, 'Reset State'),
|
||||||
|
|
||||||
h(Selector, { actions, selectedKey: selectedView, states, store }),
|
h(Selector, {
|
||||||
|
actions,
|
||||||
|
selectedKey: selectedView,
|
||||||
|
states,
|
||||||
|
store,
|
||||||
|
modifyBackgroundConnection,
|
||||||
|
backGroundConnectionModifiers,
|
||||||
|
}),
|
||||||
|
|
||||||
h('#app-content', {
|
h('#app-content', {
|
||||||
style: {
|
style: {
|
||||||
|
|||||||
@ -456,11 +456,31 @@ App.prototype.renderPrimary = function () {
|
|||||||
// notices
|
// notices
|
||||||
if (!props.noActiveNotices) {
|
if (!props.noActiveNotices) {
|
||||||
log.debug('rendering notice screen for unread notices.')
|
log.debug('rendering notice screen for unread notices.')
|
||||||
return h(NoticeScreen, {
|
return h('div', [
|
||||||
notice: props.lastUnreadNotice,
|
|
||||||
key: 'NoticeScreen',
|
h(NoticeScreen, {
|
||||||
onConfirm: () => props.dispatch(actions.markNoticeRead(props.lastUnreadNotice)),
|
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) {
|
} else if (props.lostAccounts && props.lostAccounts.length > 0) {
|
||||||
log.debug('rendering notice screen for lost accounts view.')
|
log.debug('rendering notice screen for lost accounts view.')
|
||||||
return h(NoticeScreen, {
|
return h(NoticeScreen, {
|
||||||
|
|||||||
@ -761,4 +761,51 @@ div.message-container > div:first-child {
|
|||||||
right: 17.5px;
|
right: 17.5px;
|
||||||
font-family: sans-serif;
|
font-family: sans-serif;
|
||||||
cursor: pointer;
|
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;
|
||||||
}
|
}
|
||||||
@ -148,6 +148,7 @@
|
|||||||
"react-redux": "^5.0.5",
|
"react-redux": "^5.0.5",
|
||||||
"react-select": "^1.0.0",
|
"react-select": "^1.0.0",
|
||||||
"react-simple-file-input": "^2.0.0",
|
"react-simple-file-input": "^2.0.0",
|
||||||
|
"react-tippy": "^1.2.2",
|
||||||
"react-toggle-button": "^2.2.0",
|
"react-toggle-button": "^2.2.0",
|
||||||
"react-tooltip-component": "^0.3.0",
|
"react-tooltip-component": "^0.3.0",
|
||||||
"react-transition-group": "^2.2.1",
|
"react-transition-group": "^2.2.1",
|
||||||
|
|||||||
153
test/integration/lib/add-token.js
Normal file
153
test/integration/lib/add-token.js
Normal file
@ -0,0 +1,153 @@
|
|||||||
|
const reactTriggerChange = require('react-trigger-change')
|
||||||
|
|
||||||
|
QUnit.module('Add token flow')
|
||||||
|
|
||||||
|
QUnit.test('successful add token flow', (assert) => {
|
||||||
|
const done = assert.async()
|
||||||
|
runAddTokenFlowTest(assert)
|
||||||
|
.then(done)
|
||||||
|
.catch(err => {
|
||||||
|
assert.notOk(err, `Error was thrown: ${err.stack}`)
|
||||||
|
done()
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
async function runAddTokenFlowTest (assert, done) {
|
||||||
|
const selectState = $('select')
|
||||||
|
selectState.val('add token')
|
||||||
|
reactTriggerChange(selectState[0])
|
||||||
|
|
||||||
|
await timeout(2000)
|
||||||
|
|
||||||
|
// Check that no tokens have been added
|
||||||
|
assert.ok($('.token-list-item').length === 0, 'no tokens added')
|
||||||
|
|
||||||
|
// Go to Add Token screen
|
||||||
|
let addTokenButton = $('button.btn-clear.wallet-view__add-token-button')
|
||||||
|
assert.ok(addTokenButton[0], 'add token button present')
|
||||||
|
addTokenButton[0].click()
|
||||||
|
|
||||||
|
await timeout(1000)
|
||||||
|
|
||||||
|
// Verify Add Token screen
|
||||||
|
let addTokenWrapper = $('.add-token__wrapper')
|
||||||
|
assert.ok(addTokenWrapper[0], 'add token wrapper renders')
|
||||||
|
|
||||||
|
let addTokenTitle = $('.add-token__title')
|
||||||
|
assert.equal(addTokenTitle[0].textContent, 'Add Token', 'add token title is correct')
|
||||||
|
|
||||||
|
// Cancel Add Token
|
||||||
|
const cancelAddTokenButton = $('button.btn-cancel.add-token__button')
|
||||||
|
assert.ok(cancelAddTokenButton[0], 'cancel add token button present')
|
||||||
|
cancelAddTokenButton.click()
|
||||||
|
|
||||||
|
await timeout(1000)
|
||||||
|
|
||||||
|
assert.ok($('.wallet-view')[0], 'cancelled and returned to account detail wallet view')
|
||||||
|
|
||||||
|
// Return to Add Token Screen
|
||||||
|
addTokenButton = $('button.btn-clear.wallet-view__add-token-button')
|
||||||
|
assert.ok(addTokenButton[0], 'add token button present')
|
||||||
|
addTokenButton[0].click()
|
||||||
|
|
||||||
|
await timeout(1000)
|
||||||
|
|
||||||
|
// Verify Add Token Screen
|
||||||
|
addTokenWrapper = $('.add-token__wrapper')
|
||||||
|
addTokenTitle = $('.add-token__title')
|
||||||
|
assert.ok(addTokenWrapper[0], 'add token wrapper renders')
|
||||||
|
assert.equal(addTokenTitle[0].textContent, 'Add Token', 'add token title is correct')
|
||||||
|
|
||||||
|
// Search for token
|
||||||
|
const searchInput = $('input.add-token__input')
|
||||||
|
searchInput.val('a')
|
||||||
|
reactTriggerChange(searchInput[0])
|
||||||
|
|
||||||
|
await timeout()
|
||||||
|
|
||||||
|
// Click token to add
|
||||||
|
const tokenWrapper = $('div.add-token__token-wrapper')
|
||||||
|
assert.ok(tokenWrapper[0], 'token found')
|
||||||
|
const tokenImageProp = tokenWrapper.find('.add-token__token-icon').css('background-image')
|
||||||
|
const tokenImageUrl = tokenImageProp.slice(5, -2)
|
||||||
|
tokenWrapper[0].click()
|
||||||
|
|
||||||
|
await timeout()
|
||||||
|
|
||||||
|
// Click Next button
|
||||||
|
let nextButton = $('button.btn-clear.add-token__button')
|
||||||
|
assert.equal(nextButton[0].textContent, 'Next', 'next button rendered')
|
||||||
|
nextButton[0].click()
|
||||||
|
|
||||||
|
await timeout()
|
||||||
|
|
||||||
|
// Confirm Add token
|
||||||
|
assert.equal(
|
||||||
|
$('.add-token__description')[0].textContent,
|
||||||
|
'Would you like to add these tokens?',
|
||||||
|
'confirm add token rendered'
|
||||||
|
)
|
||||||
|
assert.ok($('button.btn-clear.add-token__button')[0], 'confirm add token button found')
|
||||||
|
$('button.btn-clear.add-token__button')[0].click()
|
||||||
|
|
||||||
|
await timeout(2000)
|
||||||
|
|
||||||
|
// Verify added token image
|
||||||
|
let heroBalance = $('.hero-balance')
|
||||||
|
assert.ok(heroBalance, 'rendered hero balance')
|
||||||
|
assert.ok(tokenImageUrl.indexOf(heroBalance.find('img').attr('src')) > -1, 'token added')
|
||||||
|
|
||||||
|
// Return to Add Token Screen
|
||||||
|
addTokenButton = $('button.btn-clear.wallet-view__add-token-button')
|
||||||
|
assert.ok(addTokenButton[0], 'add token button present')
|
||||||
|
addTokenButton[0].click()
|
||||||
|
|
||||||
|
await timeout(1000)
|
||||||
|
|
||||||
|
const addCustom = $('.add-token__add-custom')
|
||||||
|
assert.ok(addCustom[0], 'add custom token button present')
|
||||||
|
addCustom[0].click()
|
||||||
|
|
||||||
|
await timeout()
|
||||||
|
|
||||||
|
// Input token contract address
|
||||||
|
const customInput = $('input.add-token__add-custom-input')
|
||||||
|
customInput.val('0x177af043D3A1Aed7cc5f2397C70248Fc6cDC056c')
|
||||||
|
reactTriggerChange(customInput[0])
|
||||||
|
|
||||||
|
await timeout(1000)
|
||||||
|
|
||||||
|
// Click Next button
|
||||||
|
nextButton = $('button.btn-clear.add-token__button')
|
||||||
|
assert.equal(nextButton[0].textContent, 'Next', 'next button rendered')
|
||||||
|
nextButton[0].click()
|
||||||
|
|
||||||
|
await timeout(1000)
|
||||||
|
|
||||||
|
// Verify symbol length error since contract address won't return symbol
|
||||||
|
const errorMessage = $('.add-token__add-custom-error-message')
|
||||||
|
assert.ok(errorMessage[0], 'error rendered')
|
||||||
|
$('button.btn-cancel.add-token__button')[0].click()
|
||||||
|
|
||||||
|
await timeout(2000)
|
||||||
|
|
||||||
|
// // Confirm Add token
|
||||||
|
// assert.equal(
|
||||||
|
// $('.add-token__description')[0].textContent,
|
||||||
|
// 'Would you like to add these tokens?',
|
||||||
|
// 'confirm add token rendered'
|
||||||
|
// )
|
||||||
|
// assert.ok($('button.btn-clear.add-token__button')[0], 'confirm add token button found')
|
||||||
|
// $('button.btn-clear.add-token__button')[0].click()
|
||||||
|
|
||||||
|
// // Verify added token image
|
||||||
|
// heroBalance = $('.hero-balance')
|
||||||
|
// assert.ok(heroBalance, 'rendered hero balance')
|
||||||
|
// assert.ok(heroBalance.find('.identicon')[0], 'token added')
|
||||||
|
}
|
||||||
|
|
||||||
|
function timeout (time) {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
setTimeout(resolve, time || 1500)
|
||||||
|
})
|
||||||
|
}
|
||||||
67
test/integration/lib/confirm-sig-requests.js
Normal file
67
test/integration/lib/confirm-sig-requests.js
Normal file
@ -0,0 +1,67 @@
|
|||||||
|
const reactTriggerChange = require('react-trigger-change')
|
||||||
|
|
||||||
|
const PASSWORD = 'password123'
|
||||||
|
|
||||||
|
QUnit.module('confirm sig requests')
|
||||||
|
|
||||||
|
QUnit.test('successful confirmation of sig requests', (assert) => {
|
||||||
|
const done = assert.async()
|
||||||
|
runConfirmSigRequestsTest(assert).then(done).catch((err) => {
|
||||||
|
assert.notOk(err, `Error was thrown: ${err.stack}`)
|
||||||
|
done()
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
async function runConfirmSigRequestsTest(assert, done) {
|
||||||
|
let selectState = $('select')
|
||||||
|
selectState.val('confirm sig requests')
|
||||||
|
reactTriggerChange(selectState[0])
|
||||||
|
|
||||||
|
await timeout(2000)
|
||||||
|
|
||||||
|
let confirmSigHeadline = $('.request-signature__headline')
|
||||||
|
assert.equal(confirmSigHeadline[0].textContent, 'Your signature is being requested')
|
||||||
|
|
||||||
|
let confirmSigRowValue = $('.request-signature__row-value')
|
||||||
|
assert.ok(confirmSigRowValue[0].textContent.match(/^\#\sTerms\sof\sUse/))
|
||||||
|
|
||||||
|
let confirmSigSignButton = $('.request-signature__footer__sign-button')
|
||||||
|
confirmSigSignButton[0].click()
|
||||||
|
|
||||||
|
await timeout(2000)
|
||||||
|
|
||||||
|
confirmSigHeadline = $('.request-signature__headline')
|
||||||
|
assert.equal(confirmSigHeadline[0].textContent, 'Your signature is being requested')
|
||||||
|
|
||||||
|
let confirmSigMessage = $('.request-signature__notice')
|
||||||
|
assert.ok(confirmSigMessage[0].textContent.match(/^Signing\sthis\smessage/))
|
||||||
|
|
||||||
|
confirmSigRowValue = $('.request-signature__row-value')
|
||||||
|
assert.equal(confirmSigRowValue[0].textContent, '0x879a053d4800c6354e76c7985a865d2922c82fb5b3f4577b2fe08b998954f2e0')
|
||||||
|
|
||||||
|
confirmSigSignButton = $('.request-signature__footer__sign-button')
|
||||||
|
confirmSigSignButton[0].click()
|
||||||
|
|
||||||
|
await timeout(2000)
|
||||||
|
|
||||||
|
confirmSigHeadline = $('.request-signature__headline')
|
||||||
|
assert.equal(confirmSigHeadline[0].textContent, 'Your signature is being requested')
|
||||||
|
|
||||||
|
confirmSigRowValue = $('.request-signature__row-value')
|
||||||
|
assert.equal(confirmSigRowValue[0].textContent, 'Hi, Alice!')
|
||||||
|
assert.equal(confirmSigRowValue[1].textContent, '1337')
|
||||||
|
|
||||||
|
confirmSigSignButton = $('.request-signature__footer__sign-button')
|
||||||
|
confirmSigSignButton[0].click()
|
||||||
|
|
||||||
|
await timeout(2000)
|
||||||
|
|
||||||
|
const txView = $('.tx-view')
|
||||||
|
assert.ok(txView[0], 'Should return to the account details screen after confirming')
|
||||||
|
}
|
||||||
|
|
||||||
|
function timeout (time) {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
setTimeout(resolve, time || 1500)
|
||||||
|
})
|
||||||
|
}
|
||||||
@ -1,3 +1,4 @@
|
|||||||
|
const reactTriggerChange = require('react-trigger-change')
|
||||||
const PASSWORD = 'password123'
|
const PASSWORD = 'password123'
|
||||||
const runMascaraFirstTimeTest = require('./mascara-first-time')
|
const runMascaraFirstTimeTest = require('./mascara-first-time')
|
||||||
|
|
||||||
@ -16,6 +17,12 @@ async function runFirstTimeUsageTest(assert, done) {
|
|||||||
return runMascaraFirstTimeTest(assert, done)
|
return runMascaraFirstTimeTest(assert, done)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const selectState = $('select')
|
||||||
|
selectState.val('first time')
|
||||||
|
reactTriggerChange(selectState[0])
|
||||||
|
|
||||||
|
await timeout(2000)
|
||||||
|
|
||||||
const app = $('#app-content')
|
const app = $('#app-content')
|
||||||
|
|
||||||
// recurse notices
|
// recurse notices
|
||||||
|
|||||||
225
test/integration/lib/send-new-ui.js
Normal file
225
test/integration/lib/send-new-ui.js
Normal file
@ -0,0 +1,225 @@
|
|||||||
|
const reactTriggerChange = require('react-trigger-change')
|
||||||
|
|
||||||
|
const PASSWORD = 'password123'
|
||||||
|
|
||||||
|
QUnit.module('new ui send flow')
|
||||||
|
|
||||||
|
QUnit.test('successful send flow', (assert) => {
|
||||||
|
const done = assert.async()
|
||||||
|
runSendFlowTest(assert).then(done).catch((err) => {
|
||||||
|
assert.notOk(err, `Error was thrown: ${err.stack}`)
|
||||||
|
done()
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
global.ethQuery = {
|
||||||
|
sendTransaction: () => {},
|
||||||
|
}
|
||||||
|
|
||||||
|
async function runSendFlowTest(assert, done) {
|
||||||
|
console.log('*** start runSendFlowTest')
|
||||||
|
const selectState = $('select')
|
||||||
|
selectState.val('send new ui')
|
||||||
|
reactTriggerChange(selectState[0])
|
||||||
|
|
||||||
|
await timeout(2000)
|
||||||
|
|
||||||
|
const sendScreenButton = $('button.btn-clear.hero-balance-button')
|
||||||
|
assert.ok(sendScreenButton[1], 'send screen button present')
|
||||||
|
sendScreenButton[1].click()
|
||||||
|
|
||||||
|
await timeout(1000)
|
||||||
|
|
||||||
|
const sendTitle = $('.page-container__title')
|
||||||
|
assert.equal(sendTitle[0].textContent, 'Send ETH', 'Send screen title is correct')
|
||||||
|
|
||||||
|
const sendCopy = $('.page-container__subtitle')
|
||||||
|
assert.equal(sendCopy[0].textContent, 'Only send ETH to an Ethereum address.', 'Send screen has copy')
|
||||||
|
|
||||||
|
const sendFromField = $('.send-v2__form-field')
|
||||||
|
assert.ok(sendFromField[0], 'send screen has a from field')
|
||||||
|
|
||||||
|
let sendFromFieldItemAddress = $('.account-list-item__account-name')
|
||||||
|
assert.equal(sendFromFieldItemAddress[0].textContent, 'Send Account 4', 'send from field shows correct account name')
|
||||||
|
|
||||||
|
const sendFromFieldItem = $('.account-list-item')
|
||||||
|
sendFromFieldItem[0].click()
|
||||||
|
|
||||||
|
await timeout()
|
||||||
|
|
||||||
|
const sendFromDropdownList = $('.send-v2__from-dropdown__list')
|
||||||
|
assert.equal(sendFromDropdownList.children().length, 4, 'send from dropdown shows all accounts')
|
||||||
|
console.log(`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! sendFromDropdownList.children()[1]`, sendFromDropdownList.children()[1]);
|
||||||
|
sendFromDropdownList.children()[1].click()
|
||||||
|
|
||||||
|
await timeout()
|
||||||
|
|
||||||
|
sendFromFieldItemAddress = $('.account-list-item__account-name')
|
||||||
|
console.log(`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! sendFromFieldItemAddress[0]`, sendFromFieldItemAddress[0]);
|
||||||
|
assert.equal(sendFromFieldItemAddress[0].textContent, 'Send Account 2', 'send from field dropdown changes account name')
|
||||||
|
|
||||||
|
let sendToFieldInput = $('.send-v2__to-autocomplete__input')
|
||||||
|
sendToFieldInput[0].focus()
|
||||||
|
|
||||||
|
await timeout()
|
||||||
|
|
||||||
|
const sendToDropdownList = $('.send-v2__from-dropdown__list')
|
||||||
|
assert.equal(sendToDropdownList.children().length, 5, 'send to dropdown shows all accounts and address book accounts')
|
||||||
|
|
||||||
|
sendToDropdownList.children()[2].click()
|
||||||
|
|
||||||
|
await timeout()
|
||||||
|
|
||||||
|
const sendToAccountAddress = sendToFieldInput.val()
|
||||||
|
assert.equal(sendToAccountAddress, '0x2f8d4a878cfa04a6e60d46362f5644deab66572d', 'send to dropdown selects the correct address')
|
||||||
|
|
||||||
|
const sendAmountField = $('.send-v2__form-row:eq(2)')
|
||||||
|
sendAmountField.find('.currency-display')[0].click()
|
||||||
|
|
||||||
|
await timeout()
|
||||||
|
|
||||||
|
const sendAmountFieldInput = sendAmountField.find('input:text')
|
||||||
|
sendAmountFieldInput.val('5.1')
|
||||||
|
reactTriggerChange(sendAmountField.find('input')[0])
|
||||||
|
|
||||||
|
await timeout()
|
||||||
|
|
||||||
|
let errorMessage = $('.send-v2__error')
|
||||||
|
assert.equal(errorMessage[0].textContent, 'Insufficient funds.', 'send should render an insufficient fund error message')
|
||||||
|
|
||||||
|
sendAmountFieldInput.val('2.0')
|
||||||
|
reactTriggerChange(sendAmountFieldInput[0])
|
||||||
|
|
||||||
|
await timeout()
|
||||||
|
errorMessage = $('.send-v2__error')
|
||||||
|
assert.equal(errorMessage.length, 0, 'send should stop rendering amount error message after amount is corrected')
|
||||||
|
|
||||||
|
const sendGasField = $('.send-v2__gas-fee-display')
|
||||||
|
assert.equal(
|
||||||
|
sendGasField.find('.currency-display__input-wrapper > input').val(),
|
||||||
|
'0.000198',
|
||||||
|
'send gas field should show estimated gas total'
|
||||||
|
)
|
||||||
|
assert.equal(
|
||||||
|
sendGasField.find('.currency-display__converted-value')[0].textContent,
|
||||||
|
'0.24 USD',
|
||||||
|
'send gas field should show estimated gas total converted to USD'
|
||||||
|
)
|
||||||
|
|
||||||
|
const sendGasOpenCustomizeModalButton = $('.send-v2__sliders-icon-container'
|
||||||
|
)
|
||||||
|
sendGasOpenCustomizeModalButton[0].click()
|
||||||
|
|
||||||
|
await timeout(1000)
|
||||||
|
|
||||||
|
const customizeGasModal = $('.send-v2__customize-gas')
|
||||||
|
assert.ok(customizeGasModal[0], 'should render the customize gas modal')
|
||||||
|
|
||||||
|
const customizeGasPriceInput = $('.send-v2__gas-modal-card').first().find('input')
|
||||||
|
customizeGasPriceInput.val(50)
|
||||||
|
reactTriggerChange(customizeGasPriceInput[0])
|
||||||
|
const customizeGasLimitInput = $('.send-v2__gas-modal-card').last().find('input')
|
||||||
|
customizeGasLimitInput.val(60000)
|
||||||
|
reactTriggerChange(customizeGasLimitInput[0])
|
||||||
|
|
||||||
|
await timeout()
|
||||||
|
|
||||||
|
const customizeGasSaveButton = $('.send-v2__customize-gas__save')
|
||||||
|
customizeGasSaveButton[0].click()
|
||||||
|
|
||||||
|
await timeout()
|
||||||
|
|
||||||
|
assert.equal(
|
||||||
|
sendGasField.find('.currency-display__input-wrapper > input').val(),
|
||||||
|
'0.003',
|
||||||
|
'send gas field should show customized gas total'
|
||||||
|
)
|
||||||
|
assert.equal(
|
||||||
|
sendGasField.find('.currency-display__converted-value')[0].textContent,
|
||||||
|
'3.60 USD',
|
||||||
|
'send gas field should show customized gas total converted to USD'
|
||||||
|
)
|
||||||
|
|
||||||
|
const sendButton = $('button.btn-clear.page-container__footer-button')
|
||||||
|
assert.equal(sendButton[0].textContent, 'Next', 'next button rendered')
|
||||||
|
sendButton[0].click()
|
||||||
|
|
||||||
|
await timeout(2000)
|
||||||
|
|
||||||
|
selectState.val('send edit')
|
||||||
|
reactTriggerChange(selectState[0])
|
||||||
|
|
||||||
|
await timeout(2000)
|
||||||
|
|
||||||
|
const confirmFromName = $('.confirm-screen-account-name').first()
|
||||||
|
assert.equal(confirmFromName[0].textContent, 'Send Account 2', 'confirm screen should show correct from name')
|
||||||
|
|
||||||
|
const confirmToName = $('.confirm-screen-account-name').last()
|
||||||
|
assert.equal(confirmToName[0].textContent, 'Send Account 3', 'confirm screen should show correct to name')
|
||||||
|
|
||||||
|
const confirmScreenRows = $('.confirm-screen-rows')
|
||||||
|
const confirmScreenGas = confirmScreenRows.find('.confirm-screen-row-info')[2]
|
||||||
|
assert.equal(confirmScreenGas.textContent, '3.6 USD', 'confirm screen should show correct gas')
|
||||||
|
const confirmScreenTotal = confirmScreenRows.find('.confirm-screen-row-info')[3]
|
||||||
|
assert.equal(confirmScreenTotal.textContent, '2405.36 USD', 'confirm screen should show correct total')
|
||||||
|
|
||||||
|
const confirmScreenBackButton = $('.confirm-screen-back-button')
|
||||||
|
confirmScreenBackButton[0].click()
|
||||||
|
|
||||||
|
await timeout(1000)
|
||||||
|
|
||||||
|
const sendFromFieldItemInEdit = $('.account-list-item')
|
||||||
|
sendFromFieldItemInEdit[0].click()
|
||||||
|
|
||||||
|
await timeout()
|
||||||
|
|
||||||
|
const sendFromDropdownListInEdit = $('.send-v2__from-dropdown__list')
|
||||||
|
sendFromDropdownListInEdit.children()[2].click()
|
||||||
|
|
||||||
|
await timeout()
|
||||||
|
|
||||||
|
const sendToFieldInputInEdit = $('.send-v2__to-autocomplete__input')
|
||||||
|
sendToFieldInputInEdit[0].focus()
|
||||||
|
sendToFieldInputInEdit.val('0xd85a4b6a394794842887b8284293d69163007bbb')
|
||||||
|
|
||||||
|
await timeout()
|
||||||
|
|
||||||
|
const sendAmountFieldInEdit = $('.send-v2__form-row:eq(2)')
|
||||||
|
sendAmountFieldInEdit.find('.currency-display')[0].click()
|
||||||
|
|
||||||
|
await timeout()
|
||||||
|
|
||||||
|
const sendAmountFieldInputInEdit = sendAmountFieldInEdit.find('input:text')
|
||||||
|
sendAmountFieldInputInEdit.val('1.0')
|
||||||
|
reactTriggerChange(sendAmountFieldInputInEdit[0])
|
||||||
|
|
||||||
|
await timeout()
|
||||||
|
|
||||||
|
const sendButtonInEdit = $('.btn-clear.page-container__footer-button')
|
||||||
|
assert.equal(sendButtonInEdit[0].textContent, 'Next', 'next button in edit rendered')
|
||||||
|
sendButtonInEdit[0].click()
|
||||||
|
|
||||||
|
await timeout()
|
||||||
|
|
||||||
|
// TODO: Need a way to mock background so that we can test correct transition from editing to confirm
|
||||||
|
selectState.val('confirm new ui')
|
||||||
|
reactTriggerChange(selectState[0])
|
||||||
|
|
||||||
|
await timeout(2000)
|
||||||
|
const confirmScreenConfirmButton = $('.confirm-screen-confirm-button')
|
||||||
|
console.log(`+++++++++++++++++++++++++++++++= confirmScreenConfirmButton[0]`, confirmScreenConfirmButton[0]);
|
||||||
|
confirmScreenConfirmButton[0].click()
|
||||||
|
|
||||||
|
await timeout(2000)
|
||||||
|
|
||||||
|
const txView = $('.tx-view')
|
||||||
|
console.log(`++++++++++++++++++++++++++++++++ txView[0]`, txView[0]);
|
||||||
|
|
||||||
|
assert.ok(txView[0], 'Should return to the account details screen after confirming')
|
||||||
|
}
|
||||||
|
|
||||||
|
function timeout (time) {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
setTimeout(resolve, time || 1500)
|
||||||
|
})
|
||||||
|
}
|
||||||
@ -13,12 +13,7 @@ function AccountAndTransactionDetails () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
AccountAndTransactionDetails.prototype.render = function () {
|
AccountAndTransactionDetails.prototype.render = function () {
|
||||||
return h('div', {
|
return h('div.account-and-transaction-details', [
|
||||||
style: {
|
|
||||||
display: 'flex',
|
|
||||||
flex: '1 0 auto',
|
|
||||||
},
|
|
||||||
}, [
|
|
||||||
// wallet
|
// wallet
|
||||||
h(WalletView, {
|
h(WalletView, {
|
||||||
style: {
|
style: {
|
||||||
|
|||||||
@ -37,7 +37,7 @@ AccountImportSubview.prototype.render = function () {
|
|||||||
|
|
||||||
h('div.new-account-import-form__select-section', [
|
h('div.new-account-import-form__select-section', [
|
||||||
|
|
||||||
h('div.new-account-import-form__select-label', 'SELECT TYPE'),
|
h('div.new-account-import-form__select-label', 'Select Type'),
|
||||||
|
|
||||||
h(Select, {
|
h(Select, {
|
||||||
className: 'new-account-import-form__select',
|
className: 'new-account-import-form__select',
|
||||||
|
|||||||
@ -32,15 +32,20 @@ PrivateKeyImportView.prototype.render = function () {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
h('div.new-account-import-form__private-key', [
|
h('div.new-account-import-form__private-key', [
|
||||||
h('span.new-account-create-form__instruction', 'Paste your private key string here:'),
|
|
||||||
|
|
||||||
h('input.new-account-import-form__input-password', {
|
h('div.new-account-import-form__private-key-password-container', [
|
||||||
type: 'password',
|
|
||||||
id: 'private-key-box',
|
|
||||||
onKeyPress: () => this.createKeyringOnEnter(),
|
|
||||||
}),
|
|
||||||
|
|
||||||
h('div.new-account-create-form__buttons', {}, [
|
h('span.new-account-import-form__instruction', 'Paste your private key string here:'),
|
||||||
|
|
||||||
|
h('input.new-account-import-form__input-password', {
|
||||||
|
type: 'password',
|
||||||
|
id: 'private-key-box',
|
||||||
|
onKeyPress: () => this.createKeyringOnEnter(),
|
||||||
|
}),
|
||||||
|
|
||||||
|
]),
|
||||||
|
|
||||||
|
h('div.new-account-import-form__buttons', {}, [
|
||||||
|
|
||||||
h('button.new-account-create-form__button-cancel', {
|
h('button.new-account-create-form__button-cancel', {
|
||||||
onClick: () => goHome(),
|
onClick: () => goHome(),
|
||||||
|
|||||||
@ -7,16 +7,19 @@ const actions = require('../../actions')
|
|||||||
class NewAccountCreateForm extends Component {
|
class NewAccountCreateForm extends Component {
|
||||||
constructor (props) {
|
constructor (props) {
|
||||||
super(props)
|
super(props)
|
||||||
|
|
||||||
const { numberOfExistingAccounts = 0 } = props
|
const { numberOfExistingAccounts = 0 } = props
|
||||||
const newAccountNumber = numberOfExistingAccounts + 1
|
const newAccountNumber = numberOfExistingAccounts + 1
|
||||||
|
|
||||||
this.state = {
|
this.state = {
|
||||||
newAccountName: `Account ${newAccountNumber}`,
|
newAccountName: '',
|
||||||
|
defaultAccountName: `Account ${newAccountNumber}`,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
render () {
|
render () {
|
||||||
const { newAccountName } = this.state
|
const { newAccountName, defaultAccountName } = this.state
|
||||||
|
|
||||||
|
|
||||||
return h('div.new-account-create-form', [
|
return h('div.new-account-create-form', [
|
||||||
|
|
||||||
@ -26,8 +29,8 @@ class NewAccountCreateForm extends Component {
|
|||||||
|
|
||||||
h('div.new-account-create-form__input-wrapper', {}, [
|
h('div.new-account-create-form__input-wrapper', {}, [
|
||||||
h('input.new-account-create-form__input', {
|
h('input.new-account-create-form__input', {
|
||||||
value: this.state.newAccountName,
|
value: newAccountName,
|
||||||
placeholder: 'E.g. My new account',
|
placeholder: defaultAccountName,
|
||||||
onChange: event => this.setState({ newAccountName: event.target.value }),
|
onChange: event => this.setState({ newAccountName: event.target.value }),
|
||||||
}, []),
|
}, []),
|
||||||
]),
|
]),
|
||||||
@ -41,7 +44,7 @@ class NewAccountCreateForm extends Component {
|
|||||||
]),
|
]),
|
||||||
|
|
||||||
h('button.new-account-create-form__button-create', {
|
h('button.new-account-create-form__button-create', {
|
||||||
onClick: () => this.props.createAccount(newAccountName),
|
onClick: () => this.props.createAccount(newAccountName || defaultAccountName),
|
||||||
}, [
|
}, [
|
||||||
'CREATE',
|
'CREATE',
|
||||||
]),
|
]),
|
||||||
|
|||||||
@ -47,6 +47,8 @@ var actions = {
|
|||||||
SHOW_RESTORE_VAULT: 'SHOW_RESTORE_VAULT',
|
SHOW_RESTORE_VAULT: 'SHOW_RESTORE_VAULT',
|
||||||
FORGOT_PASSWORD: 'FORGOT_PASSWORD',
|
FORGOT_PASSWORD: 'FORGOT_PASSWORD',
|
||||||
forgotPassword: forgotPassword,
|
forgotPassword: forgotPassword,
|
||||||
|
markPasswordForgotten,
|
||||||
|
unMarkPasswordForgotten,
|
||||||
SHOW_INIT_MENU: 'SHOW_INIT_MENU',
|
SHOW_INIT_MENU: 'SHOW_INIT_MENU',
|
||||||
SHOW_NEW_VAULT_SEED: 'SHOW_NEW_VAULT_SEED',
|
SHOW_NEW_VAULT_SEED: 'SHOW_NEW_VAULT_SEED',
|
||||||
SHOW_INFO_PAGE: 'SHOW_INFO_PAGE',
|
SHOW_INFO_PAGE: 'SHOW_INFO_PAGE',
|
||||||
@ -55,6 +57,7 @@ var actions = {
|
|||||||
SET_NEW_ACCOUNT_FORM: 'SET_NEW_ACCOUNT_FORM',
|
SET_NEW_ACCOUNT_FORM: 'SET_NEW_ACCOUNT_FORM',
|
||||||
unlockMetamask: unlockMetamask,
|
unlockMetamask: unlockMetamask,
|
||||||
unlockFailed: unlockFailed,
|
unlockFailed: unlockFailed,
|
||||||
|
unlockSucceeded,
|
||||||
showCreateVault: showCreateVault,
|
showCreateVault: showCreateVault,
|
||||||
showRestoreVault: showRestoreVault,
|
showRestoreVault: showRestoreVault,
|
||||||
showInitializeMenu: showInitializeMenu,
|
showInitializeMenu: showInitializeMenu,
|
||||||
@ -80,6 +83,7 @@ var actions = {
|
|||||||
// unlock screen
|
// unlock screen
|
||||||
UNLOCK_IN_PROGRESS: 'UNLOCK_IN_PROGRESS',
|
UNLOCK_IN_PROGRESS: 'UNLOCK_IN_PROGRESS',
|
||||||
UNLOCK_FAILED: 'UNLOCK_FAILED',
|
UNLOCK_FAILED: 'UNLOCK_FAILED',
|
||||||
|
UNLOCK_SUCCEEDED: 'UNLOCK_SUCCEEDED',
|
||||||
UNLOCK_METAMASK: 'UNLOCK_METAMASK',
|
UNLOCK_METAMASK: 'UNLOCK_METAMASK',
|
||||||
LOCK_METAMASK: 'LOCK_METAMASK',
|
LOCK_METAMASK: 'LOCK_METAMASK',
|
||||||
tryUnlockMetamask: tryUnlockMetamask,
|
tryUnlockMetamask: tryUnlockMetamask,
|
||||||
@ -253,6 +257,9 @@ var actions = {
|
|||||||
updateFeatureFlags,
|
updateFeatureFlags,
|
||||||
UPDATE_FEATURE_FLAGS: 'UPDATE_FEATURE_FLAGS',
|
UPDATE_FEATURE_FLAGS: 'UPDATE_FEATURE_FLAGS',
|
||||||
|
|
||||||
|
setMouseUserState,
|
||||||
|
SET_MOUSE_USER_STATE: 'SET_MOUSE_USER_STATE',
|
||||||
|
|
||||||
// Network
|
// Network
|
||||||
setNetworkEndpoints,
|
setNetworkEndpoints,
|
||||||
updateNetworkEndpointType,
|
updateNetworkEndpointType,
|
||||||
@ -286,6 +293,7 @@ function tryUnlockMetamask (password) {
|
|||||||
if (err) {
|
if (err) {
|
||||||
dispatch(actions.unlockFailed(err.message))
|
dispatch(actions.unlockFailed(err.message))
|
||||||
} else {
|
} else {
|
||||||
|
dispatch(actions.unlockSucceeded())
|
||||||
dispatch(actions.transitionForward())
|
dispatch(actions.transitionForward())
|
||||||
forceUpdateMetamaskState(dispatch)
|
forceUpdateMetamaskState(dispatch)
|
||||||
}
|
}
|
||||||
@ -832,6 +840,28 @@ function showRestoreVault () {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function markPasswordForgotten () {
|
||||||
|
return (dispatch) => {
|
||||||
|
dispatch(actions.showLoadingIndication())
|
||||||
|
return background.markPasswordForgotten(() => {
|
||||||
|
dispatch(actions.hideLoadingIndication())
|
||||||
|
dispatch(actions.forgotPassword())
|
||||||
|
forceUpdateMetamaskState(dispatch)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function unMarkPasswordForgotten () {
|
||||||
|
return (dispatch) => {
|
||||||
|
dispatch(actions.showLoadingIndication())
|
||||||
|
return background.unMarkPasswordForgotten(() => {
|
||||||
|
dispatch(actions.hideLoadingIndication())
|
||||||
|
dispatch(actions.forgotPassword())
|
||||||
|
forceUpdateMetamaskState(dispatch)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function forgotPassword () {
|
function forgotPassword () {
|
||||||
return {
|
return {
|
||||||
type: actions.FORGOT_PASSWORD,
|
type: actions.FORGOT_PASSWORD,
|
||||||
@ -906,6 +936,13 @@ function unlockFailed (message) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function unlockSucceeded (message) {
|
||||||
|
return {
|
||||||
|
type: actions.UNLOCK_SUCCEEDED,
|
||||||
|
value: message,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function unlockMetamask (account) {
|
function unlockMetamask (account) {
|
||||||
return {
|
return {
|
||||||
type: actions.UNLOCK_METAMASK,
|
type: actions.UNLOCK_METAMASK,
|
||||||
@ -1627,6 +1664,13 @@ function updateFeatureFlags (updatedFeatureFlags) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function setMouseUserState (isMouseUser) {
|
||||||
|
return {
|
||||||
|
type: actions.SET_MOUSE_USER_STATE,
|
||||||
|
value: isMouseUser,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Call Background Then Update
|
// Call Background Then Update
|
||||||
//
|
//
|
||||||
// A function generator for a common pattern wherein:
|
// A function generator for a common pattern wherein:
|
||||||
|
|||||||
@ -80,11 +80,12 @@ function mapStateToProps (state) {
|
|||||||
menuOpen: state.appState.menuOpen,
|
menuOpen: state.appState.menuOpen,
|
||||||
network: state.metamask.network,
|
network: state.metamask.network,
|
||||||
provider: state.metamask.provider,
|
provider: state.metamask.provider,
|
||||||
forgottenPassword: state.appState.forgottenPassword,
|
forgottenPassword: state.metamask.forgottenPassword,
|
||||||
lastUnreadNotice: state.metamask.lastUnreadNotice,
|
lastUnreadNotice: state.metamask.lastUnreadNotice,
|
||||||
lostAccounts: state.metamask.lostAccounts,
|
lostAccounts: state.metamask.lostAccounts,
|
||||||
frequentRpcList: state.metamask.frequentRpcList || [],
|
frequentRpcList: state.metamask.frequentRpcList || [],
|
||||||
currentCurrency: state.metamask.currentCurrency,
|
currentCurrency: state.metamask.currentCurrency,
|
||||||
|
isMouseUser: state.appState.isMouseUser,
|
||||||
|
|
||||||
// state needed to get account dropdown temporarily rendering from app bar
|
// state needed to get account dropdown temporarily rendering from app bar
|
||||||
identities,
|
identities,
|
||||||
@ -101,6 +102,7 @@ function mapDispatchToProps (dispatch, ownProps) {
|
|||||||
hideNetworkDropdown: () => dispatch(actions.hideNetworkDropdown()),
|
hideNetworkDropdown: () => dispatch(actions.hideNetworkDropdown()),
|
||||||
setCurrentCurrencyToUSD: () => dispatch(actions.setCurrentCurrency('usd')),
|
setCurrentCurrencyToUSD: () => dispatch(actions.setCurrentCurrency('usd')),
|
||||||
toggleAccountMenu: () => dispatch(actions.toggleAccountMenu()),
|
toggleAccountMenu: () => dispatch(actions.toggleAccountMenu()),
|
||||||
|
setMouseUserState: (isMouseUser) => dispatch(actions.setMouseUserState(isMouseUser)),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -112,7 +114,13 @@ App.prototype.componentWillMount = function () {
|
|||||||
|
|
||||||
App.prototype.render = function () {
|
App.prototype.render = function () {
|
||||||
var props = this.props
|
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 isLoadingNetwork = network === 'loading' && props.currentView.name !== 'config'
|
||||||
const loadMessage = loadingMessage || isLoadingNetwork ?
|
const loadMessage = loadingMessage || isLoadingNetwork ?
|
||||||
`Connecting to ${this.getNetworkName()}` : null
|
`Connecting to ${this.getNetworkName()}` : null
|
||||||
@ -120,11 +128,19 @@ App.prototype.render = function () {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
h('.flex-column.full-height', {
|
h('.flex-column.full-height', {
|
||||||
|
className: classnames({ 'mouse-user-styles': isMouseUser }),
|
||||||
style: {
|
style: {
|
||||||
overflowX: 'hidden',
|
overflowX: 'hidden',
|
||||||
position: 'relative',
|
position: 'relative',
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
},
|
},
|
||||||
|
tabIndex: '0',
|
||||||
|
onClick: () => setMouseUserState(true),
|
||||||
|
onKeyDown: (e) => {
|
||||||
|
if (e.keyCode === 9) {
|
||||||
|
setMouseUserState(false)
|
||||||
|
}
|
||||||
|
},
|
||||||
}, [
|
}, [
|
||||||
|
|
||||||
// global modal
|
// global modal
|
||||||
@ -358,20 +374,12 @@ App.prototype.renderPrimary = function () {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// show initialize screen
|
if (props.isInitialized && props.forgottenPassword) {
|
||||||
if (!props.isInitialized || props.forgottenPassword) {
|
log.debug('rendering restore vault screen')
|
||||||
// show current view
|
return h(HDRestoreVaultScreen, {key: 'HDRestoreVaultScreen'})
|
||||||
log.debug('rendering an initialize screen')
|
} else if (!props.isInitialized) {
|
||||||
switch (props.currentView.name) {
|
log.debug('rendering menu screen')
|
||||||
|
return h(InitializeMenuScreen, {key: 'menuScreenInit'})
|
||||||
case 'restoreVault':
|
|
||||||
log.debug('rendering restore vault screen')
|
|
||||||
return h(HDRestoreVaultScreen, {key: 'HDRestoreVaultScreen'})
|
|
||||||
|
|
||||||
default:
|
|
||||||
log.debug('rendering menu screen')
|
|
||||||
return h(InitializeMenuScreen, {key: 'menuScreenInit'})
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// show unlock screen
|
// show unlock screen
|
||||||
|
|||||||
@ -80,23 +80,23 @@ AccountMenu.prototype.render = function () {
|
|||||||
h(Divider),
|
h(Divider),
|
||||||
h(Item, {
|
h(Item, {
|
||||||
onClick: () => showNewAccountPage('CREATE'),
|
onClick: () => showNewAccountPage('CREATE'),
|
||||||
icon: h('img', { src: 'images/plus-btn-white.svg' }),
|
icon: h('img.account-menu__item-icon', { src: 'images/plus-btn-white.svg' }),
|
||||||
text: 'Create Account',
|
text: 'Create Account',
|
||||||
}),
|
}),
|
||||||
h(Item, {
|
h(Item, {
|
||||||
onClick: () => showNewAccountPage('IMPORT'),
|
onClick: () => showNewAccountPage('IMPORT'),
|
||||||
icon: h('img', { src: 'images/import-account.svg' }),
|
icon: h('img.account-menu__item-icon', { src: 'images/import-account.svg' }),
|
||||||
text: 'Import Account',
|
text: 'Import Account',
|
||||||
}),
|
}),
|
||||||
h(Divider),
|
h(Divider),
|
||||||
h(Item, {
|
h(Item, {
|
||||||
onClick: showInfoPage,
|
onClick: showInfoPage,
|
||||||
icon: h('img', { src: 'images/mm-info-icon.svg' }),
|
icon: h('img.account-menu__item-icon', { src: 'images/mm-info-icon.svg' }),
|
||||||
text: 'Info & Help',
|
text: 'Info & Help',
|
||||||
}),
|
}),
|
||||||
h(Item, {
|
h(Item, {
|
||||||
onClick: showConfigPage,
|
onClick: showConfigPage,
|
||||||
icon: h('img', { src: 'images/settings.svg' }),
|
icon: h('img.account-menu__item-icon', { src: 'images/settings.svg' }),
|
||||||
text: 'Settings',
|
text: 'Settings',
|
||||||
}),
|
}),
|
||||||
])
|
])
|
||||||
|
|||||||
@ -18,6 +18,7 @@ const ShapeshiftDepositTxModal = require('./shapeshift-deposit-tx-modal.js')
|
|||||||
const HideTokenConfirmationModal = require('./hide-token-confirmation-modal')
|
const HideTokenConfirmationModal = require('./hide-token-confirmation-modal')
|
||||||
const CustomizeGasModal = require('../customize-gas-modal')
|
const CustomizeGasModal = require('../customize-gas-modal')
|
||||||
const NotifcationModal = require('./notification-modal')
|
const NotifcationModal = require('./notification-modal')
|
||||||
|
const ConfirmResetAccount = require('./notification-modals/confirm-reset-account')
|
||||||
|
|
||||||
const accountModalStyle = {
|
const accountModalStyle = {
|
||||||
mobileModalStyle: {
|
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: {
|
NEW_ACCOUNT: {
|
||||||
contents: [
|
contents: [
|
||||||
h(NewAccountModal, {}, []),
|
h(NewAccountModal, {}, []),
|
||||||
|
|||||||
@ -9,26 +9,47 @@ class NotificationModal extends Component {
|
|||||||
const {
|
const {
|
||||||
header,
|
header,
|
||||||
message,
|
message,
|
||||||
|
showCancelButton = false,
|
||||||
|
showConfirmButton = false,
|
||||||
|
hideModal,
|
||||||
|
onConfirm,
|
||||||
} = this.props
|
} = this.props
|
||||||
|
|
||||||
|
const showButtons = showCancelButton || showConfirmButton
|
||||||
|
|
||||||
return h('div', [
|
return h('div', [
|
||||||
h('div.notification-modal-wrapper', {
|
h('div.notification-modal__wrapper', {
|
||||||
}, [
|
}, [
|
||||||
|
|
||||||
h('div.notification-modal-header', {}, [
|
h('div.notification-modal__header', {}, [
|
||||||
header,
|
header,
|
||||||
]),
|
]),
|
||||||
|
|
||||||
h('div.notification-modal-message-wrapper', {}, [
|
h('div.notification-modal__message-wrapper', {}, [
|
||||||
h('div.notification-modal-message', {}, [
|
h('div.notification-modal__message', {}, [
|
||||||
message,
|
message,
|
||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
|
|
||||||
h('div.modal-close-x', {
|
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 = {
|
NotificationModal.propTypes = {
|
||||||
hideModal: PropTypes.func,
|
hideModal: PropTypes.func,
|
||||||
header: PropTypes.string,
|
header: PropTypes.string,
|
||||||
message: PropTypes.string,
|
message: PropTypes.node,
|
||||||
|
showCancelButton: PropTypes.bool,
|
||||||
|
showConfirmButton: PropTypes.bool,
|
||||||
|
onConfirm: PropTypes.func,
|
||||||
}
|
}
|
||||||
|
|
||||||
const mapDispatchToProps = dispatch => {
|
const mapDispatchToProps = dispatch => {
|
||||||
|
|||||||
@ -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)
|
||||||
@ -213,17 +213,15 @@ ConfirmSendEther.prototype.render = function () {
|
|||||||
this.inputs = []
|
this.inputs = []
|
||||||
|
|
||||||
return (
|
return (
|
||||||
h('div.confirm-screen-container.confirm-send-ether', {
|
h('div.confirm-screen-container.confirm-send-ether', [
|
||||||
style: { minWidth: '355px' },
|
|
||||||
}, [
|
|
||||||
// Main Send token Card
|
// Main Send token Card
|
||||||
h('div.confirm-screen-wrapper.flex-column.flex-grow', [
|
h('div.page-container', [
|
||||||
h('h3.flex-center.confirm-screen-header', [
|
h('div.page-container__header', [
|
||||||
h('button.btn-clear.confirm-screen-back-button', {
|
h('button.confirm-screen-back-button', {
|
||||||
onClick: () => editTransaction(txMeta),
|
onClick: () => editTransaction(txMeta),
|
||||||
}, 'EDIT'),
|
}, 'Edit'),
|
||||||
h('div.confirm-screen-title', 'Confirm Transaction'),
|
h('div.page-container__title', 'Confirm'),
|
||||||
h('div.confirm-screen-header-tip'),
|
h('div.page-container__subtitle', `Please review your transaction.`),
|
||||||
]),
|
]),
|
||||||
h('div.flex-row.flex-center.confirm-screen-identicons', [
|
h('div.flex-row.flex-center.confirm-screen-identicons', [
|
||||||
h('div.confirm-screen-account-wrapper', [
|
h('div.confirm-screen-account-wrapper', [
|
||||||
|
|||||||
@ -308,17 +308,15 @@ ConfirmSendToken.prototype.render = function () {
|
|||||||
this.inputs = []
|
this.inputs = []
|
||||||
|
|
||||||
return (
|
return (
|
||||||
h('div.confirm-screen-container.confirm-send-token', {
|
h('div.confirm-screen-container.confirm-send-token', [
|
||||||
style: { minWidth: '355px' },
|
|
||||||
}, [
|
|
||||||
// Main Send token Card
|
// Main Send token Card
|
||||||
h('div.confirm-screen-wrapper.flex-column.flex-grow', [
|
h('div.page-container', [
|
||||||
h('h3.flex-center.confirm-screen-header', [
|
h('div.page-container__header', [
|
||||||
h('button.btn-clear.confirm-screen-back-button', {
|
h('button.confirm-screen-back-button', {
|
||||||
onClick: () => editTransaction(txMeta),
|
onClick: () => editTransaction(txMeta),
|
||||||
}, 'EDIT'),
|
}, 'Edit'),
|
||||||
h('div.confirm-screen-title', 'Confirm Transaction'),
|
h('div.page-container__title', 'Confirm'),
|
||||||
h('div.confirm-screen-header-tip'),
|
h('div.page-container__subtitle', `Please review your transaction.`),
|
||||||
]),
|
]),
|
||||||
h('div.flex-row.flex-center.confirm-screen-identicons', [
|
h('div.flex-row.flex-center.confirm-screen-identicons', [
|
||||||
h('div.confirm-screen-account-wrapper', [
|
h('div.confirm-screen-account-wrapper', [
|
||||||
|
|||||||
@ -29,40 +29,35 @@ function ShiftListItem () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ShiftListItem.prototype.render = function () {
|
ShiftListItem.prototype.render = function () {
|
||||||
const { selectedAddress, receivingAddress } = this.props
|
return h('div.tx-list-item.tx-list-clickable', {
|
||||||
return (
|
style: {
|
||||||
selectedAddress === receivingAddress
|
paddingTop: '20px',
|
||||||
? h('div.tx-list-item.tx-list-clickable', {
|
paddingBottom: '20px',
|
||||||
|
justifyContent: 'space-around',
|
||||||
|
alignItems: 'center',
|
||||||
|
},
|
||||||
|
}, [
|
||||||
|
h('div', {
|
||||||
|
style: {
|
||||||
|
width: '0px',
|
||||||
|
position: 'relative',
|
||||||
|
bottom: '19px',
|
||||||
|
},
|
||||||
|
}, [
|
||||||
|
h('img', {
|
||||||
|
src: 'https://info.shapeshift.io/sites/default/files/logo.png',
|
||||||
style: {
|
style: {
|
||||||
paddingTop: '20px',
|
height: '35px',
|
||||||
paddingBottom: '20px',
|
width: '132px',
|
||||||
justifyContent: 'space-around',
|
position: 'absolute',
|
||||||
alignItems: 'center',
|
clip: 'rect(0px,23px,34px,0px)',
|
||||||
},
|
},
|
||||||
}, [
|
}),
|
||||||
h('div', {
|
]),
|
||||||
style: {
|
|
||||||
width: '0px',
|
|
||||||
position: 'relative',
|
|
||||||
bottom: '19px',
|
|
||||||
},
|
|
||||||
}, [
|
|
||||||
h('img', {
|
|
||||||
src: 'https://info.shapeshift.io/sites/default/files/logo.png',
|
|
||||||
style: {
|
|
||||||
height: '35px',
|
|
||||||
width: '132px',
|
|
||||||
position: 'absolute',
|
|
||||||
clip: 'rect(0px,23px,34px,0px)',
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
]),
|
|
||||||
|
|
||||||
this.renderInfo(),
|
this.renderInfo(),
|
||||||
this.renderUtilComponents(),
|
this.renderUtilComponents(),
|
||||||
])
|
])
|
||||||
: null
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function formatDate (date) {
|
function formatDate (date) {
|
||||||
|
|||||||
@ -111,20 +111,24 @@ TokenCell.prototype.render = function () {
|
|||||||
network,
|
network,
|
||||||
}),
|
}),
|
||||||
|
|
||||||
h('h.token-list-item__balance-wrapper', null, [
|
h('div.token-list-item__balance-ellipsis', null, [
|
||||||
h('h3.token-list-item__token-balance', `${string || 0} ${symbol}`),
|
h('div.token-list-item__balance-wrapper', null, [
|
||||||
|
h('h3.token-list-item__token-balance', `${string || 0} ${symbol}`),
|
||||||
|
|
||||||
|
showFiat && h('div.token-list-item__fiat-amount', {
|
||||||
|
style: {},
|
||||||
|
}, formattedFiat),
|
||||||
|
]),
|
||||||
|
|
||||||
|
h('i.fa.fa-ellipsis-h.fa-lg.token-list-item__ellipsis.cursor-pointer', {
|
||||||
|
onClick: (e) => {
|
||||||
|
e.stopPropagation()
|
||||||
|
this.setState({ tokenMenuOpen: true })
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
|
||||||
showFiat && h('div.token-list-item__fiat-amount', {
|
|
||||||
style: {},
|
|
||||||
}, formattedFiat),
|
|
||||||
]),
|
]),
|
||||||
|
|
||||||
h('i.fa.fa-ellipsis-h.fa-lg.token-list-item__ellipsis.cursor-pointer', {
|
|
||||||
onClick: (e) => {
|
|
||||||
e.stopPropagation()
|
|
||||||
this.setState({ tokenMenuOpen: true })
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
|
|
||||||
tokenMenuOpen && h(TokenMenuDropdown, {
|
tokenMenuOpen && h(TokenMenuDropdown, {
|
||||||
onClose: () => this.setState({ tokenMenuOpen: false }),
|
onClose: () => this.setState({ tokenMenuOpen: false }),
|
||||||
|
|||||||
31
ui/app/components/tooltip-v2.js
Normal file
31
ui/app/components/tooltip-v2.js
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
const Component = require('react').Component
|
||||||
|
const h = require('react-hyperscript')
|
||||||
|
const inherits = require('util').inherits
|
||||||
|
const ReactTippy = require('react-tippy').Tooltip
|
||||||
|
|
||||||
|
module.exports = Tooltip
|
||||||
|
|
||||||
|
inherits(Tooltip, Component)
|
||||||
|
function Tooltip () {
|
||||||
|
Component.call(this)
|
||||||
|
}
|
||||||
|
|
||||||
|
Tooltip.prototype.render = function () {
|
||||||
|
const props = this.props
|
||||||
|
const { position, title, children, wrapperClassName } = props
|
||||||
|
|
||||||
|
return h('div', {
|
||||||
|
className: wrapperClassName,
|
||||||
|
}, [
|
||||||
|
|
||||||
|
h(ReactTippy, {
|
||||||
|
title,
|
||||||
|
position: position || 'left',
|
||||||
|
trigger: 'mouseenter',
|
||||||
|
hideOnClick: false,
|
||||||
|
size: 'small',
|
||||||
|
arrow: true,
|
||||||
|
}, children),
|
||||||
|
|
||||||
|
])
|
||||||
|
}
|
||||||
@ -50,6 +50,7 @@ TxList.prototype.render = function () {
|
|||||||
|
|
||||||
TxList.prototype.renderTransaction = function () {
|
TxList.prototype.renderTransaction = function () {
|
||||||
const { txsToRender, conversionRate } = this.props
|
const { txsToRender, conversionRate } = this.props
|
||||||
|
|
||||||
return txsToRender.length
|
return txsToRender.length
|
||||||
? txsToRender.map((transaction, i) => this.renderTransactionListItem(transaction, conversionRate, i))
|
? txsToRender.map((transaction, i) => this.renderTransactionListItem(transaction, conversionRate, i))
|
||||||
: [h(
|
: [h(
|
||||||
@ -65,11 +66,7 @@ TxList.prototype.renderTransactionListItem = function (transaction, conversionRa
|
|||||||
// refer to transaction-list.js:line 58
|
// refer to transaction-list.js:line 58
|
||||||
|
|
||||||
if (transaction.key === 'shapeshift') {
|
if (transaction.key === 'shapeshift') {
|
||||||
return h('div', {
|
return h(ShiftListItem, { ...transaction, key: `shapeshift${index}` })
|
||||||
key: `shapeshift${index}`,
|
|
||||||
}, [
|
|
||||||
h(ShiftListItem, transaction),
|
|
||||||
])
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const props = {
|
const props = {
|
||||||
|
|||||||
@ -2,8 +2,10 @@ const Component = require('react').Component
|
|||||||
const connect = require('react-redux').connect
|
const connect = require('react-redux').connect
|
||||||
const h = require('react-hyperscript')
|
const h = require('react-hyperscript')
|
||||||
const inherits = require('util').inherits
|
const inherits = require('util').inherits
|
||||||
|
const classnames = require('classnames')
|
||||||
const Identicon = require('./identicon')
|
const Identicon = require('./identicon')
|
||||||
// const AccountDropdowns = require('./dropdowns/index.js').AccountDropdowns
|
// const AccountDropdowns = require('./dropdowns/index.js').AccountDropdowns
|
||||||
|
const Tooltip = require('./tooltip-v2.js')
|
||||||
const copyToClipboard = require('copy-to-clipboard')
|
const copyToClipboard = require('copy-to-clipboard')
|
||||||
const actions = require('../actions')
|
const actions = require('../actions')
|
||||||
const BalanceComponent = require('./balance-component')
|
const BalanceComponent = require('./balance-component')
|
||||||
@ -45,6 +47,7 @@ function WalletView () {
|
|||||||
Component.call(this)
|
Component.call(this)
|
||||||
this.state = {
|
this.state = {
|
||||||
hasCopied: false,
|
hasCopied: false,
|
||||||
|
copyToClipboardPressed: false,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -134,17 +137,30 @@ WalletView.prototype.render = function () {
|
|||||||
]),
|
]),
|
||||||
]),
|
]),
|
||||||
|
|
||||||
|
h(Tooltip, {
|
||||||
h('div.wallet-view__address', {
|
position: 'bottom',
|
||||||
onClick: () => {
|
title: this.state.hasCopied ? 'Copied!' : 'Copy to clipboard',
|
||||||
copyToClipboard(selectedAddress)
|
wrapperClassName: 'wallet-view__tooltip',
|
||||||
this.setState({ hasCopied: true })
|
|
||||||
setTimeout(() => this.setState({ hasCopied: false }), 3000)
|
|
||||||
},
|
|
||||||
}, [
|
}, [
|
||||||
this.state.hasCopied && 'Copied to Clipboard',
|
h('button.wallet-view__address', {
|
||||||
!this.state.hasCopied && `${selectedAddress.slice(0, 4)}...${selectedAddress.slice(-4)}`,
|
className: classnames({
|
||||||
h('i.fa.fa-clipboard', { style: { marginLeft: '8px' } }),
|
'wallet-view__address__pressed': this.state.copyToClipboardPressed,
|
||||||
|
}),
|
||||||
|
onClick: () => {
|
||||||
|
copyToClipboard(selectedAddress)
|
||||||
|
this.setState({ hasCopied: true })
|
||||||
|
setTimeout(() => this.setState({ hasCopied: false }), 3000)
|
||||||
|
},
|
||||||
|
onMouseDown: () => {
|
||||||
|
this.setState({ copyToClipboardPressed: true })
|
||||||
|
},
|
||||||
|
onMouseUp: () => {
|
||||||
|
this.setState({ copyToClipboardPressed: false })
|
||||||
|
},
|
||||||
|
}, [
|
||||||
|
`${selectedAddress.slice(0, 4)}...${selectedAddress.slice(-4)}`,
|
||||||
|
h('i.fa.fa-clipboard', { style: { marginLeft: '8px' } }),
|
||||||
|
]),
|
||||||
]),
|
]),
|
||||||
|
|
||||||
this.renderWalletBalance(),
|
this.renderWalletBalance(),
|
||||||
|
|||||||
@ -1 +1,7 @@
|
|||||||
// Base
|
// Base
|
||||||
|
|
||||||
|
.mouse-user-styles {
|
||||||
|
button:focus {
|
||||||
|
outline: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@ -43,7 +43,7 @@
|
|||||||
font-weight: 300;
|
font-weight: 300;
|
||||||
}
|
}
|
||||||
|
|
||||||
img {
|
&__item-icon {
|
||||||
width: 16px;
|
width: 16px;
|
||||||
height: 16px;
|
height: 16px;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -103,15 +103,13 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.confirm-screen-back-button {
|
.confirm-screen-back-button {
|
||||||
background: transparent;
|
color: $curious-blue;
|
||||||
left: 24px;
|
font-family: Roboto;
|
||||||
|
font-size: 1rem;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
padding: 6px 12px;
|
top: 38px;
|
||||||
font-size: .7rem;
|
right: 38px;
|
||||||
|
background: none;
|
||||||
@media screen and (max-width: $break-small) {
|
|
||||||
margin-right: 12px;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.confirm-screen-account-wrapper {
|
.confirm-screen-account-wrapper {
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
border: 1px solid $alto;
|
border: 1px solid $alto;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
background-color: $white;
|
background-color: $white;
|
||||||
color: $dusty-gray;
|
color: $scorpion;
|
||||||
font-family: Roboto;
|
font-family: Roboto;
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
font-weight: 300;
|
font-weight: 300;
|
||||||
@ -52,5 +52,6 @@
|
|||||||
|
|
||||||
&__currency-symbol {
|
&__currency-symbol {
|
||||||
margin-top: 1px;
|
margin-top: 1px;
|
||||||
|
color: $scorpion;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -71,6 +71,22 @@
|
|||||||
font-size: 105%;
|
font-size: 105%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media #{$sub-mid-size-breakpoint-range} {
|
||||||
|
margin-left: .4em;
|
||||||
|
margin-right: .4em;
|
||||||
|
justify-content: flex-start;
|
||||||
|
align-items: flex-start;
|
||||||
|
|
||||||
|
.token-amount {
|
||||||
|
font-size: 1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fiat-amount {
|
||||||
|
margin-top: .25%;
|
||||||
|
font-size: 1rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.hero-balance-buttons {
|
.hero-balance-buttons {
|
||||||
@ -91,4 +107,12 @@
|
|||||||
|
|
||||||
.hero-balance-button {
|
.hero-balance-button {
|
||||||
width: 6rem;
|
width: 6rem;
|
||||||
|
|
||||||
|
@media #{$sub-mid-size-breakpoint-range} {
|
||||||
|
padding: 0.4rem;
|
||||||
|
width: 4rem;
|
||||||
|
display: flex;
|
||||||
|
flex: 1;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -53,3 +53,5 @@
|
|||||||
@import './editable-label.scss';
|
@import './editable-label.scss';
|
||||||
|
|
||||||
@import './new-account.scss';
|
@import './new-account.scss';
|
||||||
|
|
||||||
|
@import './tooltip.scss';
|
||||||
|
|||||||
@ -547,38 +547,54 @@
|
|||||||
|
|
||||||
//Notification Modal
|
//Notification Modal
|
||||||
|
|
||||||
.notification-modal-wrapper {
|
.notification-modal {
|
||||||
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-header {
|
&__wrapper {
|
||||||
background: $wild-sand;
|
display: flex;
|
||||||
width: 100%;
|
flex-direction: column;
|
||||||
display: flex;
|
justify-content: flex-start;
|
||||||
justify-content: center;
|
align-items: center;
|
||||||
padding: 30px;
|
position: relative;
|
||||||
font-size: 22px;
|
border: 1px solid $alto;
|
||||||
color: $nile-blue;
|
box-shadow: 0 0 2px 2px $alto;
|
||||||
height: 79px;
|
font-family: Roboto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.notification-modal-message {
|
&__header {
|
||||||
padding: 20px;
|
background: $wild-sand;
|
||||||
}
|
width: 100%;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 30px;
|
||||||
|
font-size: 22px;
|
||||||
|
color: $nile-blue;
|
||||||
|
height: 79px;
|
||||||
|
}
|
||||||
|
|
||||||
.notification-modal-message {
|
&__message {
|
||||||
width: 100%;
|
padding: 20px;
|
||||||
display: flex;
|
width: 100%;
|
||||||
justify-content: center;
|
display: flex;
|
||||||
font-size: 17px;
|
justify-content: center;
|
||||||
color: $nile-blue;
|
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
|
// Deposit Ether Modal
|
||||||
|
|||||||
@ -55,11 +55,17 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.new-account-import-form {
|
.new-account-import-form {
|
||||||
|
display: flex;
|
||||||
|
flex-flow: column;
|
||||||
|
align-items: center;
|
||||||
|
padding: 0 30px;
|
||||||
|
|
||||||
&__select-section {
|
&__select-section {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-evenly;
|
justify-content: space-between;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
margin-top: 29px;
|
margin-top: 29px;
|
||||||
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
&__select-label {
|
&__select-label {
|
||||||
@ -91,19 +97,25 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&__private-key-password-container {
|
||||||
|
display: flex;
|
||||||
|
flex-flow: column;
|
||||||
|
align-items: center;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
&__instruction {
|
&__instruction {
|
||||||
color: $scorpion;
|
color: $scorpion;
|
||||||
font-family: Roboto;
|
font-family: Roboto;
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
line-height: 21px;
|
line-height: 21px;
|
||||||
align-self: flex-start;
|
align-self: flex-start;
|
||||||
margin-left: 30px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
&__private-key {
|
&__private-key {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-flow: column;
|
flex-flow: column;
|
||||||
align-items: center;
|
align-items: flex-start;
|
||||||
margin-top: 34px;
|
margin-top: 34px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -126,6 +138,13 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
margin-top: 29px;
|
margin-top: 29px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&__buttons {
|
||||||
|
margin-top: 39px;
|
||||||
|
display: flex;
|
||||||
|
width: 100%;
|
||||||
|
justify-content: space-between;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.new-account-create-form {
|
.new-account-create-form {
|
||||||
|
|||||||
@ -1,3 +1,6 @@
|
|||||||
|
$sub-mid-size-breakpoint: 667px;
|
||||||
|
$sub-mid-size-breakpoint-range: "screen and (min-width: #{$break-large}) and (max-width: #{$sub-mid-size-breakpoint})";
|
||||||
|
|
||||||
/*
|
/*
|
||||||
NewUI Container Elements
|
NewUI Container Elements
|
||||||
*/
|
*/
|
||||||
@ -20,6 +23,12 @@ $wallet-view-bg: $alabaster;
|
|||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Account and transaction details
|
||||||
|
.account-and-transaction-details {
|
||||||
|
display: flex;
|
||||||
|
flex: 1 0 auto;
|
||||||
|
}
|
||||||
|
|
||||||
// tx view
|
// tx view
|
||||||
|
|
||||||
.tx-view {
|
.tx-view {
|
||||||
@ -60,6 +69,10 @@ $wallet-view-bg: $alabaster;
|
|||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media #{$sub-mid-size-breakpoint-range} {
|
||||||
|
min-width: 160px;
|
||||||
|
}
|
||||||
|
|
||||||
.wallet-view-account-details {
|
.wallet-view-account-details {
|
||||||
flex: 0 0 auto;
|
flex: 0 0 auto;
|
||||||
}
|
}
|
||||||
@ -89,6 +102,13 @@ $wallet-view-bg: $alabaster;
|
|||||||
flex: 0 0 auto;
|
flex: 0 0 auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&__tooltip {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
padding: 24px;
|
||||||
|
}
|
||||||
|
|
||||||
&__address {
|
&__address {
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
background-color: $alto;
|
background-color: $alto;
|
||||||
@ -96,10 +116,13 @@ $wallet-view-bg: $alabaster;
|
|||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
line-height: 12px;
|
line-height: 12px;
|
||||||
padding: 4px 12px;
|
padding: 4px 12px;
|
||||||
margin: 24px auto;
|
|
||||||
font-weight: 300;
|
font-weight: 300;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
flex: 0 0 auto;
|
flex: 0 0 auto;
|
||||||
|
|
||||||
|
&__pressed {
|
||||||
|
background-color: $manatee,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&__sidebar-close {
|
&__sidebar-close {
|
||||||
|
|||||||
@ -533,7 +533,6 @@
|
|||||||
@media screen and (max-width: $break-small) {
|
@media screen and (max-width: $break-small) {
|
||||||
padding: 13px 0;
|
padding: 13px 0;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
height: 0;
|
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
flex: 1 1 auto;
|
flex: 1 1 auto;
|
||||||
}
|
}
|
||||||
@ -558,6 +557,25 @@
|
|||||||
|
|
||||||
&__form-field {
|
&__form-field {
|
||||||
flex: 1 1 auto;
|
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 {
|
&__form-label {
|
||||||
@ -566,6 +584,7 @@
|
|||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
line-height: 22px;
|
line-height: 22px;
|
||||||
width: 88px;
|
width: 88px;
|
||||||
|
font-weight: 400;
|
||||||
}
|
}
|
||||||
|
|
||||||
&__from-dropdown {
|
&__from-dropdown {
|
||||||
@ -621,7 +640,7 @@
|
|||||||
border: 1px solid $alto;
|
border: 1px solid $alto;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
background-color: $white;
|
background-color: $white;
|
||||||
color: $dusty-gray;
|
color: $tundora;
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
font-family: Roboto;
|
font-family: Roboto;
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
|
|||||||
@ -15,7 +15,7 @@ $wallet-balance-breakpoint-range: "screen and (min-width: #{$break-large}) and (
|
|||||||
font-size: 1.5rem;
|
font-size: 1.5rem;
|
||||||
|
|
||||||
@media #{$wallet-balance-breakpoint-range} {
|
@media #{$wallet-balance-breakpoint-range} {
|
||||||
font-size: 105%;
|
font-size: 95%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -41,17 +41,22 @@ $wallet-balance-breakpoint-range: "screen and (min-width: #{$break-large}) and (
|
|||||||
&__identicon {
|
&__identicon {
|
||||||
margin-right: 15px;
|
margin-right: 15px;
|
||||||
border: '1px solid #dedede';
|
border: '1px solid #dedede';
|
||||||
|
min-width: 50px;
|
||||||
|
|
||||||
@media #{$wallet-balance-breakpoint-range} {
|
@media #{$wallet-balance-breakpoint-range} {
|
||||||
margin-right: 4%;
|
margin-right: 4%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&__balance-ellipsis {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
&__ellipsis {
|
&__ellipsis {
|
||||||
// position: absolute;
|
|
||||||
// top: 20px;
|
|
||||||
// right: 24px;
|
|
||||||
line-height: 45px;
|
line-height: 45px;
|
||||||
|
margin-left: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
&__balance-wrapper {
|
&__balance-wrapper {
|
||||||
@ -61,7 +66,7 @@ $wallet-balance-breakpoint-range: "screen and (min-width: #{$break-large}) and (
|
|||||||
|
|
||||||
.token-menu-dropdown {
|
.token-menu-dropdown {
|
||||||
height: 55px;
|
height: 55px;
|
||||||
width: 191px;
|
width: 80%;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
background-color: rgba(0, 0, 0, .82);
|
background-color: rgba(0, 0, 0, .82);
|
||||||
box-shadow: 0 2px 4px 0 rgba(0, 0, 0, .5);
|
box-shadow: 0 2px 4px 0 rgba(0, 0, 0, .5);
|
||||||
@ -70,6 +75,10 @@ $wallet-balance-breakpoint-range: "screen and (min-width: #{$break-large}) and (
|
|||||||
right: 25px;
|
right: 25px;
|
||||||
z-index: 2000;
|
z-index: 2000;
|
||||||
|
|
||||||
|
@media #{$wallet-balance-breakpoint-range} {
|
||||||
|
right: 18px;
|
||||||
|
}
|
||||||
|
|
||||||
&__close-area {
|
&__close-area {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
top: 0;
|
top: 0;
|
||||||
@ -81,7 +90,7 @@ $wallet-balance-breakpoint-range: "screen and (min-width: #{$break-large}) and (
|
|||||||
}
|
}
|
||||||
|
|
||||||
&__container {
|
&__container {
|
||||||
padding: 16px 34px 32px;
|
padding: 16px;
|
||||||
z-index: 2200;
|
z-index: 2200;
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|||||||
7
ui/app/css/itcss/components/tooltip.scss
Normal file
7
ui/app/css/itcss/components/tooltip.scss
Normal file
File diff suppressed because one or more lines are too long
@ -69,3 +69,136 @@ textarea.large-input {
|
|||||||
input.large-input {
|
input.large-input {
|
||||||
height: 36px;
|
height: 36px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.page-container {
|
||||||
|
width: 400px;
|
||||||
|
background-color: $white;
|
||||||
|
box-shadow: 0 0 7px 0 rgba(0, 0, 0, .08);
|
||||||
|
z-index: 25;
|
||||||
|
display: flex;
|
||||||
|
flex-flow: column;
|
||||||
|
|
||||||
|
&__header {
|
||||||
|
display: flex;
|
||||||
|
flex-flow: column;
|
||||||
|
border-bottom: 1px solid $geyser;
|
||||||
|
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 {
|
||||||
|
display: flex;
|
||||||
|
flex-flow: row;
|
||||||
|
justify-content: center;
|
||||||
|
border-top: 1px solid $geyser;
|
||||||
|
padding: 1.6rem;
|
||||||
|
flex: 0 0 auto;
|
||||||
|
|
||||||
|
.btn-clear,
|
||||||
|
.btn-cancel {
|
||||||
|
font-size: 1rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&__footer-button {
|
||||||
|
width: 165px;
|
||||||
|
height: 60px;
|
||||||
|
font-size: 1rem;
|
||||||
|
text-transform: uppercase;
|
||||||
|
margin-right: 1rem;
|
||||||
|
border-radius: 2px;
|
||||||
|
|
||||||
|
&:last-of-type {
|
||||||
|
margin-right: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&__title {
|
||||||
|
color: $black;
|
||||||
|
font-family: Roboto;
|
||||||
|
font-size: 2rem;
|
||||||
|
font-weight: 500;
|
||||||
|
line-height: initial;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__subtitle {
|
||||||
|
padding-top: .5rem;
|
||||||
|
line-height: initial;
|
||||||
|
font-size: .9rem;
|
||||||
|
color: $gray;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__tabs {
|
||||||
|
padding: 0 1.3rem;
|
||||||
|
display: flex;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__tab {
|
||||||
|
min-width: 5rem;
|
||||||
|
padding: .2rem .8rem .9rem;
|
||||||
|
color: $dusty-gray;
|
||||||
|
font-family: Roboto;
|
||||||
|
font-size: 1.1rem;
|
||||||
|
line-height: initial;
|
||||||
|
text-align: center;
|
||||||
|
cursor: pointer;
|
||||||
|
border-bottom: none;
|
||||||
|
margin-right: 1rem;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
color: $black;
|
||||||
|
}
|
||||||
|
|
||||||
|
&:last-of-type {
|
||||||
|
margin-right: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
&--selected {
|
||||||
|
color: $curious-blue;
|
||||||
|
border-bottom: 3px solid $curious-blue;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
color: $curious-blue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media screen and (max-width: 250px) {
|
||||||
|
.page-container {
|
||||||
|
&__footer {
|
||||||
|
flex-flow: column-reverse;
|
||||||
|
}
|
||||||
|
|
||||||
|
&__footer-button {
|
||||||
|
width: 100%;
|
||||||
|
margin-bottom: 1rem;
|
||||||
|
margin-right: 0;
|
||||||
|
|
||||||
|
&:first-of-type {
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media screen and (max-width: 575px) {
|
||||||
|
.page-container {
|
||||||
|
height: 100%;
|
||||||
|
width: 100%;
|
||||||
|
overflow-y: auto;
|
||||||
|
background-color: $white;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@ -107,6 +107,7 @@ RestoreVaultScreen.prototype.render = function () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
RestoreVaultScreen.prototype.showInitializeMenu = function () {
|
RestoreVaultScreen.prototype.showInitializeMenu = function () {
|
||||||
|
this.props.dispatch(actions.unMarkPasswordForgotten())
|
||||||
if (this.props.forgottenPassword) {
|
if (this.props.forgottenPassword) {
|
||||||
this.props.dispatch(actions.backToUnlockView())
|
this.props.dispatch(actions.backToUnlockView())
|
||||||
} else {
|
} else {
|
||||||
@ -149,6 +150,9 @@ RestoreVaultScreen.prototype.createNewVaultAndRestore = function () {
|
|||||||
this.warning = null
|
this.warning = null
|
||||||
this.props.dispatch(actions.displayWarning(this.warning))
|
this.props.dispatch(actions.displayWarning(this.warning))
|
||||||
this.props.dispatch(actions.createNewVaultAndRestore(password, seed))
|
this.props.dispatch(actions.createNewVaultAndRestore(password, seed))
|
||||||
|
.then(() => {
|
||||||
|
this.props.dispatch(actions.unMarkPasswordForgotten())
|
||||||
|
})
|
||||||
.catch((err) => {
|
.catch((err) => {
|
||||||
log.error(err.message)
|
log.error(err.message)
|
||||||
})
|
})
|
||||||
|
|||||||
@ -2,7 +2,6 @@ const Component = require('react').Component
|
|||||||
const h = require('react-hyperscript')
|
const h = require('react-hyperscript')
|
||||||
const inherits = require('util').inherits
|
const inherits = require('util').inherits
|
||||||
const AccountAndTransactionDetails = require('./account-and-transaction-details')
|
const AccountAndTransactionDetails = require('./account-and-transaction-details')
|
||||||
const HDRestoreVaultScreen = require('./keychains/hd/restore-vault')
|
|
||||||
const Settings = require('./settings')
|
const Settings = require('./settings')
|
||||||
const UnlockScreen = require('./unlock')
|
const UnlockScreen = require('./unlock')
|
||||||
|
|
||||||
@ -28,13 +27,6 @@ MainContainer.prototype.render = function () {
|
|||||||
|
|
||||||
if (this.props.isUnlocked === false) {
|
if (this.props.isUnlocked === false) {
|
||||||
switch (this.props.currentViewName) {
|
switch (this.props.currentViewName) {
|
||||||
case 'restoreVault':
|
|
||||||
log.debug('rendering restore vault screen')
|
|
||||||
contents = {
|
|
||||||
component: HDRestoreVaultScreen,
|
|
||||||
key: 'HDRestoreVaultScreen',
|
|
||||||
}
|
|
||||||
break
|
|
||||||
case 'config':
|
case 'config':
|
||||||
log.debug('rendering config screen from unlock screen.')
|
log.debug('rendering config screen from unlock screen.')
|
||||||
return h(Settings, {key: 'config'})
|
return h(Settings, {key: 'config'})
|
||||||
|
|||||||
@ -59,6 +59,7 @@ function reduceApp (state, action) {
|
|||||||
// Used to display error text
|
// Used to display error text
|
||||||
warning: null,
|
warning: null,
|
||||||
buyView: {},
|
buyView: {},
|
||||||
|
isMouseUser: false,
|
||||||
}, state.appState)
|
}, state.appState)
|
||||||
|
|
||||||
switch (action.type) {
|
switch (action.type) {
|
||||||
@ -484,6 +485,11 @@ function reduceApp (state, action) {
|
|||||||
warning: action.value || 'Incorrect password. Try again.',
|
warning: action.value || 'Incorrect password. Try again.',
|
||||||
})
|
})
|
||||||
|
|
||||||
|
case actions.UNLOCK_SUCCEEDED:
|
||||||
|
return extend(appState, {
|
||||||
|
warning: '',
|
||||||
|
})
|
||||||
|
|
||||||
case actions.SHOW_LOADING:
|
case actions.SHOW_LOADING:
|
||||||
return extend(appState, {
|
return extend(appState, {
|
||||||
isLoading: true,
|
isLoading: true,
|
||||||
@ -653,6 +659,12 @@ function reduceApp (state, action) {
|
|||||||
data: action.value.data,
|
data: action.value.data,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
case actions.SET_MOUSE_USER_STATE:
|
||||||
|
return extend(appState, {
|
||||||
|
isMouseUser: action.value,
|
||||||
|
})
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return appState
|
return appState
|
||||||
}
|
}
|
||||||
|
|||||||
@ -116,7 +116,7 @@ function transactionsSelector (state) {
|
|||||||
// console.log({txsToRender, selectedTokenAddress})
|
// console.log({txsToRender, selectedTokenAddress})
|
||||||
return selectedTokenAddress
|
return selectedTokenAddress
|
||||||
? txsToRender
|
? txsToRender
|
||||||
.filter(({ txParams: { to } }) => to === selectedTokenAddress)
|
.filter(({ txParams }) => txParams && txParams.to === selectedTokenAddress)
|
||||||
.sort((a, b) => b.time - a.time)
|
.sort((a, b) => b.time - a.time)
|
||||||
: txsToRender
|
: txsToRender
|
||||||
.sort((a, b) => b.time - a.time)
|
.sort((a, b) => b.time - a.time)
|
||||||
@ -179,11 +179,11 @@ function autoAddToBetaUI (state) {
|
|||||||
(numberOfAccounts > autoAddAccountsThreshold) &&
|
(numberOfAccounts > autoAddAccountsThreshold) &&
|
||||||
(numberOfTokensAdded > autoAddTokensThreshold)
|
(numberOfTokensAdded > autoAddTokensThreshold)
|
||||||
const userIsNotInBeta = !state.metamask.featureFlags.betaUI
|
const userIsNotInBeta = !state.metamask.featureFlags.betaUI
|
||||||
|
|
||||||
return userIsNotInBeta && userPassesThreshold
|
return userIsNotInBeta && userPassesThreshold
|
||||||
}
|
}
|
||||||
|
|
||||||
function getCurrentViewContext (state) {
|
function getCurrentViewContext (state) {
|
||||||
const { currentView = {} } = state.appState
|
const { currentView = {} } = state.appState
|
||||||
return currentView.context
|
return currentView.context
|
||||||
}
|
}
|
||||||
@ -5,7 +5,6 @@ const h = require('react-hyperscript')
|
|||||||
const ethAbi = require('ethereumjs-abi')
|
const ethAbi = require('ethereumjs-abi')
|
||||||
const ethUtil = require('ethereumjs-util')
|
const ethUtil = require('ethereumjs-util')
|
||||||
|
|
||||||
const Identicon = require('./components/identicon')
|
|
||||||
const FromDropdown = require('./components/send/from-dropdown')
|
const FromDropdown = require('./components/send/from-dropdown')
|
||||||
const ToAutoComplete = require('./components/send/to-autocomplete')
|
const ToAutoComplete = require('./components/send/to-autocomplete')
|
||||||
const CurrencyDisplay = require('./components/send/currency-display')
|
const CurrencyDisplay = require('./components/send/currency-display')
|
||||||
@ -179,52 +178,22 @@ SendTransactionScreen.prototype.componentDidUpdate = function (prevProps) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SendTransactionScreen.prototype.renderHeaderIcon = function () {
|
SendTransactionScreen.prototype.renderHeader = function () {
|
||||||
const { selectedToken } = this.props
|
const { selectedToken, clearSend, goHome } = this.props
|
||||||
|
|
||||||
return h('div.send-v2__send-header-icon-container', [
|
|
||||||
selectedToken
|
|
||||||
? h(Identicon, {
|
|
||||||
diameter: 40,
|
|
||||||
address: selectedToken.address,
|
|
||||||
})
|
|
||||||
: h('img.send-v2__send-header-icon', { src: '../images/eth_logo.svg' }),
|
|
||||||
])
|
|
||||||
}
|
|
||||||
|
|
||||||
SendTransactionScreen.prototype.renderTitle = function () {
|
|
||||||
const { selectedToken } = this.props
|
|
||||||
|
|
||||||
return h('div.send-v2__title', [selectedToken ? 'Send Tokens' : 'Send Funds'])
|
|
||||||
}
|
|
||||||
|
|
||||||
SendTransactionScreen.prototype.renderCopy = function () {
|
|
||||||
const { selectedToken } = this.props
|
|
||||||
|
|
||||||
const tokenText = selectedToken ? 'tokens' : 'ETH'
|
const tokenText = selectedToken ? 'tokens' : 'ETH'
|
||||||
|
|
||||||
return h('div.send-v2__form-header-copy', [
|
return h('div.page-container__header', [
|
||||||
|
|
||||||
h('div.send-v2__copy', `Only send ${tokenText} to an Ethereum address.`),
|
h('div.page-container__title', selectedToken ? 'Send Tokens' : 'Send ETH'),
|
||||||
|
|
||||||
h('div.send-v2__copy', 'Sending to a different crytpocurrency that is not Ethereum may result in permanent loss.'),
|
h('div.page-container__subtitle', `Only send ${tokenText} to an Ethereum address.`),
|
||||||
|
|
||||||
])
|
h('div.page-container__header-close', {
|
||||||
}
|
onClick: () => {
|
||||||
|
clearSend()
|
||||||
SendTransactionScreen.prototype.renderHeader = function () {
|
goHome()
|
||||||
return h('div', [
|
},
|
||||||
h('div.send-v2__header', {}, [
|
}),
|
||||||
|
|
||||||
this.renderHeaderIcon(),
|
|
||||||
|
|
||||||
h('div.send-v2__arrow-background', [
|
|
||||||
h('i.fa.fa-lg.fa-arrow-circle-right.send-v2__send-arrow-icon'),
|
|
||||||
]),
|
|
||||||
|
|
||||||
h('div.send-v2__header-tip'),
|
|
||||||
|
|
||||||
]),
|
|
||||||
|
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
@ -504,14 +473,6 @@ SendTransactionScreen.prototype.renderMemoRow = function () {
|
|||||||
SendTransactionScreen.prototype.renderForm = function () {
|
SendTransactionScreen.prototype.renderForm = function () {
|
||||||
return h('div.send-v2__form', {}, [
|
return h('div.send-v2__form', {}, [
|
||||||
|
|
||||||
h('div.sendV2__form-header', [
|
|
||||||
|
|
||||||
this.renderTitle(),
|
|
||||||
|
|
||||||
this.renderCopy(),
|
|
||||||
|
|
||||||
]),
|
|
||||||
|
|
||||||
this.renderFromRow(),
|
this.renderFromRow(),
|
||||||
|
|
||||||
this.renderToRow(),
|
this.renderToRow(),
|
||||||
@ -535,14 +496,14 @@ SendTransactionScreen.prototype.renderFooter = function () {
|
|||||||
|
|
||||||
const noErrors = !amountError && toError === null
|
const noErrors = !amountError && toError === null
|
||||||
|
|
||||||
return h('div.send-v2__footer', [
|
return h('div.page-container__footer', [
|
||||||
h('button.btn-cancel.send-v2__cancel-btn', {
|
h('button.btn-cancel.page-container__footer-button', {
|
||||||
onClick: () => {
|
onClick: () => {
|
||||||
clearSend()
|
clearSend()
|
||||||
goHome()
|
goHome()
|
||||||
},
|
},
|
||||||
}, 'Cancel'),
|
}, 'Cancel'),
|
||||||
h('button.btn-clear.send-v2__next-btn', {
|
h('button.btn-clear.page-container__footer-button', {
|
||||||
disabled: !noErrors || !gasTotal,
|
disabled: !noErrors || !gasTotal,
|
||||||
onClick: event => this.onSubmit(event),
|
onClick: event => this.onSubmit(event),
|
||||||
}, 'Next'),
|
}, 'Next'),
|
||||||
@ -552,7 +513,7 @@ SendTransactionScreen.prototype.renderFooter = function () {
|
|||||||
SendTransactionScreen.prototype.render = function () {
|
SendTransactionScreen.prototype.render = function () {
|
||||||
return (
|
return (
|
||||||
|
|
||||||
h('div.send-v2__container', [
|
h('div.page-container', [
|
||||||
|
|
||||||
this.renderHeader(),
|
this.renderHeader(),
|
||||||
|
|
||||||
|
|||||||
@ -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 () {
|
renderSettingsContent () {
|
||||||
const { warning, isMascara } = this.props
|
const { warning, isMascara } = this.props
|
||||||
|
|
||||||
@ -262,6 +280,7 @@ class Settings extends Component {
|
|||||||
this.renderStateLogs(),
|
this.renderStateLogs(),
|
||||||
this.renderSeedWords(),
|
this.renderSeedWords(),
|
||||||
!isMascara && this.renderOldUI(),
|
!isMascara && this.renderOldUI(),
|
||||||
|
this.renderResetAccount(),
|
||||||
this.renderBlockieOptIn(),
|
this.renderBlockieOptIn(),
|
||||||
])
|
])
|
||||||
)
|
)
|
||||||
@ -387,6 +406,7 @@ Settings.propTypes = {
|
|||||||
displayWarning: PropTypes.func,
|
displayWarning: PropTypes.func,
|
||||||
revealSeedConfirmation: PropTypes.func,
|
revealSeedConfirmation: PropTypes.func,
|
||||||
setFeatureFlagToBeta: PropTypes.func,
|
setFeatureFlagToBeta: PropTypes.func,
|
||||||
|
showResetAccountConfirmationModal: PropTypes.func,
|
||||||
warning: PropTypes.string,
|
warning: PropTypes.string,
|
||||||
goHome: PropTypes.func,
|
goHome: PropTypes.func,
|
||||||
isMascara: PropTypes.bool,
|
isMascara: PropTypes.bool,
|
||||||
@ -412,6 +432,9 @@ const mapDispatchToProps = dispatch => {
|
|||||||
return dispatch(actions.setFeatureFlag('betaUI', false, 'OLD_UI_NOTIFICATION_MODAL'))
|
return dispatch(actions.setFeatureFlag('betaUI', false, 'OLD_UI_NOTIFICATION_MODAL'))
|
||||||
.then(() => dispatch(actions.setNetworkEndpoints(OLD_UI_NETWORK_TYPE)))
|
.then(() => dispatch(actions.setNetworkEndpoints(OLD_UI_NETWORK_TYPE)))
|
||||||
},
|
},
|
||||||
|
showResetAccountConfirmationModal: () => {
|
||||||
|
return dispatch(actions.showModal({ name: 'CONFIRM_RESET_ACCOUNT' }))
|
||||||
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -5,6 +5,7 @@ const connect = require('react-redux').connect
|
|||||||
const actions = require('./actions')
|
const actions = require('./actions')
|
||||||
const getCaretCoordinates = require('textarea-caret')
|
const getCaretCoordinates = require('textarea-caret')
|
||||||
const EventEmitter = require('events').EventEmitter
|
const EventEmitter = require('events').EventEmitter
|
||||||
|
const { OLD_UI_NETWORK_TYPE } = require('../../app/scripts/config').enums
|
||||||
|
|
||||||
const Mascot = require('./components/mascot')
|
const Mascot = require('./components/mascot')
|
||||||
|
|
||||||
@ -74,7 +75,10 @@ UnlockScreen.prototype.render = function () {
|
|||||||
|
|
||||||
h('.flex-row.flex-center.flex-grow', [
|
h('.flex-row.flex-center.flex-grow', [
|
||||||
h('p.pointer', {
|
h('p.pointer', {
|
||||||
onClick: () => this.props.dispatch(actions.forgotPassword()),
|
onClick: () => {
|
||||||
|
this.props.dispatch(actions.markPasswordForgotten())
|
||||||
|
global.platform.openExtensionInBrowser()
|
||||||
|
},
|
||||||
style: {
|
style: {
|
||||||
fontSize: '0.8em',
|
fontSize: '0.8em',
|
||||||
color: 'rgb(247, 134, 28)',
|
color: 'rgb(247, 134, 28)',
|
||||||
@ -82,6 +86,22 @@ UnlockScreen.prototype.render = function () {
|
|||||||
},
|
},
|
||||||
}, 'Restore from seed phrase'),
|
}, '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'),
|
||||||
|
]),
|
||||||
|
|
||||||
])
|
])
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
65
yarn.lock
65
yarn.lock
@ -531,7 +531,7 @@ async-eventemitter@^0.2.2:
|
|||||||
dependencies:
|
dependencies:
|
||||||
async "^2.4.0"
|
async "^2.4.0"
|
||||||
|
|
||||||
async-eventemitter@ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c, "async-eventemitter@github:ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c":
|
async-eventemitter@ahultgren/async-eventemitter#fa06e39e56786ba541c180061dbf2c0a5bbf951c:
|
||||||
version "0.2.3"
|
version "0.2.3"
|
||||||
resolved "https://codeload.github.com/ahultgren/async-eventemitter/tar.gz/fa06e39e56786ba541c180061dbf2c0a5bbf951c"
|
resolved "https://codeload.github.com/ahultgren/async-eventemitter/tar.gz/fa06e39e56786ba541c180061dbf2c0a5bbf951c"
|
||||||
dependencies:
|
dependencies:
|
||||||
@ -2428,6 +2428,24 @@ component-inherit@0.0.3:
|
|||||||
version "0.0.3"
|
version "0.0.3"
|
||||||
resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
|
resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
|
||||||
|
|
||||||
|
compressible@~2.0.11:
|
||||||
|
version "2.0.12"
|
||||||
|
resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.12.tgz#c59a5c99db76767e9876500e271ef63b3493bd66"
|
||||||
|
dependencies:
|
||||||
|
mime-db ">= 1.30.0 < 2"
|
||||||
|
|
||||||
|
compression@^1.7.1:
|
||||||
|
version "1.7.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.1.tgz#eff2603efc2e22cf86f35d2eb93589f9875373db"
|
||||||
|
dependencies:
|
||||||
|
accepts "~1.3.4"
|
||||||
|
bytes "3.0.0"
|
||||||
|
compressible "~2.0.11"
|
||||||
|
debug "2.6.9"
|
||||||
|
on-headers "~1.0.1"
|
||||||
|
safe-buffer "5.1.1"
|
||||||
|
vary "~1.1.2"
|
||||||
|
|
||||||
concat-map@0.0.1:
|
concat-map@0.0.1:
|
||||||
version "0.0.1"
|
version "0.0.1"
|
||||||
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
|
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
|
||||||
@ -3783,7 +3801,7 @@ eth-json-rpc-filters@^1.2.5:
|
|||||||
json-rpc-engine "^3.4.0"
|
json-rpc-engine "^3.4.0"
|
||||||
lodash.flatmap "^4.5.0"
|
lodash.flatmap "^4.5.0"
|
||||||
|
|
||||||
eth-json-rpc-infura@^2.0.7:
|
eth-json-rpc-infura@^2.0.11:
|
||||||
version "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"
|
resolved "https://registry.yarnpkg.com/eth-json-rpc-infura/-/eth-json-rpc-infura-2.0.11.tgz#134bf54ff15e96a9116424c0db9b66aa079bfbbe"
|
||||||
dependencies:
|
dependencies:
|
||||||
@ -6335,7 +6353,7 @@ json-rpc-engine@^3.0.1, json-rpc-engine@^3.1.0, json-rpc-engine@^3.4.0:
|
|||||||
json-rpc-error "^2.0.0"
|
json-rpc-error "^2.0.0"
|
||||||
promise-to-callback "^1.0.0"
|
promise-to-callback "^1.0.0"
|
||||||
|
|
||||||
json-rpc-engine@^3.5.0, json-rpc-engine@^3.6.0:
|
json-rpc-engine@^3.6.0:
|
||||||
version "3.6.0"
|
version "3.6.0"
|
||||||
resolved "https://registry.yarnpkg.com/json-rpc-engine/-/json-rpc-engine-3.6.0.tgz#0cc673dcb4b71103523fec81d1bba195a457f993"
|
resolved "https://registry.yarnpkg.com/json-rpc-engine/-/json-rpc-engine-3.6.0.tgz#0cc673dcb4b71103523fec81d1bba195a457f993"
|
||||||
dependencies:
|
dependencies:
|
||||||
@ -6345,6 +6363,16 @@ json-rpc-engine@^3.5.0, json-rpc-engine@^3.6.0:
|
|||||||
json-rpc-error "^2.0.0"
|
json-rpc-error "^2.0.0"
|
||||||
promise-to-callback "^1.0.0"
|
promise-to-callback "^1.0.0"
|
||||||
|
|
||||||
|
json-rpc-engine@^3.6.1:
|
||||||
|
version "3.6.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/json-rpc-engine/-/json-rpc-engine-3.6.1.tgz#f53084726dc6dedeead0e2c457eeb997135f1e25"
|
||||||
|
dependencies:
|
||||||
|
async "^2.0.1"
|
||||||
|
babel-preset-env "^1.3.2"
|
||||||
|
babelify "^7.3.0"
|
||||||
|
json-rpc-error "^2.0.0"
|
||||||
|
promise-to-callback "^1.0.0"
|
||||||
|
|
||||||
json-rpc-error@^2.0.0:
|
json-rpc-error@^2.0.0:
|
||||||
version "2.0.0"
|
version "2.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/json-rpc-error/-/json-rpc-error-2.0.0.tgz#a7af9c202838b5e905c7250e547f1aff77258a02"
|
resolved "https://registry.yarnpkg.com/json-rpc-error/-/json-rpc-error-2.0.0.tgz#a7af9c202838b5e905c7250e547f1aff77258a02"
|
||||||
@ -7292,6 +7320,10 @@ miller-rabin@^4.0.0:
|
|||||||
bn.js "^4.0.0"
|
bn.js "^4.0.0"
|
||||||
brorand "^1.0.1"
|
brorand "^1.0.1"
|
||||||
|
|
||||||
|
"mime-db@>= 1.30.0 < 2":
|
||||||
|
version "1.32.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.32.0.tgz#485b3848b01a3cda5f968b4882c0771e58e09414"
|
||||||
|
|
||||||
mime-db@~1.30.0:
|
mime-db@~1.30.0:
|
||||||
version "1.30.0"
|
version "1.30.0"
|
||||||
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
|
resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
|
||||||
@ -7971,6 +8003,10 @@ on-finished@~2.3.0:
|
|||||||
dependencies:
|
dependencies:
|
||||||
ee-first "1.1.1"
|
ee-first "1.1.1"
|
||||||
|
|
||||||
|
on-headers@~1.0.1:
|
||||||
|
version "1.0.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
|
||||||
|
|
||||||
once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.3.3, once@^1.4.0:
|
once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.3.3, once@^1.4.0:
|
||||||
version "1.4.0"
|
version "1.4.0"
|
||||||
resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
|
resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
|
||||||
@ -8391,6 +8427,10 @@ polyfill-crypto.getrandomvalues@^1.0.0:
|
|||||||
dependencies:
|
dependencies:
|
||||||
mersenne-twister "^1.0.1"
|
mersenne-twister "^1.0.1"
|
||||||
|
|
||||||
|
popper.js@^1.11.1:
|
||||||
|
version "1.13.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.13.0.tgz#e1e7ff65cc43f7cf9cf16f1510a75e81f84f4565"
|
||||||
|
|
||||||
portfinder@~0.2.1:
|
portfinder@~0.2.1:
|
||||||
version "0.2.1"
|
version "0.2.1"
|
||||||
resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-0.2.1.tgz#b2b9b0164f9e17fa3a9c7db2304d0a75140c71ad"
|
resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-0.2.1.tgz#b2b9b0164f9e17fa3a9c7db2304d0a75140c71ad"
|
||||||
@ -8915,6 +8955,12 @@ react-testutils-additions@^15.2.0:
|
|||||||
object-assign "3.0.0"
|
object-assign "3.0.0"
|
||||||
sizzle "2.3.3"
|
sizzle "2.3.3"
|
||||||
|
|
||||||
|
react-tippy@^1.2.2:
|
||||||
|
version "1.2.2"
|
||||||
|
resolved "https://registry.yarnpkg.com/react-tippy/-/react-tippy-1.2.2.tgz#061467d34d29e7a5a9421822d125c451d6bb5153"
|
||||||
|
dependencies:
|
||||||
|
popper.js "^1.11.1"
|
||||||
|
|
||||||
react-toggle-button@^2.2.0:
|
react-toggle-button@^2.2.0:
|
||||||
version "2.2.0"
|
version "2.2.0"
|
||||||
resolved "https://registry.yarnpkg.com/react-toggle-button/-/react-toggle-button-2.2.0.tgz#a1b92143aa0df414642fcb141f0879f545bc5a89"
|
resolved "https://registry.yarnpkg.com/react-toggle-button/-/react-toggle-button-2.2.0.tgz#a1b92143aa0df414642fcb141f0879f545bc5a89"
|
||||||
@ -8933,6 +8979,13 @@ react-tooltip-component@^0.3.0:
|
|||||||
version "0.3.0"
|
version "0.3.0"
|
||||||
resolved "https://registry.yarnpkg.com/react-tooltip-component/-/react-tooltip-component-0.3.0.tgz#fb3ec78c3270fe919692bc31f1404108bcf4785e"
|
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:
|
react-transition-group@^1.2.0:
|
||||||
version "1.2.1"
|
version "1.2.1"
|
||||||
resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-1.2.1.tgz#e11f72b257f921b213229a774df46612346c7ca6"
|
resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-1.2.1.tgz#e11f72b257f921b213229a774df46612346c7ca6"
|
||||||
@ -11423,9 +11476,9 @@ web3-provider-engine@^13.3.2:
|
|||||||
xhr "^2.2.0"
|
xhr "^2.2.0"
|
||||||
xtend "^4.0.1"
|
xtend "^4.0.1"
|
||||||
|
|
||||||
web3-provider-engine@^13.5.0:
|
web3-provider-engine@^13.5.6:
|
||||||
version "13.5.6"
|
version "13.6.0"
|
||||||
resolved "https://registry.yarnpkg.com/web3-provider-engine/-/web3-provider-engine-13.5.6.tgz#a321a2cf40db78fb478c2c20244c3195c48ef048"
|
resolved "https://registry.yarnpkg.com/web3-provider-engine/-/web3-provider-engine-13.6.0.tgz#836f51c4ee48bd7583acf3696033779c704c2214"
|
||||||
dependencies:
|
dependencies:
|
||||||
async "^2.5.0"
|
async "^2.5.0"
|
||||||
clone "^2.0.0"
|
clone "^2.0.0"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user