aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/first-time
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-10-13 07:31:15 +0800
committerDan Finlay <dan@danfinlay.com>2016-10-13 07:31:15 +0800
commit5c9969e126b1da153d8b0f969fbb430d7a146b14 (patch)
tree2551ee0c1827fe1ce825b29bf18f6089eddb94da /ui/app/first-time
parent535d832a64daa4d87367cd29042554f77f4e3dc2 (diff)
downloadtangerine-wallet-browser-5c9969e126b1da153d8b0f969fbb430d7a146b14.tar
tangerine-wallet-browser-5c9969e126b1da153d8b0f969fbb430d7a146b14.tar.gz
tangerine-wallet-browser-5c9969e126b1da153d8b0f969fbb430d7a146b14.tar.bz2
tangerine-wallet-browser-5c9969e126b1da153d8b0f969fbb430d7a146b14.tar.lz
tangerine-wallet-browser-5c9969e126b1da153d8b0f969fbb430d7a146b14.tar.xz
tangerine-wallet-browser-5c9969e126b1da153d8b0f969fbb430d7a146b14.tar.zst
tangerine-wallet-browser-5c9969e126b1da153d8b0f969fbb430d7a146b14.zip
Remove opinionated seed word code
Completely breaking all account maangement, I have removed the opinionated seed-word code from the UI. Web3 injection still seems to work.
Diffstat (limited to 'ui/app/first-time')
-rw-r--r--ui/app/first-time/create-vault-complete.js74
-rw-r--r--ui/app/first-time/init-menu.js20
-rw-r--r--ui/app/first-time/restore-vault.js148
3 files changed, 1 insertions, 241 deletions
diff --git a/ui/app/first-time/create-vault-complete.js b/ui/app/first-time/create-vault-complete.js
deleted file mode 100644
index 2b5413955..000000000
--- a/ui/app/first-time/create-vault-complete.js
+++ /dev/null
@@ -1,74 +0,0 @@
-const inherits = require('util').inherits
-const Component = require('react').Component
-const connect = require('react-redux').connect
-const h = require('react-hyperscript')
-const actions = require('../actions')
-
-module.exports = connect(mapStateToProps)(CreateVaultCompleteScreen)
-
-inherits(CreateVaultCompleteScreen, Component)
-function CreateVaultCompleteScreen () {
- Component.call(this)
-}
-
-function mapStateToProps (state) {
- return {
- seed: state.appState.currentView.seedWords,
- cachedSeed: state.metamask.seedWords,
- }
-}
-
-CreateVaultCompleteScreen.prototype.render = function () {
- var state = this.props
- var seed = state.seed || state.cachedSeed
-
- return (
-
- h('.initialize-screen.flex-column.flex-center.flex-grow', [
-
- // // subtitle and nav
- // h('.section-title.flex-row.flex-center', [
- // h('h2.page-subtitle', 'Vault Created'),
- // ]),
-
- h('h3.flex-center.text-transform-uppercase', {
- style: {
- background: '#EBEBEB',
- color: '#AEAEAE',
- marginTop: 36,
- marginBottom: 8,
- width: '100%',
- fontSize: '20px',
- padding: 6,
- },
- }, [
- 'Vault Created',
- ]),
-
- h('span.error', { // Error for the right red
- style: {
- padding: '12px 20px 0px 20px',
- textAlign: 'center',
- },
- }, 'These 12 words can restore all of your MetaMask accounts for this vault.\nSave them somewhere safe and secret.'),
-
- h('textarea.twelve-word-phrase', {
- readOnly: true,
- value: seed,
- }),
-
- h('button.primary', {
- onClick: () => this.confirmSeedWords(),
- style: {
- margin: '24px',
- fontSize: '0.9em',
- },
- }, 'I\'ve copied it somewhere safe'),
- ])
- )
-}
-
-CreateVaultCompleteScreen.prototype.confirmSeedWords = function () {
- this.props.dispatch(actions.confirmSeedWords())
-}
-
diff --git a/ui/app/first-time/init-menu.js b/ui/app/first-time/init-menu.js
index 94a9d3df6..9b733d0e7 100644
--- a/ui/app/first-time/init-menu.js
+++ b/ui/app/first-time/init-menu.js
@@ -63,33 +63,15 @@ InitializeMenuScreen.prototype.renderMenu = function () {
h('.flex-row.flex-center.flex-grow', [
h('hr'),
- h('div', 'OR'),
+ h('div', 'Advanced (Eventually?)'),
h('hr'),
]),
- h('button.primary', {
- onClick: this.showRestoreVault.bind(this),
- style: {
- margin: 12,
- },
- }, 'Restore Existing Vault'),
])
)
}
-// InitializeMenuScreen.prototype.splitWor = function() {
-// this.props.dispatch(actions.showInitializeMenu())
-// }
-
-InitializeMenuScreen.prototype.showInitializeMenu = function () {
- this.props.dispatch(actions.showInitializeMenu())
-}
-
InitializeMenuScreen.prototype.showCreateVault = function () {
this.props.dispatch(actions.showCreateVault())
}
-InitializeMenuScreen.prototype.showRestoreVault = function () {
- this.props.dispatch(actions.showRestoreVault())
-}
-
diff --git a/ui/app/first-time/restore-vault.js b/ui/app/first-time/restore-vault.js
deleted file mode 100644
index 4c1f21008..000000000
--- a/ui/app/first-time/restore-vault.js
+++ /dev/null
@@ -1,148 +0,0 @@
-const inherits = require('util').inherits
-const PersistentForm = require('../../lib/persistent-form')
-const connect = require('react-redux').connect
-const h = require('react-hyperscript')
-const actions = require('../actions')
-
-module.exports = connect(mapStateToProps)(RestoreVaultScreen)
-
-inherits(RestoreVaultScreen, PersistentForm)
-function RestoreVaultScreen () {
- PersistentForm.call(this)
-}
-
-function mapStateToProps (state) {
- return {
- warning: state.appState.warning,
- }
-}
-
-RestoreVaultScreen.prototype.render = function () {
- var state = this.props
- this.persistentFormParentId = 'restore-vault-form'
-
- return (
-
- h('.initialize-screen.flex-column.flex-center.flex-grow', [
-
- h('h3.flex-center.text-transform-uppercase', {
- style: {
- background: '#EBEBEB',
- color: '#AEAEAE',
- marginBottom: 24,
- width: '100%',
- fontSize: '20px',
- padding: 6,
- },
- }, [
- 'Restore Vault',
- ]),
-
- // wallet seed entry
- h('h3', 'Wallet Seed'),
- h('textarea.twelve-word-phrase.letter-spacey', {
- dataset: {
- persistentFormId: 'wallet-seed',
- },
- placeholder: 'Enter your secret twelve word phrase here to restore your vault.',
- }),
-
- // password
- h('input.large-input.letter-spacey', {
- type: 'password',
- id: 'password-box',
- placeholder: 'New Password (min 8 chars)',
- dataset: {
- persistentFormId: 'password',
- },
- style: {
- width: 260,
- marginTop: 12,
- },
- }),
-
- // confirm password
- h('input.large-input.letter-spacey', {
- type: 'password',
- id: 'password-box-confirm',
- placeholder: 'Confirm Password',
- onKeyPress: this.onMaybeCreate.bind(this),
- dataset: {
- persistentFormId: 'password-confirmation',
- },
- style: {
- width: 260,
- marginTop: 16,
- },
- }),
-
- (state.warning) && (
- h('span.error.in-progress-notification', state.warning)
- ),
-
- // submit
-
- h('.flex-row.flex-space-between', {
- style: {
- marginTop: 30,
- width: '50%',
- },
- }, [
-
- // cancel
- h('button.primary', {
- onClick: this.showInitializeMenu.bind(this),
- }, 'CANCEL'),
-
- // submit
- h('button.primary', {
- onClick: this.restoreVault.bind(this),
- }, 'OK'),
-
- ]),
-
- ])
-
- )
-}
-
-RestoreVaultScreen.prototype.showInitializeMenu = function () {
- this.props.dispatch(actions.showInitializeMenu())
-}
-
-RestoreVaultScreen.prototype.onMaybeCreate = function (event) {
- if (event.key === 'Enter') {
- this.restoreVault()
- }
-}
-
-RestoreVaultScreen.prototype.restoreVault = function () {
- // check password
- var passwordBox = document.getElementById('password-box')
- var password = passwordBox.value
- var passwordConfirmBox = document.getElementById('password-box-confirm')
- var passwordConfirm = passwordConfirmBox.value
- if (password.length < 8) {
- this.warning = 'Password not long enough'
-
- this.props.dispatch(actions.displayWarning(this.warning))
- return
- }
- if (password !== passwordConfirm) {
- this.warning = 'Passwords don\'t match'
- this.props.dispatch(actions.displayWarning(this.warning))
- return
- }
- // check seed
- var seedBox = document.querySelector('textarea.twelve-word-phrase')
- var seed = seedBox.value.trim()
- if (seed.split(' ').length !== 12) {
- this.warning = 'seed phrases are 12 words long'
- this.props.dispatch(actions.displayWarning(this.warning))
- return
- }
- // submit
- this.warning = null
- this.props.dispatch(actions.displayWarning(this.warning))
- this.props.dispatch(actions.recoverFromSeed(password, seed))
-}