git.iko.soy/bridge
on master help sign in
Use better ticket input verification
0b0242bFang
src/views/Reticket/Verify.js+16−12
compare with master
unifiedsplit
@@ -1,4 +1,4 @@
1−import React, { useCallback } from 'react';
1+import React, { useCallback, useMemo } from 'react';
2import { Input, AccessoryIcon } from 'indigo-react';
2import { Input, AccessoryIcon } from 'indigo-react';
3
3
4import View from 'components/View';
4import View from 'components/View';
@@ -6,31 +6,35 @@ import { useTicketInput } from 'components/Inputs';
6import { ForwardButton } from 'components/Buttons';
6import { ForwardButton } from 'components/Buttons';
7
7
8import { useLocalRouter } from 'lib/LocalRouter';
8import { useLocalRouter } from 'lib/LocalRouter';
9+import { validateExactly } from 'lib/validators';
9
10
11+const STUB_VERIFY_TICKET = process.env.NODE_ENV === 'development';
12+
13+//TODO deduplicate with PassportVerify
10export default function Verify({ STEP_NAMES, newWallet }) {
14export default function Verify({ STEP_NAMES, newWallet }) {
11 const { push } = useLocalRouter();
15 const { push } = useLocalRouter();
12
16
17+ const ticket = newWallet.value.wallet.ticket;
18+ const validators = useMemo(
19+ () => [validateExactly(ticket, 'Does not match expected master ticket.')],
20+ [ticket]
21+ );
13 const ticketInput = useTicketInput({
22 const ticketInput = useTicketInput({
14 name: 'ticket',
23 name: 'ticket',
15 label: 'New master ticket',
24 label: 'New master ticket',
25+ initialValue: STUB_VERIFY_TICKET ? ticket : undefined,
26+ autoFocus: true,
27+ validators,
16 });
28 });
17− const ticket = ticketInput.data;
29+ const { pass } = ticketInput;
18
30
19 const next = useCallback(() => push(STEP_NAMES.RETICKET), [push, STEP_NAMES]);
31 const next = useCallback(() => push(STEP_NAMES.RETICKET), [push, STEP_NAMES]);
20
32
21− const matches = newWallet.value.wallet.ticket === ticket;
22−
23− const displayTicketStatus = matches ? (
24− <AccessoryIcon.Success />
25− ) : (
26− <AccessoryIcon.Failure />
27− );
28−
29 return (
33 return (
30 <View>
34 <View>
31 Prove that you downloaded the new secrets!
35 Prove that you downloaded the new secrets!
32− <Input {...ticketInput} accessory={displayTicketStatus} />
36+ <Input {...ticketInput} />
33− <ForwardButton disabled={!matches} onClick={next}>
37+ <ForwardButton disabled={!pass} onClick={next}>
34 Reticket
38 Reticket
35 </ForwardButton>
39 </ForwardButton>
36 </View>
40 </View>