broken_again

trilitech · Oct 25, 2024 · 886a7e1 · 886a7e1
1 parent a08b56d
commit 886a7e1
Show file tree

Hide file tree

Showing 12 changed files with 91 additions and 109 deletions.
diff --git a/apps/web/src/components/SendFlow/Beacon/useSignWithBeacon.tsx b/apps/web/src/components/SendFlow/Beacon/useSignWithBeacon.tsx
@@ -44,7 +44,6 @@ export const useSignWithBeacon = ({
     fee: totalFee(form.watch("executeParams")),
     isSigning,
     onSign,
-    network: headerProps.network,
-    form,
+    network: headerProps.network
   };
 };
diff --git a/apps/web/src/components/SendFlow/WalletConnect/useSignWithWc.tsx b/apps/web/src/components/SendFlow/WalletConnect/useSignWithWc.tsx
@@ -24,7 +24,6 @@ export const useSignWithWalletConnect = ({
       isSigning: false,
       onSign: async () => {},
       network: null,
-      form,
     };
   }
 
@@ -50,6 +49,5 @@ export const useSignWithWalletConnect = ({
     isSigning,
     onSign,
     network: headerProps.network,
-    form,
   };
 };
diff --git a/apps/web/src/components/SendFlow/sdk/ContractCallSignPage.tsx b/apps/web/src/components/SendFlow/sdk/ContractCallSignPage.tsx
@@ -12,7 +12,7 @@ import {
   ModalFooter,
 } from "@chakra-ui/react";
 import { type ContractCall } from "@umami/core";
-import { FormProvider } from "react-hook-form";
+import { FormProvider, useForm } from "react-hook-form";
 
 import { Header } from "./Header";
 import { useColor } from "../../../styles/useColor";
@@ -35,7 +35,8 @@ export const ContractCallSignPage = (
     args,
   } = operation.operations[0] as ContractCall;
   const color = useColor();
