aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app
diff options
context:
space:
mode:
Diffstat (limited to 'ui/app')
-rw-r--r--ui/app/ducks/app/app.js22
-rw-r--r--ui/app/ducks/index.js9
-rw-r--r--ui/app/ducks/metamask/metamask.js17
-rw-r--r--ui/app/pages/home/home.component.js8
-rw-r--r--ui/app/pages/home/home.container.js2
-rw-r--r--ui/app/pages/routes/index.js6
-rw-r--r--ui/app/store/actions.js99
7 files changed, 6 insertions, 157 deletions
diff --git a/ui/app/ducks/app/app.js b/ui/app/ducks/app/app.js
index 04c8c7422..77d9116e5 100644
--- a/ui/app/ducks/app/app.js
+++ b/ui/app/ducks/app/app.js
@@ -27,13 +27,6 @@ function reduceApp (state, action) {
context: selectedAddress,
}
- // confirm seed words
- var seedWords = state.metamask.seedWords
- var seedConfView = {
- name: 'createVaultComplete',
- seedWords,
- }
-
// default state
var appState = extend({
shouldClose: false,
@@ -58,7 +51,7 @@ function reduceApp (state, action) {
alertMessage: null,
qrCodeData: null,
networkDropdownOpen: false,
- currentView: seedWords ? seedConfView : defaultView,
+ currentView: defaultView,
accountDetail: {
subview: 'transactions',
},
@@ -279,16 +272,6 @@ function reduceApp (state, action) {
isLoading: true,
})
- case actions.SHOW_NEW_VAULT_SEED:
- return extend(appState, {
- currentView: {
- name: 'createVaultComplete',
- seedWords: action.value,
- },
- transForward: true,
- isLoading: false,
- })
-
case actions.NEW_ACCOUNT_SCREEN:
return extend(appState, {
currentView: {
@@ -428,8 +411,7 @@ function reduceApp (state, action) {
case actions.SHOW_ACCOUNTS_PAGE:
return extend(appState, {
currentView: {
- name: seedWords ? 'createVaultComplete' : 'accounts',
- seedWords,
+ name: 'accounts',
},
transForward: true,
isLoading: false,
diff --git a/ui/app/ducks/index.js b/ui/app/ducks/index.js
index 2d33edcfa..18470c441 100644
--- a/ui/app/ducks/index.js
+++ b/ui/app/ducks/index.js
@@ -61,9 +61,6 @@ window.getCleanAppState = function () {
// append additional information
state.version = global.platform.getVersion()
state.browser = window.navigator.userAgent
- // ensure seedWords are not included
- if (state.metamask) delete state.metamask.seedWords
- if (state.appState.currentView) delete state.appState.currentView.seedWords
return state
}
@@ -72,7 +69,7 @@ window.logStateString = function (cb) {
global.platform.getPlatformInfo((err, platform) => {
if (err) return cb(err)
state.platform = platform
- const stateString = JSON.stringify(state, removeSeedWords, 2)
+ const stateString = JSON.stringify(state, null, 2)
cb(null, stateString)
})
}
@@ -89,7 +86,3 @@ window.logState = function (toClipboard) {
}
})
}
-
-function removeSeedWords (key, value) {
- return key === 'seedWords' ? undefined : value
-}
diff --git a/ui/app/ducks/metamask/metamask.js b/ui/app/ducks/metamask/metamask.js
index 64ce064b9..92f190cf1 100644
--- a/ui/app/ducks/metamask/metamask.js
+++ b/ui/app/ducks/metamask/metamask.js
@@ -44,7 +44,6 @@ function reduceMetamask (state, action) {
useBlockie: false,
featureFlags: {},
networkEndpointType: OLD_UI_NETWORK_TYPE,
- isRevealingSeedWords: false,
welcomeScreenSeen: false,
currentLocale: '',
preferences: {
@@ -60,13 +59,6 @@ function reduceMetamask (state, action) {
switch (action.type) {
- case actions.SHOW_ACCOUNTS_PAGE:
- newState = extend(metamaskState, {
- isRevealingSeedWords: false,
- })
- delete newState.seedWords
- return newState
-
case actions.UPDATE_METAMASK_STATE:
return extend(metamaskState, action.value)
@@ -128,20 +120,12 @@ function reduceMetamask (state, action) {
},
})
-
- case actions.SHOW_NEW_VAULT_SEED:
- return extend(metamaskState, {
- isRevealingSeedWords: true,
- seedWords: action.value,
- })
-
case actions.CLEAR_SEED_WORD_CACHE:
newState = extend(metamaskState, {
isUnlocked: true,
isInitialized: true,
selectedAddress: action.value,
})
- delete newState.seedWords
return newState
case actions.SHOW_ACCOUNT_DETAIL:
@@ -150,7 +134,6 @@ function reduceMetamask (state, action) {
isInitialized: true,
selectedAddress: action.value,
})
- delete newState.seedWords
return newState
case actions.SET_SELECTED_TOKEN:
diff --git a/ui/app/pages/home/home.component.js b/ui/app/pages/home/home.component.js
index 4d96c3131..01bec7db6 100644
--- a/ui/app/pages/home/home.component.js
+++ b/ui/app/pages/home/home.component.js
@@ -7,7 +7,6 @@ import TransactionView from '../../components/app/transaction-view'
import ProviderApproval from '../provider-approval'
import {
- INITIALIZE_SEED_PHRASE_ROUTE,
RESTORE_VAULT_ROUTE,
CONFIRM_TRANSACTION_ROUTE,
CONFIRM_ADD_SUGGESTED_TOKEN_ROUTE,
@@ -17,7 +16,6 @@ export default class Home extends PureComponent {
static propTypes = {
history: PropTypes.object,
forgottenPassword: PropTypes.bool,
- seedWords: PropTypes.string,
suggestedTokens: PropTypes.object,
unconfirmedTransactionsCount: PropTypes.number,
providerRequests: PropTypes.array,
@@ -49,16 +47,10 @@ export default class Home extends PureComponent {
render () {
const {
forgottenPassword,
- seedWords,
providerRequests,
history,
} = this.props
- // seed words
- if (seedWords) {
- return <Redirect to={{ pathname: INITIALIZE_SEED_PHRASE_ROUTE }}/>
- }
-
if (forgottenPassword) {
return <Redirect to={{ pathname: RESTORE_VAULT_ROUTE }} />
}
diff --git a/ui/app/pages/home/home.container.js b/ui/app/pages/home/home.container.js
index 7508654dc..a4690a17a 100644
--- a/ui/app/pages/home/home.container.js
+++ b/ui/app/pages/home/home.container.js
@@ -8,7 +8,6 @@ const mapStateToProps = state => {
const { metamask, appState } = state
const {
lostAccounts,
- seedWords,
suggestedTokens,
providerRequests,
} = metamask
@@ -17,7 +16,6 @@ const mapStateToProps = state => {
return {
lostAccounts,
forgottenPassword,
- seedWords,
suggestedTokens,
unconfirmedTransactionsCount: unconfirmedTransactionsCountSelector(state),
providerRequests,
diff --git a/ui/app/pages/routes/index.js b/ui/app/pages/routes/index.js
index 751e3e3ae..f89ab31e0 100644
--- a/ui/app/pages/routes/index.js
+++ b/ui/app/pages/routes/index.js
@@ -346,7 +346,6 @@ Routes.propTypes = {
forgottenPassword: PropTypes.bool,
activeAddress: PropTypes.string,
unapprovedTxs: PropTypes.object,
- seedWords: PropTypes.string,
submittedPendingTransactions: PropTypes.array,
unapprovedMsgCount: PropTypes.number,
unapprovedPersonalMsgCount: PropTypes.number,
@@ -380,7 +379,6 @@ function mapStateToProps (state) {
address,
keyrings,
isInitialized,
- seedWords,
unapprovedTxs,
lostAccounts,
unapprovedMsgCount,
@@ -404,9 +402,8 @@ function mapStateToProps (state) {
currentView: state.appState.currentView,
activeAddress: state.appState.activeAddress,
transForward: state.appState.transForward,
- isOnboarding: Boolean(seedWords || !isInitialized),
+ isOnboarding: Boolean(!isInitialized),
isPopup: state.metamask.isPopup,
- seedWords: state.metamask.seedWords,
submittedPendingTransactions: submittedPendingTransactionsSelector(state),
unapprovedTxs,
unapprovedMsgs: state.metamask.unapprovedMsgs,
@@ -421,7 +418,6 @@ function mapStateToProps (state) {
frequentRpcListDetail: state.metamask.frequentRpcListDetail || [],
currentCurrency: state.metamask.currentCurrency,
isMouseUser: state.appState.isMouseUser,
- isRevealingSeedWords: state.metamask.isRevealingSeedWords,
Qr: state.appState.Qr,
welcomeScreenSeen: state.metamask.welcomeScreenSeen,
providerId: getNetworkIdentifier(state),
diff --git a/ui/app/store/actions.js b/ui/app/store/actions.js
index 942a518db..f02cdd0fa 100644
--- a/ui/app/store/actions.js
+++ b/ui/app/store/actions.js
@@ -67,7 +67,6 @@ var actions = {
markPasswordForgotten,
unMarkPasswordForgotten,
SHOW_INIT_MENU: 'SHOW_INIT_MENU',
- SHOW_NEW_VAULT_SEED: 'SHOW_NEW_VAULT_SEED',
SHOW_INFO_PAGE: 'SHOW_INFO_PAGE',
SHOW_IMPORT_PAGE: 'SHOW_IMPORT_PAGE',
SHOW_NEW_ACCOUNT_PAGE: 'SHOW_NEW_ACCOUNT_PAGE',
@@ -81,7 +80,6 @@ var actions = {
showImportPage,
showNewAccountPage,
setNewAccountForm,
- createNewVaultAndKeychain: createNewVaultAndKeychain,
createNewVaultAndRestore: createNewVaultAndRestore,
createNewVaultInProgress: createNewVaultInProgress,
createNewVaultAndGetSeedPhrase,
@@ -97,14 +95,12 @@ var actions = {
navigateToNewAccountScreen,
resetAccount,
removeAccount,
- showNewVaultSeed: showNewVaultSeed,
showInfoPage: showInfoPage,
CLOSE_WELCOME_SCREEN: 'CLOSE_WELCOME_SCREEN',
closeWelcomeScreen,
// seed recovery actions
REVEAL_SEED_CONFIRMATION: 'REVEAL_SEED_CONFIRMATION',
revealSeedConfirmation: revealSeedConfirmation,
- requestRevealSeed: requestRevealSeed,
requestRevealSeedWords,
// unlock screen
UNLOCK_IN_PROGRESS: 'UNLOCK_IN_PROGRESS',
@@ -217,7 +213,6 @@ var actions = {
gasLoadingStarted,
gasLoadingFinished,
// app messages
- confirmSeedWords: confirmSeedWords,
showAccountDetail: showAccountDetail,
BACK_TO_ACCOUNT_DETAIL: 'BACK_TO_ACCOUNT_DETAIL',
backToAccountDetail: backToAccountDetail,
@@ -444,44 +439,18 @@ function transitionBackward () {
}
}
-function confirmSeedWords () {
- return dispatch => {
- dispatch(actions.showLoadingIndication())
- log.debug(`background.clearSeedWordCache`)
- return new Promise((resolve, reject) => {
- background.clearSeedWordCache((err, account) => {
- dispatch(actions.hideLoadingIndication())
- if (err) {
- dispatch(actions.displayWarning(err.message))
- return reject(err)
- }
-
- log.info('Seed word cache cleared. ' + account)
- dispatch(actions.showAccountsPage())
- resolve(account)
- })
- })
- }
-}
-
function createNewVaultAndRestore (password, seed) {
return (dispatch) => {
dispatch(actions.showLoadingIndication())
log.debug(`background.createNewVaultAndRestore`)
return new Promise((resolve, reject) => {
- background.clearSeedWordCache((err) => {
+ background.createNewVaultAndRestore(password, seed, (err) => {
if (err) {
return reject(err)
}
- background.createNewVaultAndRestore(password, seed, (err) => {
- if (err) {
- return reject(err)
- }
-
- resolve()
- })
+ resolve()
})
})
.then(() => dispatch(actions.unMarkPasswordForgotten()))
@@ -497,36 +466,6 @@ function createNewVaultAndRestore (password, seed) {
}
}
-function createNewVaultAndKeychain (password) {
- return dispatch => {
- dispatch(actions.showLoadingIndication())
- log.debug(`background.createNewVaultAndKeychain`)
-
- return new Promise((resolve, reject) => {
- background.createNewVaultAndKeychain(password, err => {
- if (err) {
- dispatch(actions.displayWarning(err.message))
- return reject(err)
- }
-
- log.debug(`background.placeSeedWords`)
-
- background.placeSeedWords((err) => {
- if (err) {
- dispatch(actions.displayWarning(err.message))
- return reject(err)
- }
-
- resolve()
- })
- })
- })
- .then(() => forceUpdateMetamaskState(dispatch))
- .then(() => dispatch(actions.hideLoadingIndication()))
- .catch(() => dispatch(actions.hideLoadingIndication()))
- }
-}
-
function createNewVaultAndGetSeedPhrase (password) {
return async dispatch => {
dispatch(actions.showLoadingIndication())
@@ -616,33 +555,6 @@ function verifySeedPhrase () {
})
}
-function requestRevealSeed (password) {
- return dispatch => {
- dispatch(actions.showLoadingIndication())
- log.debug(`background.submitPassword`)
- return new Promise((resolve, reject) => {
- background.submitPassword(password, err => {
- if (err) {
- dispatch(actions.displayWarning(err.message))
- return reject(err)
- }
-
- log.debug(`background.placeSeedWords`)
- background.placeSeedWords((err, result) => {
- if (err) {
- dispatch(actions.displayWarning(err.message))
- return reject(err)
- }
-
- dispatch(actions.showNewVaultSeed(result))
- dispatch(actions.hideLoadingIndication())
- resolve()
- })
- })
- })
- }
-}
-
function requestRevealSeedWords (password) {
return async dispatch => {
dispatch(actions.showLoadingIndication())
@@ -1531,13 +1443,6 @@ function createNewVaultInProgress () {
}
}
-function showNewVaultSeed (seed) {
- return {
- type: actions.SHOW_NEW_VAULT_SEED,
- value: seed,
- }
-}
-
function closeWelcomeScreen () {
return {
type: actions.CLOSE_WELCOME_SCREEN,
generated by cgit (git 2.34.1) at 2024-10-20 11:44:35 +0800