61d2a35 · bridge · git.iko.soy

git.iko.soy/bridge

Consistently use useCallback

commit61d2a353bba88cbc3009a38dcce3ddd002a05289 authorFang <git@fang.io> dateThu 4 Jul 2019, 10:54 (7 years ago) parent47ace0c

4 files changed+7−17

compare with master

unifiedsplit

src/views/Reticket/Confirm.js+2−4 src/views/Reticket/DoReticket.js+1−5 src/views/Reticket/Download.js+2−4 src/views/Reticket/Verify.js+2−4

src/views/Reticket/Confirm.js+2−4

@@ -1,4 +1,4 @@

1−import React, { useState } from 'react';

1+import React, { useState, useCallback } from 'react';

22import * as need from 'lib/need';

33import { Just, Nothing } from 'folktale/maybe';

@@ -32,9 +32,7 @@ export default function Confirm({ STEP_NAMES, newWallet, storeNewWallet }) {

3232 });

3333 });

3434

35− const next = () => {

36− push(STEP_NAMES.DOWNLOAD);

37− };

35+ const next = useCallback(() => push(STEP_NAMES.DOWNLOAD), [push, STEP_NAMES]);

3836

3937 const paperRenderer = Nothing.hasInstance(generatedWallet) ? null : (

4038 <PaperRenderer

src/views/Reticket/DoReticket.js+1−5

@@ -40,7 +40,7 @@ export default function DoReticket({ newWallet, completed }) {

4040 })

4141 .then(() => {

4242 setUrbitWallet(newWallet.value.wallet);

43− next(); //TODO don't auto-redirect

43+ completed(); //TODO don't auto-redirect

4444 })

4545 .catch(err => {

4646 setGeneralError(err);

@@ -63,10 +63,6 @@ export default function DoReticket({ newWallet, completed }) {

6363 [setState, setNeedFunds]

6464 );

6565

66− const next = () => {

67− completed();

68− };

69−

7066 const renderAdditionalInfo = () => {

7167 if (generalError) {

7268 return (

src/views/Reticket/Download.js+2−4

@@ -1,4 +1,4 @@

1−import React, { useState } from 'react';

1+import React, { useState, useCallback } from 'react';

22import { Nothing } from 'folktale/maybe';

44import View from 'components/View';

@@ -17,9 +17,7 @@ export default function Download({ STEP_NAMES, newWallet }) {

1717 setHasDownloaded(true);

1818 };

1919

20− const next = () => {

21− push(STEP_NAMES.VERIFY);

22− };

20+ const next = useCallback(() => push(STEP_NAMES.VERIFY), [push, STEP_NAMES]);

2321

2422 return (

2523 <View>

src/views/Reticket/Verify.js+2−4

@@ -1,4 +1,4 @@

1−import React from 'react';

1+import React, { useCallback } from 'react';

22import { Input, AccessoryIcon } from 'indigo-react';

44import View from 'components/View';

@@ -16,9 +16,7 @@ export default function Verify({ STEP_NAMES, newWallet }) {

1616 });

1717 const ticket = ticketInput.data;

1818

19− const next = () => {

20− push(STEP_NAMES.RETICKET);

21− };

19+ const next = useCallback(() => push(STEP_NAMES.RETICKET), [push, STEP_NAMES]);

2220

2321 const matches = newWallet.value.wallet.ticket === ticket;

2422