git.iko.soy/bridge
on master help sign in
- Finish styling up to transactions page
fe001e1Chris Johnson
src/bridge/components/Passport.js+8−5
compare with master
unifiedsplit
@@ -26,7 +26,7 @@ class Passport extends React.Component {
26
26
27 download() {
27 download() {
28 downloadWallet(this.state.paper)
28 downloadWallet(this.state.paper)
29− this.props.confirmWalletDownload()
29+ this.props.pushWalletState(WALLET_STATES.DOWNLOADED)
30 }
30 }
31
31
32 generateScreen() {
32 generateScreen() {
@@ -59,6 +59,9 @@ class Passport extends React.Component {
59 }
59 }
60
60
61 getWalletStates() {
61 getWalletStates() {
62+ let hideWalletStates = this.props.walletStates.includes(WALLET_STATES.TRANSACTIONS)
63+ if (hideWalletStates) return null
64+
62 let stateElems = this.props.walletStates.map(state => {
65 let stateElems = this.props.walletStates.map(state => {
63 return (
66 return (
64 <div className="flex justify-between">
67 <div className="flex justify-between">
@@ -69,7 +72,7 @@ class Passport extends React.Component {
69 })
72 })
70
73
71 return (
74 return (
72− <div>
75+ <div className="mt-3">
73 {stateElems}
76 {stateElems}
74 </div>
77 </div>
75 )
78 )
@@ -159,9 +162,9 @@ class Passport extends React.Component {
159 { 'Download' }
162 { 'Download' }
160 </Button>
163 </Button>
161 </div>
164 </div>
162− <div className="passport-wallet-states mt-3">
165+
163− {walletStates}
166+ {walletStates}
164− </div>
167+
165 </div>
168 </div>
166 )
169 )
167 }
170 }
src/bridge/lib/invite.js+2−1
@@ -26,7 +26,8 @@ const WALLET_STATES = {
26 GENERATING: "Generating your wallet",
26 GENERATING: "Generating your wallet",
27 GENERATED: "Wallet generation complete",
27 GENERATED: "Wallet generation complete",
28 PAPER_READY: "Paper collateral generated",
28 PAPER_READY: "Paper collateral generated",
29− DOWNLOADED: "Wallet downloaded"
29+ DOWNLOADED: "Wallet downloaded",
30+ TRANSACTIONS: "Sending transactions"
30}
31}
31
32
32async function generateWallet(point) {
33async function generateWallet(point) {
src/bridge/views/InviteLogin.js+8−9
@@ -33,7 +33,7 @@ class InviteLogin extends React.Component {
33 realPoint: Nothing(),
33 realPoint: Nothing(),
34 realWallet: Nothing(),
34 realWallet: Nothing(),
35 walletReady: false,
35 walletReady: false,
36− stage: INVITE_STAGES.INVITE_TRANSACTIONS,
36+ stage: INVITE_STAGES.INVITE_LOGIN,
37 walletStates: []
37 walletStates: []
38 }
38 }
39
39
@@ -42,7 +42,6 @@ class InviteLogin extends React.Component {
42
42
43 this.handleInviteTicketInput = this.handleInviteTicketInput.bind(this)
43 this.handleInviteTicketInput = this.handleInviteTicketInput.bind(this)
44 this.handleVerifyTicketInput = this.handleVerifyTicketInput.bind(this)
44 this.handleVerifyTicketInput = this.handleVerifyTicketInput.bind(this)
45− this.confirmWalletDownload = this.confirmWalletDownload.bind(this)
46 this.pushWalletState = this.pushWalletState.bind(this)
45 this.pushWalletState = this.pushWalletState.bind(this)
47 this.navigateLogin = this.navigateLogin.bind(this)
46 this.navigateLogin = this.navigateLogin.bind(this)
48 }
47 }
@@ -66,12 +65,6 @@ class InviteLogin extends React.Component {
66 this.setState({ verifyTicket })
65 this.setState({ verifyTicket })
67 }
66 }
68
67
69− confirmWalletDownload() {
70− this.setState({
71− walletStates: this.state.walletStates.concat(WALLET_STATES.DOWNLOADED),
72− })
73− }
74−
75 async unlockInviteWallet(inviteTicket) {
68 async unlockInviteWallet(inviteTicket) {
76 this.setState({
69 this.setState({
77 walletStates: this.state.walletStates.concat(WALLET_STATES.UNLOCKING),
70 walletStates: this.state.walletStates.concat(WALLET_STATES.UNLOCKING),
@@ -220,6 +213,13 @@ class InviteLogin extends React.Component {
220 continueReady = this.state.walletStates.includes(WALLET_STATES.DOWNLOADED)
213 continueReady = this.state.walletStates.includes(WALLET_STATES.DOWNLOADED)
221 break
214 break
222 case INVITE_STAGES.INVITE_VERIFY:
215 case INVITE_STAGES.INVITE_VERIFY:
216+ clickHandler = () => {
217+ this.setState({
218+ stage: INVITE_STAGES.INVITE_TRANSACTIONS,
219+ walletStates: this.state.walletStates.concat(WALLET_STATES.TRANSACTIONS)
220+ })
221+ }
222+ continueReady = true
223 break
223 break
224 }
224 }
225
225
@@ -282,7 +282,6 @@ class InviteLogin extends React.Component {
282 wallet={this.state.realWallet}
282 wallet={this.state.realWallet}
283 walletStates={this.state.walletStates}
283 walletStates={this.state.walletStates}
284 pushWalletState={this.pushWalletState}
284 pushWalletState={this.pushWalletState}
285− confirmWalletDownload={this.confirmWalletDownload}
286 />
285 />
287 </Col>
286 </Col>
288 </Row>
287 </Row>