Merge pull request #3216 from danjm/MM-666-try-beta-link-unlock-privacy-screens

[NewUI] Try beta link on unlock and privacy screens.
feature/default_network_editable
Dan Finlay 7 years ago committed by GitHub
commit 96d40ee618
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 30
      old-ui/app/app.js
  2. 17
      ui/app/unlock.js

@ -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, {

@ -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')
@ -85,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'),
]),
]) ])
) )
} }

Loading…
Cancel
Save