on master help sign in
ux: show network keys modal when unset
commit441cb95dd8b0e130fa74c8999f5fc37f19d9a76c authortomholford <tomholford@users.noreply.github.com> dateSun 26 Sep 2021, 23:21 (5 years ago) parentf4f1d8f
3 files changed+9−11
src/components/L2/Dropdowns/AccountsDropdown.tsx+2−2 src/lib/useHasNetworkKeysSet.tsx+2−8 src/views/Point/Point.tsx+5−1
src/components/L2/Dropdowns/AccountsDropdown.tsx+2−2
@@ -36,7 +36,7 @@ const AccountsDropdown = ({ showMigrate = false }: AccountsDropdownProps) => {
3636 const { currentL2 }: any = useRollerStore();
3737
3838 const networkKeysSet = useHasNetworkKeysSet();
39− const showMigrateModal = useMemo(() => {
39+ const showMigrateOption = useMemo(() => {
4040 return showMigrate || (!currentL2 && networkKeysSet);
4141 }, [currentL2, networkKeysSet, showMigrate]);
4242
@@ -106,7 +106,7 @@ const AccountsDropdown = ({ showMigrate = false }: AccountsDropdownProps) => {
106106 })}
107107 </Box>
108108 <Box className="divider" />
109− {showMigrateModal && (
109+ {showMigrateOption && (
110110 <Row className="entry" onClick={() => setShowModal(true)}>
111111 <Box>Migrate</Box>
112112 <Row className="layer-migration">
src/lib/useHasNetworkKeysSet.tsx+2−8
@@ -2,27 +2,21 @@ import { useEffect, useMemo, useState } from 'react';
22import * as need from 'lib/need';
33import { usePointCache } from 'store/pointCache';
44import { usePointCursor } from 'store/pointCursor';
5−import { useRollerStore } from 'store/roller';
65import { convertToInt } from 'lib/convertToInt';
7−import { isPlanet } from 'lib/utils/point';
86
97export const useHasNetworkKeysSet = () => {
108 const { pointCursor } = usePointCursor();
119 const { getDetails } = usePointCache();
12− const { currentL2 } = useRollerStore();
1310 const point = pointCursor.getOrElse(null);
1411 const [networkKeysSet, setNetworkKeysSet] = useState<boolean>(true);
1512
1613 useEffect(() => {
1714 if (point) {
1815 const details = need.details(getDetails(point));
19− const isStarOrGalaxy = !isPlanet(point);
2016 const networkRevision = convertToInt(details.keyRevisionNumber, 10);
21− const networkKeysNotSet =
22− !currentL2 && isStarOrGalaxy && networkRevision === 0;
23− setNetworkKeysSet(!networkKeysNotSet);
17+ setNetworkKeysSet(networkRevision > 0);
2418 }
25− }, [currentL2, getDetails, point, pointCursor]);
19+ }, [getDetails, point, pointCursor]);
2620
2721 return useMemo(() => {
2822 return networkKeysSet;
src/views/Point/Point.tsx+5−1
@@ -48,7 +48,11 @@ export default function Point() {
4848 increaseNonce,
4949 } = useRollerStore();
5050 const networkKeysSet = useHasNetworkKeysSet();
51− const [showModal, setShowModal] = useState(!networkKeysSet);
51+ const [showModal, setShowModal] = useState(false);
52+
53+ useEffect(() => {
54+ setShowModal(!networkKeysSet);
55+ }, [networkKeysSet]);
5256
5357 const loadL1Info = useCallback(async () => {
5458 await syncExtras(point);