git.iko.soy/bridge
on master help sign in
- Don’t display ~zod in passport if point is empty

- Display partially generated passport when invite wallet is unlocked - Disable continue button on Verify step if verify ticket doesn’t match real ticket

commitcb60829326cf09de68c308ac5d1b64ad647cb7b9 authorChris Johnson <chris@cjohnson.io> dateFri 10 May 2019, 17:13 (7 years ago) parentb443e3c
2 files changed+18−7
compare with master
unifiedsplit
src/bridge/components/Passport.js+3−3 src/bridge/views/InviteTicket.js+15−4
src/bridge/components/Passport.js+3−3
@@ -104,8 +104,8 @@ class Passport extends React.Component {
104104
105105 const lastIndex = walletStates.indexOf(state) === walletStates.length - 1
106106 const checkmark = lastIndex
107− ? <div className="text-700 text-sm lh-6 green-dark">✓</div>
108− : null
107+ ? null
108+ : <div className="text-700 text-sm lh-6 green-dark">✓</div>
109109
110110 return (
111111 <div className="flex justify-between">
@@ -128,7 +128,7 @@ class Passport extends React.Component {
128128 Nothing: () => ''
129129 })
130130
131− let patp = ob.patp(pointVal)
131+ let patp = pointVal === '' ? '' : ob.patp(pointVal)
132132
133133 let wallet = this.props.wallet.matchWith({
134134 Just: w => w.value,
src/bridge/views/InviteTicket.js+15−4
@@ -104,9 +104,14 @@ class InviteTicket extends React.Component {
104104 let errors = []
105105
106106 if (incoming.length > 0) {
107− let pointNum = parseInt(incoming[0]);
108− realPoint = Just(pointNum);
109− let genWallet = await generateWallet(pointNum);
107+ let pointNum = parseInt(incoming[0], 10)
108+ realPoint = Just(pointNum)
109+
110+ this.setState({
111+ realPoint
112+ })
113+
114+ let genWallet = await generateWallet(pointNum)
110115
111116 realWallet = Just(genWallet)
112117 if (incoming.length > 1) {
@@ -117,7 +122,6 @@ class InviteTicket extends React.Component {
117122 }
118123
119124 this.setState({
120− realPoint,
121125 realWallet,
122126 inviteWallet: Just(inviteWallet),
123127 // dev mode: uncomment this out to autofill verified ticket
@@ -272,8 +276,15 @@ class InviteTicket extends React.Component {
272276 }
273277 : null
274278
279+ const ticketMatches = this.state.realWallet.matchWith({
280+ Just: wal => wal.value.ticket === this.state.verifyTicket,
281+ Nothing: () => false
282+ })
283+
275284 const continueReady = stage === INVITE_STAGES.INVITE_WALLET
276285 ? walletStates.includes(WALLET_STATES.DOWNLOADED)
286+ : stage === INVITE_STAGES.INVITE_VERIFY
287+ ? ticketMatches
277288 : true
278289
279290 const buttonElem = stage === INVITE_STAGES.INVITE_TRANSACTIONS