-  const { isSigning, onSign, network, fee, form } = calculatedSignProps;
+  const { isSigning, onSign, network, fee } = calculatedSignProps;
+  const form = useForm({ defaultValues: { executeParams: operation.estimates } });
 
   return (
     <FormProvider {...form}>

diff --git a/apps/web/src/components/SendFlow/sdk/DelegationSignPage.tsx b/apps/web/src/components/SendFlow/sdk/DelegationSignPage.tsx
@@ -1,6 +1,6 @@
 import { Flex, FormLabel, ModalBody, ModalContent, ModalFooter } from "@chakra-ui/react";
 import { type Delegation } from "@umami/core";
-import { FormProvider } from "react-hook-form";
+import { FormProvider, useForm } from "react-hook-form";
 
 import { Header } from "./Header";
 import { AddressTile } from "../../AddressTile/AddressTile";
@@ -15,7 +15,8 @@ export const DelegationSignPage = (
 ) => {
   const { recipient } = operation.operations[0] as Delegation;
 
-  const { isSigning, onSign, network, fee, form } = calculatedSignProps;
+  const { isSigning, onSign, network, fee } = calculatedSignProps;
+  const form = useForm({ defaultValues: { executeParams: operation.estimates } });
 
   return (
     <FormProvider {...form}>

diff --git a/apps/web/src/components/SendFlow/sdk/FinalizeUnstakeSignPage.tsx b/apps/web/src/components/SendFlow/sdk/FinalizeUnstakeSignPage.tsx
@@ -1,6 +1,6 @@
 import { Flex, FormLabel, ModalBody, ModalContent, ModalFooter } from "@chakra-ui/react";
 import { useAccountTotalFinalizableUnstakeAmount } from "@umami/state";
-import { FormProvider } from "react-hook-form";
+import { FormProvider, useForm } from "react-hook-form";
 
 import { Header } from "./Header";
 import { AddressTile } from "../../AddressTile/AddressTile";
@@ -13,7 +13,8 @@ export const FinalizeUnstakeSignPage = (
   { operation, headerProps }: SdkSignPageProps,
   calculatedSignProps: CalculatedSignProps
 ) => {
-  const { isSigning, onSign, network, fee, form } = calculatedSignProps;
+  const { isSigning, onSign, network, fee } = calculatedSignProps;
+  const form = useForm({ defaultValues: { executeParams: operation.estimates } });
   const totalFinalizableAmount = useAccountTotalFinalizableUnstakeAmount(
     operation.signer.address.pkh
   );

diff --git a/apps/web/src/components/SendFlow/sdk/OriginationOperationSignPage.tsx b/apps/web/src/components/SendFlow/sdk/OriginationOperationSignPage.tsx
@@ -17,7 +17,7 @@ import {
 } from "@chakra-ui/react";
 import { type ContractOrigination } from "@umami/core";
 import { capitalize } from "lodash";
-import { FormProvider } from "react-hook-form";
+import { FormProvider, useForm } from "react-hook-form";
 
 import { CodeSandboxIcon } from "../../../assets/icons";
 import { useColor } from "../../../styles/useColor";
@@ -31,9 +31,10 @@ export const OriginationOperationSignPage = (
   { operation, headerProps }: SdkSignPageProps,
   calculatedSignProps: CalculatedSignProps
 ) => {
-  const { isSigning, onSign, network, form, fee } = calculatedSignProps;
+  const { isSigning, onSign, network, fee } = calculatedSignProps;
   const color = useColor();
   const { code, storage } = operation.operations[0] as ContractOrigination;
+  const form = useForm({ defaultValues: { executeParams: operation.estimates } });
 
   return (
     <FormProvider {...form}>
@@ -48,7 +49,7 @@ export const OriginationOperationSignPage = (
                 Network:
               </Heading>
               <Text color={color("700")} fontWeight="400" size="sm">
-                {capitalize(headerProps.networkName)}
+                {capitalize(headerProps.network.name)}
               </Text>
             </Flex>
           </ModalHeader>

diff --git a/apps/web/src/components/SendFlow/sdk/StakeSignPage.tsx b/apps/web/src/components/SendFlow/sdk/StakeSignPage.tsx
@@ -1,6 +1,6 @@
 import { Flex, FormLabel, ModalBody, ModalContent, ModalFooter } from "@chakra-ui/react";
 import { type Stake } from "@umami/core";
-import { FormProvider } from "react-hook-form";
+import { FormProvider, useForm } from "react-hook-form";
 
 import { Header } from "./Header";
 import { AddressTile } from "../../AddressTile/AddressTile";
@@ -15,7 +15,8 @@ export const StakeSignPage = (
 ) => {
   const { amount: mutezAmount } = operation.operations[0] as Stake;
 
-  const { isSigning, onSign, network, fee, form } = calculatedSignProps;
+  const { isSigning, onSign, network, fee } = calculatedSignProps;
+  const form = useForm({ defaultValues: { executeParams: operation.estimates } });
 
   return (
     <FormProvider {...form}>

diff --git a/apps/web/src/components/SendFlow/sdk/TezSignPage.tsx b/apps/web/src/components/SendFlow/sdk/TezSignPage.tsx
@@ -15,9 +15,11 @@ export const TezSignPage = (
   calculatedSignProps: CalculatedSignProps
 ) => {
   const { amount: mutezAmount, recipient } = operation.operations[0] as TezTransfer;
+  console.log("TezSignPage", calculatedSignProps);
 
   const { isSigning, onSign, network, fee } = calculatedSignProps;
   const form = useForm({ defaultValues: { executeParams: operation.estimates } });
+
 
   return (
     <FormProvider {...form}>

diff --git a/apps/web/src/components/SendFlow/sdk/UndelegationSignPage.tsx b/apps/web/src/components/SendFlow/sdk/UndelegationSignPage.tsx
@@ -1,5 +1,5 @@
 import { Flex, FormLabel, ModalBody, ModalContent, ModalFooter } from "@chakra-ui/react";
-import { FormProvider } from "react-hook-form";
+import { FormProvider, useForm } from "react-hook-form";
 
 import { Header } from "./Header";
 import { AddressTile } from "../../AddressTile/AddressTile";
@@ -12,7 +12,8 @@ export const UndelegationSignPage = (
   { operation, headerProps }: SdkSignPageProps,
   calculatedSignProps: CalculatedSignProps
 ) => {
-  const { isSigning, onSign, network, form, fee } = calculatedSignProps;
+  const { isSigning, onSign, network, fee } = calculatedSignProps;
+  const form = useForm({ defaultValues: { executeParams: operation.estimates } });
 
   return (
     <FormProvider {...form}>

diff --git a/apps/web/src/components/SendFlow/sdk/UnstakeSignPage.tsx b/apps/web/src/components/SendFlow/sdk/UnstakeSignPage.tsx
@@ -1,6 +1,6 @@
 import { Flex, FormLabel, ModalBody, ModalContent, ModalFooter } from "@chakra-ui/react";
 import { type Unstake } from "@umami/core";
-import { FormProvider } from "react-hook-form";
+import { FormProvider, useForm } from "react-hook-form";
 
 import { Header } from "./Header";
 import { AddressTile } from "../../AddressTile/AddressTile";
@@ -15,7 +15,8 @@ export const UnstakeSignPage = (
 ) => {
   const { amount: mutezAmount } = operation.operations[0] as Unstake;
 
-  const { isSigning, onSign, network, fee, form } = calculatedSignProps;
+  const { isSigning, onSign, network, fee } = calculatedSignProps;
+  const form = useForm({ defaultValues: { executeParams: operation.estimates } });
 
   return (
     <FormProvider {...form}>

diff --git a/apps/web/src/components/SendFlow/utils.tsx b/apps/web/src/components/SendFlow/utils.tsx
@@ -55,7 +55,6 @@ export type CalculatedSignProps = {
   isSigning: boolean;
   onSign: (tezosToolkit: TezosToolkit) => Promise<void>;
   network: any;
-  form: any;
 };
 
 export type sdkType = "beacon" | "walletconnect";

diff --git a/apps/web/src/components/WalletConnect/WalletConnectProvider.tsx b/apps/web/src/components/WalletConnect/WalletConnectProvider.tsx
@@ -23,88 +23,20 @@ import { SessionProposalModal } from "./SessionProposalModal";
 import { useHandleWcRequest } from "./useHandleWcRequest";
 
 export const WalletConnectProvider = ({ children }: PropsWithChildren) => {
-  const onSessionProposal = useOnSessionProposal();
-  const onSessionDelete = useOnSessionDelete();
-  // const onSessionRequest = useOnSessionRequest();
-  const slice = useGetAllWcTopicToAcc();
-
-  const queryClient = useQueryClient();
-  // const peers = queryClient.getQueryData(["wcPeers"]);
-  // console.log("WalletConnectProvider, wcPeers from query", peers);
-
-  // const onSessionRequest = () => {
-    const { handleAsyncActionUnsafe } = useAsyncActionHandler();
-    const { peers } = useWcPeers();
-
-    const handleWcRequest = useHandleWcRequest();
-    const toast = useToast();
-
-    // return (event: WalletKitTypes.SessionRequest) =>
-    const onSessionRequest = (event: WalletKitTypes.SessionRequest, peers: Record<string, SessionTypes.Struct> | undefined, sliceTopicToAcc: State) =>
-      handleAsyncActionUnsafe(async () => {
-        if (!peers) {
-          throw new Error("No peers found in the state");
-        }
-        console.log("Session request, sliceTopicToAcc, wcPeers", event, sliceTopicToAcc, peers);
-        if (event.topic in sliceTopicToAcc) {
-          console.log("Session request from dApp", sliceTopicToAcc[event.topic], peers[event.topic]);
-          toast({
-            description: `Session request from dApp ${peers[event.topic].peer.metadata.name}`,
-            status: "info",
-          });
-        }
-        await handleWcRequest(event, peers);
-      }).catch(async error => {
-        const { id, topic } = event;
-        const peers: Record<string, SessionTypes.Struct> | undefined = queryClient.getQueryData(["wcPeers"]);
-        if (!peers) {
-          throw new Error("No peers found in the state");
-        }
-        console.error("WalletConnect session request failed", event, peers, error);
-        if (event.topic in peers) {
-          toast({
-            description: `Session request for dApp ${peers[topic].peer.metadata.name} failed. It was rejected.`,
-            status: "error",
-          });
-        } else {
-          toast({
-            description: `Session request for dApp ${topic} failed. It was rejected. Peer not found by topic.`,
-            status: "error",
-          });
-        }
-        // dApp is waiting so we need to notify it
-        const response = formatJsonRpcError(id, getSdkError("INVALID_METHOD").message);
-        await walletKit.respondSessionRequest({ topic, response });
-      });
-  // };
-
-
-  useEffect(() => {
-    // const peers: Record<string, SessionTypes.Struct> | undefined = queryClient.getQueryData(["wcPeers"]);
-
-    const initializeWallet = async () => {
-      await createWalletKit();
-      walletKit.on("session_proposal", event => void onSessionProposal(event));
-      walletKit.on("session_request", event => void onSessionRequest(event, peers, slice));
-      walletKit.on("session_delete", event => void onSessionDelete(event));
-    };
-    void initializeWallet();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  useEffect(() =>{
-    console.log("WalletConnectProvider useEffect(), PEERS and SLICE", peers, slice);
-  }, [peers, slice])
-
-  return children;
-};
-
-const useOnSessionProposal = () => {
-  const { handleAsyncActionUnsafe } = useAsyncActionHandler();
+  const { handleAsyncAction, handleAsyncActionUnsafe } = useAsyncActionHandler();
   const { openWith } = useDynamicModalContext();
+  const toast = useToast();
+
   const availableNetworks: Network[] = useAvailableNetworks();
 
-  return (proposal: WalletKitTypes.SessionProposal) =>
+  const handleWcRequest = useHandleWcRequest();
+  const removeWcPeer = useRemoveWcConnection();
+  const queryClient = useQueryClient();
+
+  const slice = useGetAllWcTopicToAcc();
+  const { peers, refresh } = useWcPeers();
+
+  const onSessionProposal = (proposal: WalletKitTypes.SessionProposal) =>
     handleAsyncActionUnsafe(async () => {
       // dApp sends in the session proposal the required networks and the optional networks.
       // The response must contain all the required networks but Umami supports just one per request.
@@ -133,17 +65,8 @@ const useOnSessionProposal = () => {
       // dApp is waiting so we need to notify it
       await walletKit.rejectSession({ id: proposal.id, reason: getSdkError("UNSUPPORTED_CHAINS") });
     });
-};
-
 
-
-const useOnSessionDelete = () => {
-  const { handleAsyncAction } = useAsyncActionHandler();
-  const { peers, refresh } = useWcPeers();
-  const removeWcPeer = useRemoveWcConnection();
-  const toast = useToast();
-
-  return (event: WalletKitTypes.SessionDelete) =>
+  const onSessionDelete = (event: WalletKitTypes.SessionDelete) =>
     handleAsyncAction(async () => {
       const { topic } = event;
       if (topic in peers) {
@@ -159,6 +82,60 @@ const useOnSessionDelete = () => {
       // update peer list in the UI
       await refresh();
     });
+
+  const onSessionRequest = (
+    event: WalletKitTypes.SessionRequest,
+    peers: Record<string, SessionTypes.Struct> | undefined,
+    sliceTopicToAcc: State
+  ) =>
+    handleAsyncActionUnsafe(async () => {
+      if (!peers) {
+        throw new Error("No peers found in the state");
+      }
+      console.log("Session request, sliceTopicToAcc, wcPeers", event, sliceTopicToAcc, peers);
+      if (event.topic in sliceTopicToAcc) {
+        console.log("Session request from dApp", sliceTopicToAcc[event.topic], peers[event.topic]);
+        toast({
+          description: `Session request from dApp ${peers[event.topic].peer.metadata.name}`,
+          status: "info",
+        });
+      }
+      await handleWcRequest(event, peers);
+    }).catch(async error => {
+      const { id, topic } = event;
+      console.error("WalletConnect session request failed", event, peers, error);
+      if (peers && event.topic in peers) {
+        toast({
+          description: `Session request for dApp ${peers[topic].peer.metadata.name} failed. It was rejected.`,
+          status: "error",
+        });
+      } else {
+        toast({
+          description: `Session request for dApp ${topic} failed. It was rejected. Peer not found by topic.`,
+          status: "error",
+        });
+      }
+      // dApp is waiting so we need to notify it
+      const response = formatJsonRpcError(id, getSdkError("INVALID_METHOD").message);
+      await walletKit.respondSessionRequest({ topic, response });
+    });
+
+  useEffect(() => {
+    const initializeWallet = async () => {
+      await createWalletKit();
+      walletKit.on("session_proposal", event => void onSessionProposal(event));
+      walletKit.on("session_request", event => void onSessionRequest(event, peers, slice));
+      walletKit.on("session_delete", event => void onSessionDelete(event));
+    };
+    void initializeWallet();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  useEffect(() => {
+    console.log("WalletConnectProvider useEffect(), PEERS and SLICE", peers, slice);
+  }, [peers, slice]);
+
+  return children;
 };
 
 export const useOnWalletConnect = () => {