git.iko.soy/bridge
on master help sign in
- Don’t display ~zod in passport if point is empty
cb60829Chris Johnson
src/bridge/components/Passport.js+3−3
compare with master
unifiedsplit
@@ -104,8 +104,8 @@ class Passport extends React.Component {
104
104
105 const lastIndex = walletStates.indexOf(state) === walletStates.length - 1
105 const lastIndex = walletStates.indexOf(state) === walletStates.length - 1
106 const checkmark = lastIndex
106 const checkmark = lastIndex
107+ ? null
107− ? <div className="text-700 text-sm lh-6 green-dark">✓</div>
108+ : <div className="text-700 text-sm lh-6 green-dark">✓</div>
108− : null
109
109
110 return (
110 return (
111 <div className="flex justify-between">
111 <div className="flex justify-between">
@@ -128,7 +128,7 @@ class Passport extends React.Component {
128 Nothing: () => ''
128 Nothing: () => ''
129 })
129 })
130
130
131− let patp = ob.patp(pointVal)
131+ let patp = pointVal === '' ? '' : ob.patp(pointVal)
132
132
133 let wallet = this.props.wallet.matchWith({
133 let wallet = this.props.wallet.matchWith({
134 Just: w => w.value,
134 Just: w => w.value,
src/bridge/views/InviteTicket.js+15−4
@@ -104,9 +104,14 @@ class InviteTicket extends React.Component {
104 let errors = []
104 let errors = []
105
105
106 if (incoming.length > 0) {
106 if (incoming.length > 0) {
107− let pointNum = parseInt(incoming[0]);
107+ let pointNum = parseInt(incoming[0], 10)
108− realPoint = Just(pointNum);
108+ realPoint = Just(pointNum)
109+
110+ this.setState({
111+ realPoint
112+ })
113+
109− let genWallet = await generateWallet(pointNum);
114+ let genWallet = await generateWallet(pointNum)
110
115
111 realWallet = Just(genWallet)
116 realWallet = Just(genWallet)
112 if (incoming.length > 1) {
117 if (incoming.length > 1) {
@@ -117,7 +122,6 @@ class InviteTicket extends React.Component {
117 }
122 }
118
123
119 this.setState({
124 this.setState({
120− realPoint,
121 realWallet,
125 realWallet,
122 inviteWallet: Just(inviteWallet),
126 inviteWallet: Just(inviteWallet),
123 // dev mode: uncomment this out to autofill verified ticket
127 // dev mode: uncomment this out to autofill verified ticket
@@ -272,8 +276,15 @@ class InviteTicket extends React.Component {
272 }
276 }
273 : null
277 : null
274
278
279+ const ticketMatches = this.state.realWallet.matchWith({
280+ Just: wal => wal.value.ticket === this.state.verifyTicket,
281+ Nothing: () => false
282+ })
283+
275 const continueReady = stage === INVITE_STAGES.INVITE_WALLET
284 const continueReady = stage === INVITE_STAGES.INVITE_WALLET
276 ? walletStates.includes(WALLET_STATES.DOWNLOADED)
285 ? walletStates.includes(WALLET_STATES.DOWNLOADED)
286+ : stage === INVITE_STAGES.INVITE_VERIFY
287+ ? ticketMatches
277 : true
288 : true
278
289
279 const buttonElem = stage === INVITE_STAGES.INVITE_TRANSACTIONS
290 const buttonElem = stage === INVITE_STAGES.INVITE_TRANSACTIONS