Skip to content
Permalink
Browse files

Fix gun issue (#691)

* Revert "624 Splash + About: background texture should be at 40% opacity (#669)"

This reverts commit fa819b5.

* fix: redundant initanalytics
  • Loading branch information...
sirpy committed Oct 6, 2019
1 parent 93b9aac commit 0d5798203e0d9c03235ce2cac8d0bd76a44985d0

Large diffs are not rendered by default.

@@ -1,7 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="652.606" height="461.495" viewBox="0 0 652.606 461.495">
<defs>
<style>
.a{fill:#fff;}.b{fill:none;}.c{clip-path:url(#a);}.d{clip-path:url(#b);}
.a{fill:#fff;}.b{fill:none;}.c{clip-path:url(#a);}.d{opacity:0.5;clip-path:url(#b);}
</style>
<clipPath id="a">
<rect width="461.495" height="652.606" class="b"/>
@@ -1,5 +1,5 @@
import React from 'react'
import { Image, StyleSheet, View } from 'react-native'
import { Image, StyleSheet } from 'react-native'
import splashImage from '../../assets/Splash/logo.svg'
import goodDollarImage from '../../assets/Splash/goodDollar.svg'
import wavePattern from '../../assets/wave50.svg'
@@ -16,7 +16,6 @@ Image.prefetch(wavePattern)
const About = () => (
<Wrapper style={styles.wrapper}>
<Section style={styles.container}>
<View style={styles.backgroundWaves} />
<Section.Stack style={styles.content} grow justifyContent="space-between">
<Section.Text fontSize={22} color="darkBlue">
Welcome to
@@ -48,19 +47,12 @@ const styles = StyleSheet.create({
container: {
alignItems: 'center',
justifyContent: 'center',
backgroundColor: 'transparent',
transform: [{ rotateY: '180deg' }],
position: 'relative',
flex: 1,
},
backgroundWaves: {
position: 'absolute',
width: '100%',
height: '100%',
backgroundImage: `url(${wavePattern})`,
backgroundRepeat: 'repeat-y',
backgroundColor: 'transparent',
backgroundSize: 'cover',
opacity: 0.4,
transform: [{ rotateY: '180deg' }],
flex: 1,
},
content: {
transform: [{ rotateY: '180deg' }],
@@ -59,6 +59,9 @@ exports[`About matches snapshot 1`] = `
"WebkitTransform": "rotateY(180deg)",
"alignItems": "center",
"backgroundColor": "rgba(0,0,0,0.00)",
"backgroundImage": "url(wave50.svg)",
"backgroundRepeat": "repeat-y",
"backgroundSize": "cover",
"borderBottomLeftRadius": "5px",
"borderBottomRightRadius": "5px",
"borderTopLeftRadius": "5px",
@@ -76,25 +79,10 @@ exports[`About matches snapshot 1`] = `
"paddingLeft": "12px",
"paddingRight": "12px",
"paddingTop": "16px",
"position": "relative",
"transform": "rotateY(180deg)",
}
}
>
<div
className="css-view-1dbjc4n"
style={
Object {
"backgroundImage": "url(wave50.svg)",
"backgroundRepeat": "repeat-y",
"backgroundSize": "cover",
"height": "100%",
"opacity": 0.4,
"position": "absolute",
"width": "100%",
}
}
/>
<div
className="css-view-1dbjc4n"
style={
@@ -14,7 +14,7 @@ import SimpleStore from '../../lib/undux/SimpleStore'
import { useErrorDialog } from '../../lib/undux/utils/dialog'

import { getUserModel, type UserModel } from '../../lib/gundb/UserModel'
import { fireEvent, initAnalytics } from '../../lib/analytics/analytics'
import { fireEvent } from '../../lib/analytics/analytics'
import Config from '../../config/config'
import type { SMSRecord } from './SmsForm'
import SignupCompleted from './SignupCompleted'
@@ -174,7 +174,7 @@ const Signup = ({ navigation, screenProps }: { navigation: any, screenProps: any

//for QA
global.wallet = goodWallet
initAnalytics(goodWallet, userStorage).then(_ => fireSignupEvent('STARTED'))
fireSignupEvent('STARTED')

//the login also re-initialize the api with new jwt
await login.then(l => l.default.auth())
@@ -1,5 +1,5 @@
import React from 'react'
import { Image, StyleSheet, View } from 'react-native'
import { Image, StyleSheet } from 'react-native'
import splashImage from '../../assets/Splash/logo.svg'
import goodDollarImage from '../../assets/Splash/goodDollar.svg'
import wavePattern from '../../assets/wave50.svg'
@@ -15,7 +15,6 @@ Image.prefetch(wavePattern)
const Splash = () => (
<Wrapper style={styles.wrapper}>
<Section style={styles.container}>
<View style={styles.backgroundWaves} />
<Section.Stack style={styles.content} grow justifyContent="space-between">
<Section.Text fontSize={22} color="darkBlue">
{`Welcome and thank you\nfor participating in GoodDollar's\n`}
@@ -44,19 +43,12 @@ const styles = StyleSheet.create({
container: {
alignItems: 'center',
justifyContent: 'center',
transform: [{ rotateY: '180deg' }],
position: 'relative',
backgroundColor: 'transparent',
flex: 1,
},
backgroundWaves: {
position: 'absolute',
width: '100%',
height: '100%',
backgroundImage: `url(${wavePattern})`,
backgroundRepeat: 'repeat-y',
backgroundColor: 'transparent',
backgroundSize: 'cover',
opacity: 0.4,
transform: [{ rotateY: '180deg' }],
flex: 1,
},
content: {
transform: [{ rotateY: '180deg' }],
@@ -1,5 +1,5 @@
import React from 'react'
import { Image, StyleSheet, View } from 'react-native'
import { Image, StyleSheet } from 'react-native'
import goodDollarImage from '../../assets/Splash/goodDollar.svg'
import wavePattern from '../../assets/wave50.svg'
import { getDesignRelativeHeight } from '../../lib/utils/sizes'
@@ -16,7 +16,6 @@ Image.prefetch(wavePattern)
const SplashDesktop = ({ onContinue, urlForQR }) => (
<Wrapper style={styles.wrapper}>
<Section style={styles.container}>
<View style={styles.backgroundWaves} />
<Section.Stack style={styles.content} grow justifyContent="space-between">
<Section.Text fontSize={22} color="darkBlue">
{`For Best Experience\nplease scan and continue\non your mobile device.`}
@@ -45,19 +44,12 @@ const styles = StyleSheet.create({
container: {
alignItems: 'center',
justifyContent: 'center',
position: 'relative',
backgroundColor: 'transparent',
transform: [{ rotateY: '180deg' }],
flex: 1,
},
backgroundWaves: {
position: 'absolute',
width: '100%',
height: '100%',
backgroundImage: `url(${wavePattern})`,
backgroundRepeat: 'repeat-y',
backgroundColor: 'transparent',
backgroundSize: 'cover',
opacity: 0.4,
transform: [{ rotateY: '180deg' }],
flex: 1,
},
content: {
transform: [{ rotateY: '180deg' }],
@@ -59,6 +59,9 @@ exports[`Splash matches snapshot 1`] = `
"WebkitTransform": "rotateY(180deg)",
"alignItems": "center",
"backgroundColor": "rgba(0,0,0,0.00)",
"backgroundImage": "url(wave50.svg)",
"backgroundRepeat": "repeat-y",
"backgroundSize": "cover",
"borderBottomLeftRadius": "5px",
"borderBottomRightRadius": "5px",
"borderTopLeftRadius": "5px",
@@ -76,25 +79,10 @@ exports[`Splash matches snapshot 1`] = `
"paddingLeft": "12px",
"paddingRight": "12px",
"paddingTop": "16px",
"position": "relative",
"transform": "rotateY(180deg)",
}
}
>
<div
className="css-view-1dbjc4n"
style={
Object {
"backgroundImage": "url(wave50.svg)",
"backgroundRepeat": "repeat-y",
"backgroundSize": "cover",
"height": "100%",
"opacity": 0.4,
"position": "absolute",
"width": "100%",
}
}
/>
<div
className="css-view-1dbjc4n"
style={
@@ -59,6 +59,9 @@ exports[`SplashDesktop matches snapshot 1`] = `
"WebkitTransform": "rotateY(180deg)",
"alignItems": "center",
"backgroundColor": "rgba(0,0,0,0.00)",
"backgroundImage": "url(wave50.svg)",
"backgroundRepeat": "repeat-y",
"backgroundSize": "cover",
"borderBottomLeftRadius": "5px",
"borderBottomRightRadius": "5px",
"borderTopLeftRadius": "5px",
@@ -76,25 +79,10 @@ exports[`SplashDesktop matches snapshot 1`] = `
"paddingLeft": "12px",
"paddingRight": "12px",
"paddingTop": "16px",
"position": "relative",
"transform": "rotateY(180deg)",
}
}
>
<div
className="css-view-1dbjc4n"
style={
Object {
"backgroundImage": "url(wave50.svg)",
"backgroundRepeat": "repeat-y",
"backgroundSize": "cover",
"height": "100%",
"opacity": 0.4,
"position": "absolute",
"width": "100%",
}
}
/>
<div
className="css-view-1dbjc4n"
style={

0 comments on commit 0d57982

Please sign in to comment.
You can’t perform that action at this time.