Styling fixes to welcome; hide network component on create password; shown welcoem in popup.

feature/default_network_editable
Dan 7 years ago
parent 91c890041c
commit 0dad6db973
  1. 2
      mascara/src/app/first-time/create-password-screen.js
  2. 4
      ui/app/app.js
  3. 2
      ui/app/css/itcss/components/welcome-screen.scss
  4. 7
      ui/app/welcome-screen.js

@ -56,7 +56,7 @@ class CreatePasswordScreen extends Component {
render () { render () {
const { isLoading, goToImportWithSeedPhrase, isMascara } = this.props const { isLoading, goToImportWithSeedPhrase, isMascara } = this.props
//
return isLoading return isLoading
? <LoadingScreen loadingMessage="Creating your new account" /> ? <LoadingScreen loadingMessage="Creating your new account" />
: ( : (

@ -298,7 +298,7 @@ App.prototype.renderAppBar = function () {
]), ]),
]), ]),
h('div.header__right-actions', [ betaUI && isInitialized && h('div.header__right-actions', [
h('div.network-component-wrapper', { h('div.network-component-wrapper', {
style: {}, style: {},
}, [ }, [
@ -385,7 +385,7 @@ App.prototype.renderPrimary = function () {
const isMascaraOnboarding = isMascara && isOnboarding const isMascaraOnboarding = isMascara && isOnboarding
const isBetaUIOnboarding = betaUI && isOnboarding && !props.isPopup && !isRevealingSeedWords const isBetaUIOnboarding = betaUI && isOnboarding && !props.isPopup && !isRevealingSeedWords
if (!welcomeScreenSeen && isBetaUIOnboarding && !isInitialized && !isUnlocked) { if (!welcomeScreenSeen && betaUI && !isInitialized && !isUnlocked) {
return h(WelcomeScreen) return h(WelcomeScreen)
} }

@ -6,7 +6,7 @@
font-family: Roboto; font-family: Roboto;
font-weight: 400; font-weight: 400;
width: 100%; width: 100%;
height: 100%; flex: 1 0 auto;
padding: 70px 0; padding: 70px 0;
background: $white; background: $white;

@ -11,8 +11,8 @@ class WelcomeScreen extends Component {
closeWelcomeScreen: PropTypes.func.isRequired, closeWelcomeScreen: PropTypes.func.isRequired,
} }
constructor () { constructor(props) {
super() super(props)
this.animationEventEmitter = new EventEmitter() this.animationEventEmitter = new EventEmitter()
} }
@ -21,7 +21,6 @@ class WelcomeScreen extends Component {
} }
render () { render () {
// t
return h('div.welcome-screen', [ return h('div.welcome-screen', [
h('div.welcome-screen__info', [ h('div.welcome-screen__info', [
@ -32,7 +31,7 @@ class WelcomeScreen extends Component {
height: '225', height: '225',
}), }),
h('div.welcome-screen__info__header', 'Welcome to MetaMask Beta.'), h('div.welcome-screen__info__header', 'Welcome to MetaMask Beta'),
h('div.welcome-screen__info__copy', 'MetaMask is a secure identity vault for Ethereum.'), h('div.welcome-screen__info__copy', 'MetaMask is a secure identity vault for Ethereum.'),

Loading…
Cancel
Save