fbc8b0c · bridge · git.iko.soy

src/components/Passport.js+2−2

compare with master

unifiedsplit

@@ -7,7 +7,7 @@ import 'style/anim.css';

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

8import { chunkStr, Matrix, walk, rand } from 'lib/card';

9import usePermissionsForPoint from 'lib/usePermissionsForPoint';

10−import { useSyncOwnedPoints } from 'lib/useSyncPoints';

10+import { useSyncDetails } from 'lib/useSyncPoints';

11import { buildKeyType } from 'lib/point';

12

13import { useWallet } from 'store/wallet';

@@ -212,7 +212,7 @@ const Cell = props => {

212 *

213 */

214function MiniPassport({ point, inverted, ...rest }) {

215− useSyncOwnedPoints([point]);

215+ useSyncDetails([point]);

216 const { wallet } = useWallet();

217 const address = need.addressFromWallet(wallet);

218

src/lib/useSyncPoints.js+9−9

@@ -16,17 +16,17 @@ const buildSyncHook = getFn =>

16 }, [fn, prevPoints, points]);

17 };

18

19−export const useSyncKnownPoints = buildSyncHook(function() {

19+export const useSyncDates = buildSyncHook(function() {

20− const { syncKnownPoint } = usePointCache();

20+ const { syncDates } = usePointCache();

21− return syncKnownPoint;

21+ return syncDates;

22});

23

24−export const useSyncForeignPoints = buildSyncHook(function() {

24+export const useSyncDetails = buildSyncHook(function() {

25− const { syncForeignPoint } = usePointCache();

25+ const { syncDetails } = usePointCache();

26− return syncForeignPoint;

26+ return syncDetails;

27});

28

29−export const useSyncOwnedPoints = buildSyncHook(function() {

29+export const useSyncExtras = buildSyncHook(function() {

30− const { syncOwnedPoint } = usePointCache();

30+ const { syncExtras } = usePointCache();

31− return syncOwnedPoint;

31+ return syncExtras;

32});

src/store/lib/usePointStore.js+7−25

@@ -20,38 +20,21 @@ export default function usePointStore() {

20 const { syncResidents, syncResidentCount, ...residents } = useResidents();

21 const ecliptic = useEclipticOwnerStore();

22

23− // sync all of the on-chain info required to display a known point

24− const syncKnownPoint = useCallback(

23+ const syncDates = useCallback(

25 async point => Promise.all([syncBirthday(point), syncRekeyDate(point)]),

24 async point => Promise.all([syncBirthday(point), syncRekeyDate(point)]),

26 [syncBirthday, syncRekeyDate]

25 [syncBirthday, syncRekeyDate]

27 );

26 );

28

27

29− // sync all of the on-chain info required to display a foreign point

28+ const syncExtras = useCallback(

30− const syncForeignPoint = useCallback(

31− async point => {

32− syncDetails(point);

33− },

34− [syncDetails]

35− );

36−

37− // sync all of the on-chain info required for a point that the user owns

38− const syncOwnedPoint = useCallback(

39 async point =>

29 async point =>

40 Promise.all([

30 Promise.all([

41− syncForeignPoint(point),

31+ syncDetails(point),

42− syncKnownPoint(point),

43 //

32 //

33+ syncDates(point),

44 syncResidentCount(point),

34 syncResidentCount(point),

45− syncDetails(point),

46 syncInvites(point),

35 syncInvites(point),

47 ]),

36 ]),

48− [

49− syncForeignPoint,

50− syncKnownPoint,

51− syncDetails,

52− syncInvites,

53− syncResidentCount,

37+ [syncDates, syncDetails, syncInvites, syncResidentCount]

54− ]

55 );

38 );

56

39

57 return {

40 return {

@@ -66,9 +49,8 @@ export default function usePointStore() {

66 syncRekeyDate,

49 syncRekeyDate,

67 syncInvites,

50 syncInvites,

68 syncControlledPoints,

51 syncControlledPoints,

69− syncKnownPoint,

52+ syncDates,

70− syncOwnedPoint,

71− syncForeignPoint,

72 syncResidents,

53 syncResidents,

54+ syncExtras,

73 };

55 };

74}

56}

src/views/Activate.js+2−4

@@ -2,7 +2,7 @@ import React, { useEffect } from 'react';

2

3import useRouter from 'lib/useRouter';

4import { LocalRouterProvider } from 'lib/LocalRouter';

5−import { useSyncKnownPoints } from 'lib/useSyncPoints';

5+import { useSyncDates } from 'lib/useSyncPoints';

6

7import { ActivateFlowProvider } from './Activate/ActivateFlow';

8import useActivateFlowState from './Activate/useActivateFlowState';

@@ -38,9 +38,7 @@ export default function Activate() {

38 }, []);

39

40 // when we know the derived point, ensure we have the data to display it

41− useSyncKnownPoints(

42− [state.derivedPoint.getOrElse(null)].filter(p => p !== null)

41+ useSyncDates([state.derivedPoint.getOrElse(null)].filter(p => p !== null));

43− );

44

42

45 return (

43 return (

46 <LocalRouterProvider value={router}>

44 <LocalRouterProvider value={router}>

src/views/CreateGalaxy.js+2−2

@@ -29,7 +29,7 @@ import CopiableAddress from 'components/CopiableAddress';

29

30function useCreateGalaxy() {

31 const { contracts } = useNetwork();

32− const { syncKnownPoint } = usePointCache();

32+ const { syncDates } = usePointCache();

33

34 const _contracts = need.contracts(contracts);

35

@@ -43,7 +43,7 @@ function useCreateGalaxy() {

43 },

44 [_contracts]

45 ),

46− useCallback(() => syncKnownPoint(galaxy), [galaxy, syncKnownPoint]),

46+ useCallback(() => syncDates(galaxy), [galaxy, syncDates]),

47 GAS_LIMITS.DEFAULT

48 );

49}

src/views/Invite/Cohort.js+2−2

@@ -26,7 +26,7 @@ import Inviter from 'views/Invite/Inviter';

26

27import { ReactComponent as SearchIcon } from 'assets/search.svg';

28import CopyButton from 'components/CopyButton';

29−import { useSyncForeignPoints } from 'lib/useSyncPoints';

29+import { useSyncDetails } from 'lib/useSyncPoints';

30import { useNetwork } from 'store/network';

31import NavHeader from 'components/NavHeader';

32

@@ -305,7 +305,7 @@ export default function InviteCohort() {

305

306 const [selectedInvite, _setSelectedInvite] = useState();

307

308− useSyncForeignPoints([..._acceptedPoints, ..._pendingPoints]);

308+ useSyncDetails([..._acceptedPoints, ..._pendingPoints]);

309

310 const setSelectedInvite = useCallback(

311 p => _setSelectedInvite(old => (old === p ? null : p)),

src/views/IssueChild.js+2−5

@@ -34,7 +34,7 @@ import convertToInt from 'lib/convertToInt';

34

35function useIssueChild() {

36 const { contracts } = useNetwork();

37− const { syncKnownPoint } = usePointCache();

37+ const { syncDates } = usePointCache();

38

39 const _contracts = need.contracts(contracts);

40

@@ -48,10 +48,7 @@ function useIssueChild() {

48 },

49 [_contracts]

50 ),

51− useCallback(() => syncKnownPoint(spawnedPoint), [

51+ useCallback(() => syncDates(spawnedPoint), [spawnedPoint, syncDates]),

52− spawnedPoint,

53− syncKnownPoint,

54− ]),

55 GAS_LIMITS.DEFAULT

52 GAS_LIMITS.DEFAULT

56 );

53 );

57}

54}

src/views/Point.js+2−2

@@ -18,7 +18,7 @@ import { ForwardButton } from 'components/Buttons';

18

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

20import useInvites from 'lib/useInvites';

21−import { useSyncOwnedPoints } from 'lib/useSyncPoints';

21+import { useSyncExtras } from 'lib/useSyncPoints';

22import useCurrentPermissions from 'lib/useCurrentPermissions';

23import { useLocalRouter } from 'lib/LocalRouter';

24

@@ -216,7 +216,7 @@ export default function Point() {

216 })();

217

218 // sync the current cursor

219− useSyncOwnedPoints([point]);

219+ useSyncExtras([point]);

220

221 const address = need.addressFromWallet(wallet);

222

src/views/Points.js−11

@@ -12,7 +12,6 @@ import { useStarReleaseCache } from 'store/starRelease';

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

13import { isZeroAddress, abbreviateAddress } from 'lib/wallet';

14import useIsEclipticOwner from 'lib/useIsEclipticOwner';

15−import { useSyncKnownPoints, useSyncOwnedPoints } from 'lib/useSyncPoints';

16import useRejectedIncomingPointTransfers from 'lib/useRejectedIncomingPointTransfers';

15import useRejectedIncomingPointTransfers from 'lib/useRejectedIncomingPointTransfers';

17import pluralize from 'lib/pluralize';

16import pluralize from 'lib/pluralize';

18import newGithubIssueUrl from 'new-github-issue-url';

17import newGithubIssueUrl from 'new-github-issue-url';

@@ -203,16 +202,6 @@ export default function Points() {

203 useEffect(() => {

202 useEffect(() => {

204 syncStarReleaseDetails();

203 syncStarReleaseDetails();

205 }, [syncStarReleaseDetails]);

204 }, [syncStarReleaseDetails]);

206− // sync display details for known points

207− useSyncKnownPoints([

208− ...ownedPoints,

209− ...incomingPoints,

210− ...managingPoints,

211− ...votingPoints,

212− ...spawningPoints,

213− ]);

214−

215− useSyncOwnedPoints(ownedPoints);

216

205

217 const goCreateGalaxy = useCallback(() => push(names.CREATE_GALAXY), [

206 const goCreateGalaxy = useCallback(() => push(names.CREATE_GALAXY), [

218 names.CREATE_GALAXY,

207 names.CREATE_GALAXY,

src/views/Release/Active.js+2−2

@@ -10,13 +10,13 @@ import { useWallet } from 'store/wallet';

10

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

12import usePermissionsForPoint from 'lib/usePermissionsForPoint';

13−import { useSyncOwnedPoints } from 'lib/useSyncPoints';

13+import { useSyncDetails } from 'lib/useSyncPoints';

14import { buildKeyType } from 'lib/point';

15

16function ActiveViewRow({ point, goPoint }) {

17 const { wallet } = useWallet();

18 const address = need.addressFromWallet(wallet);

19− useSyncOwnedPoints([point]);

19+ useSyncDetails([point]);

20 const permissions = usePermissionsForPoint(address, point);

21

22 const keyType = buildKeyType(permissions);