Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/hooks/useNetworks.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@ import { useMemo } from "react";
export default function useNetworks(all = false) {
const { version } = useVersion();
if (all) {
return useMemo(
() => [...allNetworks[Versions.V1], ...allNetworks[Versions.V2]],
[]
);
return useMemo(() => [...allNetworks[Versions.V1], ...allNetworks[Versions.V2]], []);
}
return useMemo(() => allNetworks[version || Versions.V1], [version]);
return useMemo(() => allNetworks[version], [version]);
}
36 changes: 13 additions & 23 deletions src/pages/Connect.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,13 @@ import "./Connect.scss";
import { useEffect } from "react";
import { useNetwork } from "wagmi";
import { Helmet } from "react-helmet";
import {
Heading,
Text,
Box,
InfoBanner,
WarningIcon,
SegmentedControl,
} from "@unioncredit/ui";
import { Heading, Text, Box, InfoBanner, WarningIcon, SegmentedControl } from "@unioncredit/ui";

import LoadingPage from "pages/Loading";
import Banner from "components/connect/Banner";
import { useMember } from "providers/MemberData";
import NetworkSelect from "components/connect/NetworkSelect";
import { useVersion, Versions } from "providers/Version";
import { DefaultVersion, useVersion, Versions } from "providers/Version";

export default function ConnectPage() {
const { chain } = useNetwork();
Expand Down Expand Up @@ -43,10 +36,13 @@ export default function ConnectPage() {
{ id: Versions.V2, label: "Union v2" },
];

const initialActive0 = versionToggleItems.findIndex(
(item) => item.id === version
);
const initialActive = !!~initialActive0 ? initialActive0 : 0;
const initialActive0 = versionToggleItems.find((item) => item.id === version);
const initialActive1 = versionToggleItems.find((item) => item.id === DefaultVersion);
const toggleValue = !!initialActive0
? initialActive0.id
: !!initialActive1
? initialActive1.id
: versionToggleItems[0].id;

return (
<>
Expand All @@ -56,13 +52,7 @@ export default function ConnectPage() {

<Banner />
<Box justify="center" fluid>
<Box
className="Connect__container"
direction="vertical"
w="100%"
pb="2em"
maxw="485px"
>
<Box className="Connect__container" direction="vertical" w="100%" pb="2em" maxw="485px">
{chain?.unsupported && (
<InfoBanner
mb="16px"
Expand All @@ -73,15 +63,15 @@ export default function ConnectPage() {
)}
<Heading>Select a Credit Network</Heading>
<Text color="grey600" mt="0" mb="16px">
Union’s networks are isolated, so it’s best to choose the network
where your friends and DAO’s are.
Union’s networks are isolated, so it’s best to choose the network where your friends and
DAO’s are.
</Text>
<Box mb="16px" fluid>
<SegmentedControl
fluid
items={versionToggleItems}
onChange={onToggleVersion}
initialActive={initialActive}
value={toggleValue}
/>
</Box>
<NetworkSelect />
Expand Down
18 changes: 9 additions & 9 deletions src/providers/Version.jsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
import { useAccount, useNetwork } from "wagmi";
import {
mainnet,
goerli,
arbitrum,
optimismGoerli,
optimism,
} from "wagmi/chains";
import { mainnet, goerli, arbitrum, optimismGoerli, optimism } from "wagmi/chains";
import { createContext, useContext, useState, useEffect } from "react";

const VersionContext = createContext({});
Expand All @@ -17,6 +11,8 @@ export const Versions = {
V2: "v2",
};

export const DefaultVersion = Versions.V2;

const versionSupport = {
[Versions.V1]: [mainnet.id, goerli.id, arbitrum.id],
[Versions.V2]: [optimismGoerli.id, optimism.id],
Expand All @@ -38,7 +34,9 @@ export default function Version({ children }) {
const versioned = (v1, v2) => (version === Versions.V1 ? v1 : v2);

useEffect(() => {
if (!connectedChain?.id || version) return;
if (!connectedChain?.id) {
return;
}

const checkVersion = (_version) =>
isVersionSupported(_version, connectedChain.id) && version !== _version;
Expand All @@ -65,9 +63,11 @@ export default function Version({ children }) {
}
};

const _version = version || DefaultVersion;

return (
<VersionContext.Provider
value={{ isV2: version === Versions.V2, version, setVersion, versioned }}
value={{ isV2: _version === Versions.V2, version: _version, setVersion, versioned }}
>
{children}
</VersionContext.Provider>
Expand Down