ad88110 · bridge · git.iko.soy

git.iko.soy/bridge

Update IncomingPoint to show proper layer

commitad88110976513d555f97a3a7e6be6ab5aa42522b authorWill Galebach <willbach@gmail.com> dateMon 1 Nov 2021, 21:34 (5 years ago) parent3ca083d

2 files changed+13−6

compare with master

unifiedsplit

src/components/L2/Points/IncomingPoint.tsx+12−2 src/lib/useRoller.ts+1−4

src/components/L2/Points/IncomingPoint.tsx+12−2

@@ -1,9 +1,10 @@

1−import React from 'react';

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

22import * as ob from 'urbit-ob';

33import { Box } from '@tlon/indigo-react';

55import LayerIndicator from '../LayerIndicator';

66import './IncomingPoint.scss';

7+import useRoller from 'lib/useRoller';

89export interface IncomingPointProps {

910 point: number;

@@ -12,6 +13,15 @@ export interface IncomingPointProps {

1213}

1314

1415const IncomingPoint = ({ point, accept, reject }: IncomingPointProps) => {

16+ const { api } = useRoller();

17+ const [layer, setLayer] = useState<1 | 2>(1);

18+

19+ useEffect(() => {

20+ api.getPoint(point).then(p => {

21+ setLayer(p.dominion === 'l2' ? 2 : 1);

22+ });

23+ }, []); // eslint-disable-line react-hooks/exhaustive-deps

24+

1525 return (

1626 <Box className="incoming-point" key={`incoming-${point}`}>

1727 <Box className="top">

@@ -26,7 +36,7 @@ const IncomingPoint = ({ point, accept, reject }: IncomingPointProps) => {

2636 </Box>

2737 </Box>

2838 <Box className="bottom">

29− <LayerIndicator layer={1} size="sm" />

39+ <LayerIndicator layer={layer} size="sm" />

3040 <Box className="date"></Box>

3141 </Box>

3242 </Box>

src/lib/useRoller.ts+1−4

@@ -403,8 +403,6 @@ export default function useRoller() {

403403 getDetails

404404 ).filter((p: number) => isPlanet(p) && availablePoints.includes(p));

405405

406− console.log(pendingSpawns, outgoingPoints, invitePoints)

407−

408406 setPendingTransactions(newPending);

409407 setInvitePoints(

410408 invitePoints

@@ -448,8 +446,7 @@ export default function useRoller() {

448446 throw new Error('Internal Error: Missing Wallet/Details');

449447 }

450448

451− const pointDetails = await api.getPoint(_point);

452− const proxy = getManagerProxy(pointDetails.ownership!, _wallet.address);

449+ const proxy = getManagerProxy(azimuthPoint.ownership!, _wallet.address);

453450

454451 if (proxy === undefined)

455452 throw new Error("Error: Address doesn't match proxy");