91ebede · bridge · git.iko.soy

src/bridge/components/Passport.js+13−3

compare with master

unifiedsplit

@@ -59,14 +59,22 @@ class Passport extends React.Component {

59 }

60

61 getWalletStates() {

62+ let { walletStates } = this.props

63+

62− let hideWalletStates = this.props.walletStates.includes(WALLET_STATES.TRANSACTIONS)

64+ let hideWalletStates = walletStates.includes(WALLET_STATES.TRANSACTIONS)

63 if (hideWalletStates) return null

65 if (hideWalletStates) return null

64

66

65− let stateElems = this.props.walletStates.map(state => {

67+ let stateElems = walletStates.map(state => {

68+ if (state === WALLET_STATES.DOWNLOADED) return null

69+

70+ let lastIndex = walletStates.indexOf(state) === walletStates.length - 1

71+

66 return (

72 return (

67 <div className="flex justify-between">

73 <div className="flex justify-between">

68 <div className="text-mono text-sm lh-6 green-dark">{state}</div>

74 <div className="text-mono text-sm lh-6 green-dark">{state}</div>

75+ {(!lastIndex) &&

69− <div className="text-700 text-sm lh-6 green-dark">✓</div>

76+ <div className="text-700 text-sm lh-6 green-dark">✓</div>

77+ }

70 </div>

78 </div>

71 )

79 )

72 })

80 })

@@ -111,6 +119,8 @@ class Passport extends React.Component {

111 let paperReady = this.state.paper && this.props.walletStates.includes(WALLET_STATES.PAPER_READY)

119 let paperReady = this.state.paper && this.props.walletStates.includes(WALLET_STATES.PAPER_READY)

112 let downloadColor = paperReady ? 'green' : 'black'

120 let downloadColor = paperReady ? 'green' : 'black'

113

121

122+ window.curTime = (new Date()).getTime()

123+

114 return (

124 return (

115 <div>

125 <div>

116 <div className="passport-border">

126 <div className="passport-border">

src/bridge/lib/invite.js+2−5

@@ -24,8 +24,8 @@ const INVITE_STAGES = {

24const WALLET_STATES = {

25 UNLOCKING: "Unlocking invite wallet",

26 GENERATING: "Generating your wallet",

27− GENERATED: "Wallet generation complete",

27+ RENDERING: "Creating paper collateral",

28− PAPER_READY: "Paper collateral generated",

28+ PAPER_READY: "Download your wallet",

29 DOWNLOADED: "Wallet downloaded",

30 TRANSACTIONS: "Sending transactions"

31}

@@ -80,10 +80,7 @@ async function generateWallet(point) {

80 }

81

82 const ticket = await makeTicket(point);

83−

84 const wallet = await genWallet(point, ticket);

83 const wallet = await genWallet(point, ticket);

85− console.log('got wallet', wallet);

86− console.log('should start rendering now');

87 return wallet;

84 return wallet;

88}

85}

89

86

src/bridge/views/InviteTicket.js+1−1

@@ -112,7 +112,7 @@ class InviteTicket extends React.Component {

112 this.setState({

113 realPoint: point,

114 realWallet: Just(wallet),

115− walletStates: this.state.walletStates.concat(WALLET_STATES.GENERATED)

115+ walletStates: this.state.walletStates.concat(WALLET_STATES.RENDERING)

116 })

117 }

118