fix: Updated according to #104 reviews

marigold-dev · Jul 4, 2023 · 226552a · 226552a
1 parent de76be9
commit 226552a
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 23 deletions.
diff --git a/components/FA2Transfer.tsx b/components/FA2Transfer.tsx
@@ -109,25 +109,25 @@ const FA2Transfer = ({
     onTokenChange?.(newToken);
     setCurrentToken(newToken);
 
-    if (autoSetField) {
-      const previousValue = getFieldProps(
-        `transfers.${proposalIndex}.values.${localIndex}`
-      ).value;
-
-      if (
-        Array.isArray(previousValue) ||
-        (!!previousValue && "balance" in previousValue)
-      ) {
-        throw new Error("Expect previous value to be formValue");
-      }
-
-      setFieldValue(`transfers.${proposalIndex}.values.${localIndex}`, {
-        ...(previousValue ?? {}),
-        token: newToken ?? "",
-        tokenId: newToken?.token.tokenId ?? "",
-        fa2Address: newToken?.token.contract.address ?? "",
-      });
+    if (!autoSetField) return;
+
+    const previousValue = getFieldProps(
+      `transfers.${proposalIndex}.values.${localIndex}`
+    ).value;
+
+    if (
+      Array.isArray(previousValue) ||
+      (!!previousValue && "balance" in previousValue)
+    ) {
+      throw new Error("Expect previous value to be formValue");
     }
+
+    setFieldValue(`transfers.${proposalIndex}.values.${localIndex}`, {
+      ...(previousValue ?? {}),
+      token: newToken ?? "",
+      tokenId: newToken?.token.tokenId ?? "",
+      fa2Address: newToken?.token.contract.address ?? "",
+    });
   };
 
   const fetchTokens = useCallback(
@@ -345,7 +345,19 @@ const FA2TransferGroup = ({ proposalIndex, remove }: props) => {
         remove={remove}
         autoSetField={false}
         onTokenChange={token => {
+          const previousValue = getFieldProps(
+            `transfers.${proposalIndex}.values.0`
+          ).value;
+
+          if (
+            Array.isArray(previousValue) ||
+            (!!previousValue && "balance" in previousValue)
+          ) {
+            throw new Error("Expect previous value to be formValue");
+          }
+
           const data = {
+            ...previousValue,
             token,
             fa2Address: token.token.contract.address,
             tokenId: token.token.tokenId,

diff --git a/components/HistoryToken.tsx → components/HistoryFaToken.tsx b/components/HistoryToken.tsx → components/HistoryFaToken.tsx
@@ -18,7 +18,7 @@ type props = {
   };
 };
 
-const HistoryToken = ({ transferType, token }: props) => {
+const HistoryFaToken = ({ transferType, token }: props) => {
   const [isOpen, setIsOpen] = useState(false);
 
   const { tzDate, tzHours, tzMinutes } = useMemo(
@@ -77,7 +77,7 @@ const HistoryToken = ({ transferType, token }: props) => {
             {token.token.metadata.name}
           </li>
           <li>
-            <span className="text-zinc-400">Token id:</span>{" "}
+            <span className="text-zinc-400">Token ID:</span>{" "}
             {token.token.tokenId}
           </li>
           <li>
@@ -90,4 +90,4 @@ const HistoryToken = ({ transferType, token }: props) => {
   );
 };
 
-export default HistoryToken;
+export default HistoryFaToken;
diff --git a/pages/history.tsx b/pages/history.tsx
@@ -3,7 +3,7 @@ import { validateContractAddress } from "@taquito/utils";
 import BigNumber from "bignumber.js";
 import { useContext, useEffect, useMemo, useState } from "react";
 import Alias from "../components/Alias";
-import HistoryToken from "../components/HistoryToken";
+import HistoryFaToken from "../components/HistoryFaToken";
 import ProposalCard from "../components/ProposalCard";
 import Spinner from "../components/Spinner";
 import Meta from "../components/meta";
@@ -247,7 +247,10 @@ const History = () => {
                     case TransferType.FA2:
                     case TransferType.FA1_2:
                       return (
-                        <HistoryToken transferType={x[0]} token={x[1] as any} />
+                        <HistoryFaToken
+                          transferType={x[0]}
+                          token={x[1] as any}
+                        />
                       );
 
                     case TransferType.UNKNOWN: