From 3dc1db9c827c45fd572ab394895ad080ab464c58 Mon Sep 17 00:00:00 2001 From: Sergej Sakac Date: Thu, 14 Sep 2023 18:47:14 +0200 Subject: [PATCH] fix --- chaindata/index.ts | 1 - src/components/Layout/index.tsx | 6 ++---- src/components/RelaySelect/index.tsx | 5 +++-- src/components/Sidebar/index.tsx | 5 ++--- src/contexts/RelayApi/index.tsx | 18 ++++++++---------- src/contracts/identity/context.tsx | 5 +++-- src/pages/_app.tsx | 12 +++++------- src/pages/transfer.tsx | 17 ++++++++++++++--- 8 files changed, 37 insertions(+), 32 deletions(-) diff --git a/chaindata/index.ts b/chaindata/index.ts index 3ecc9ad..421fe33 100644 --- a/chaindata/index.ts +++ b/chaindata/index.ts @@ -86,7 +86,6 @@ export class Chaindata { } public async getChain(chainId: number, relay: string): Promise { - console.log(relay); if (chainId === 0) { const result: any = await request(graphqlUrl, relayQuery, { relayId: relay diff --git a/src/components/Layout/index.tsx b/src/components/Layout/index.tsx index 339bd1d..39d2989 100644 --- a/src/components/Layout/index.tsx +++ b/src/components/Layout/index.tsx @@ -8,18 +8,16 @@ import { Sidebar } from '../Sidebar'; interface Props { children: ReactElement | ReactElement[]; - relay: string, - setRelay: (relay: string) => void } -export const Layout = ({ relay, setRelay, children }: Props) => { +export const Layout = ({ children }: Props) => { const { isConnected } = useInkathon(); return (
- +
{isConnected ? ( diff --git a/src/components/RelaySelect/index.tsx b/src/components/RelaySelect/index.tsx index 22424dc..4f335a3 100644 --- a/src/components/RelaySelect/index.tsx +++ b/src/components/RelaySelect/index.tsx @@ -1,7 +1,8 @@ +import { useRelay } from "@/contexts/RelayApi"; import { FormControl, InputLabel, MenuItem, Select } from "@mui/material" -const RelaySelect = ({ relay, setRelay }: { relay: string, setRelay: (relay: string) => void }) => { - +const RelaySelect = () => { + const { relay, setRelay } = useRelay(); const handleChange = (e: any) => { setRelay(e.target.value); }; diff --git a/src/components/Sidebar/index.tsx b/src/components/Sidebar/index.tsx index 302cee5..1506530 100644 --- a/src/components/Sidebar/index.tsx +++ b/src/components/Sidebar/index.tsx @@ -28,8 +28,7 @@ const MenuItem = ({ label, route, icon }: MenuItemProps) => { ); }; -export const Sidebar = ({ relay, setRelay }: { relay: string, setRelay: (relay: string) => void }) => { - console.log(setRelay); +export const Sidebar = () => { const menuItems: MenuItemProps[] = [ { label: 'My Identity', @@ -53,7 +52,7 @@ export const Sidebar = ({ relay, setRelay }: { relay: string, setRelay: (relay: ))}
- +
); diff --git a/src/contexts/RelayApi/index.tsx b/src/contexts/RelayApi/index.tsx index 5d6381f..fe1d3ca 100644 --- a/src/contexts/RelayApi/index.tsx +++ b/src/contexts/RelayApi/index.tsx @@ -81,23 +81,21 @@ const RelayContext = React.createContext( const RelayContextProvider = (props: any) => { const [relay, setRelay]: [relay: "polkadot" | "kusama", setRelay: any] = useState("polkadot"); - const handleChange = (value: string) => { - console.log(value); - setRelay(value); - } - return ( - + {props.children} ); } +const useRelay = () => useContext(RelayContext); + const RelayApiContext = React.createContext(defaultValue); const RelayApiContextProvider = (props: any) => { const [state, dispatch] = useReducer(reducer, initialState); const { toastError, toastSuccess } = useToast(); + const { relay } = useRelay(); useEffect(() => { state.apiError && @@ -112,9 +110,9 @@ const RelayApiContextProvider = (props: any) => { }, [state.apiState]); useEffect(() => { - console.log(props.relay); - connect(state, getRelayChainApiURL(props.relay), dispatch); - }, [props.relay]); + console.log(relay); + connect(state, getRelayChainApiURL(relay), dispatch); + }, [relay]); return ( @@ -122,7 +120,7 @@ const RelayApiContextProvider = (props: any) => { ); }; -const useRelay = () => useContext(RelayContext); + const useRelayApi = () => useContext(RelayApiContext); export { RelayApiContextProvider, RelayContextProvider, useRelayApi, useRelay }; diff --git a/src/contracts/identity/context.tsx b/src/contracts/identity/context.tsx index a251abe..20badab 100644 --- a/src/contracts/identity/context.tsx +++ b/src/contracts/identity/context.tsx @@ -22,6 +22,7 @@ import { useToast } from '@/contexts/Toast'; import { IdentityMetadata } from '.'; import { CONTRACT_IDENTITY } from '..'; import { Address, ChainConsts, ChainId, Chains, IdentityNo } from '../types'; +import { useRelay } from '@/contexts/RelayApi'; interface IdentityContract { identityNo: number | null; @@ -56,10 +57,9 @@ const IdentityContext = createContext(defaultIdentity); interface Props { children: React.ReactNode; - relay: "polkadot" | "kusama"; } -const IdentityContractProvider = ({ children, relay }: Props) => { +const IdentityContractProvider = ({ children }: Props) => { const { contract } = useContract(IdentityMetadata, CONTRACT_IDENTITY); const { api, activeAccount } = useInkathon(); const [identityNo, setIdentityNo] = useState(null); @@ -68,6 +68,7 @@ const IdentityContractProvider = ({ children, relay }: Props) => { const [loadingIdentityNo, setLoadingIdentityNo] = useState(false); const [loadingChains, setLoadingChains] = useState(false); const { toastError } = useToast(); + const { relay } = useRelay(); const fetchIdentityNo = useCallback(async () => { if (!api || !contract || !activeAccount) { diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index 94bbe0b..a0107e0 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -14,11 +14,10 @@ import theme from '@/utils/muiTheme'; import { Layout } from '@/components/Layout'; -import { RelayApiContextProvider, RelayContextProvider, useRelay } from '@/contexts/RelayApi'; +import { RelayApiContextProvider, RelayContextProvider } from '@/contexts/RelayApi'; import { ToastProvider } from '@/contexts/Toast'; import { IdentityContractProvider } from '@/contracts'; import { AddressBookContractProvider } from '@/contracts/addressbook/context'; -import { createContext, useState } from 'react'; // Client-side cache, shared for the whole session of the user in the browser. const clientSideEmotionCache = createEmotionCache(); @@ -32,10 +31,9 @@ interface MyAppProps extends AppProps { export default function MyApp(props: MyAppProps) { const { Component, emotionCache = clientSideEmotionCache, pageProps } = props; - const { relay, setRelay } = useRelay(); const getLayout = Component.getLayout ?? ((page) => - {page} + {page} ); @@ -50,7 +48,7 @@ export default function MyApp(props: MyAppProps) { - + - + - {getLayout()} + {getLayout()} diff --git a/src/pages/transfer.tsx b/src/pages/transfer.tsx index 3de13cc..205051f 100644 --- a/src/pages/transfer.tsx +++ b/src/pages/transfer.tsx @@ -30,12 +30,12 @@ import { getTeleportableAssets } from '@/utils/xcmTransfer/teleportableRoutes'; import { Fungible } from '@/utils/xcmTransfer/types'; import { chainsSupportingXcmExecute } from '@/consts'; -import { useRelayApi } from '@/contexts/RelayApi'; +import { RelayContextProvider, useRelay, useRelayApi } from '@/contexts/RelayApi'; import { useToast } from '@/contexts/Toast'; import { useIdentity } from '@/contracts'; import { useAddressBook } from '@/contracts/addressbook/context'; -const TransferPage = ({ relay }: { relay: "polkadot" | "kusama" }) => { +const TransferPage = () => { const { chains, getAddresses, @@ -61,6 +61,8 @@ const TransferPage = ({ relay }: { relay: "polkadot" | "kusama" }) => { const [amount, setAmount] = useState(); const [transferring, setTransferring] = useState(false); + const { relay } = useRelay(); + const chainsSelected = !loadingAssets && sourceChainId !== undefined && destChainId !== undefined; const assetSelected = chainsSelected && Boolean(selectedAsset); @@ -506,4 +508,13 @@ const TransferPage = ({ relay }: { relay: "polkadot" | "kusama" }) => { ); }; -export default TransferPage; + +const TransferPageWrapped = () => { + return ( + + + + ) +} + +export default TransferPageWrapped;