From a6e3ddf2d91aa8e626076c8c68114edb53c5b35c Mon Sep 17 00:00:00 2001
From: Megha-Dev-19 <meghadev1901@gmail.com>
Date: Sun, 21 Jan 2024 13:18:36 +0530
Subject: [PATCH] made few contract integration updates

---
 src/devhub/entity/trustee/approvals.jsx | 196 ++++++++++++-----------
 src/devhub/entity/trustee/history.jsx   | 197 +++++++++++++-----------
 src/devhub/entity/trustee/login.jsx     |   2 +-
 3 files changed, 208 insertions(+), 187 deletions(-)

diff --git a/src/devhub/entity/trustee/approvals.jsx b/src/devhub/entity/trustee/approvals.jsx
index 4fb15e3e7..c624c6e5f 100644
--- a/src/devhub/entity/trustee/approvals.jsx
+++ b/src/devhub/entity/trustee/approvals.jsx
@@ -77,99 +77,113 @@ const Container = styled.div`
 `;
 
 // filter transfer proposals
-const transferProposals = proposals.filter(
-  (item) => item.kind?.FunctionCall?.actions?.[0]?.method_name === "ft_transfer"
-);
+const transferProposals = proposals.filter((item) => {
+  if (item.kind?.FunctionCall?.actions?.[0]?.method_name) {
+    return (
+      item.kind.FunctionCall.actions[0].method_name === "ft_transfer" &&
+      item.status === "InProgress"
+    );
+  }
+  return false;
+});
 
 const ProposalsComponent = () => {
-  transferProposals?.map((item, index) => {
-    // decode args
-    const actions = item.kind?.FunctionCall?.actions?.[0];
-    const args = JSON.parse(atob(actions?.args ?? ""));
-    const isReceiverkycbVerified = true;
-    const isNEAR = true;
-    const address = item.token;
-    let ftMetadata = {
-      symbol: "NEAR",
-      decimals: 24,
-    };
-    if (!isNEAR) {
-      ftMetadata = Near.view(address, "ft_metadata", {});
-      if (ftMetadata === null) return null;
-    }
-    let amount = amountWithDecimals;
-    if (amountWithoutDecimals !== undefined) {
-      amount = Big(amountWithoutDecimals)
-        .div(Big(10).pow(ftMetadata.decimals))
-        .toString();
-    }
-
-    return (
-      <tr className={expandSummaryIndex[index] ? "text-grey-100" : ""}>
-        <td>{item.id}</td>
-        <td>
-          <div className="d-flex flex-row gap-2">
-            <div
-              className="d-flex flex-column gap-2 flex-wrap"
-              style={{ maxWidth: 320 }}
-            >
-              <div
-                className={
-                  "text-size-2 bold max-w-100" +
-                  (!expandSummaryIndex[index] && " text-truncate")
-                }
-              >
-                {args.title}
+  return (
+    <tbody>
+      {transferProposals?.map((item, index) => {
+        // decode args
+        const actions = item.kind?.FunctionCall?.actions?.[0];
+        const args = JSON.parse(atob(actions?.args ?? ""));
+        const isReceiverkycbVerified = true;
+        const isNEAR = true;
+        const address = item.token;
+        let ftMetadata = {
+          symbol: "NEAR",
+          decimals: 24,
+        };
+        if (!isNEAR) {
+          ftMetadata = Near.view(address, "ft_metadata", {});
+          if (ftMetadata === null) return null;
+        }
+        // let amount = amountWithDecimals;
+        // if (amountWithoutDecimals !== undefined) {
+        //   amount = Big(amountWithoutDecimals)
+        //     .div(Big(10).pow(ftMetadata.decimals))
+        //     .toString();
+        // }
+
+        return (
+          <tr className={expandSummaryIndex[index] ? "text-grey-100" : ""}>
+            <td>{item.id}</td>
+            <td>
+              <div className="d-flex flex-row gap-2">
+                <div
+                  className="d-flex flex-column gap-2 flex-wrap"
+                  style={{ maxWidth: 320 }}
+                >
+                  <div
+                    className={
+                      "text-size-2 bold max-w-100" +
+                      (!expandSummaryIndex[index] && " text-truncate")
+                    }
+                  >
+                    {args.title}
+                  </div>
+                  {expandSummaryIndex[index] && (
+                    <div className={"text-dark-grey max-w-100"}>
+                      {args.summary}
+                    </div>
+                  )}
+                </div>
+                <div className="cursor">
+                  <img
+                    src={
+                      expandSummaryIndex[index]
+                        ? "https://ipfs.near.social/ipfs/bafkreic35n4yddasdpl532oqcxjwore66jrjx2qc433hqdh5wi2ijy4ida"
+                        : "https://ipfs.near.social/ipfs/bafkreiaujwid7iigy6sbkrt6zkwmafz5umocvzglndugvofcz2fpw5ur3y"
+                    }
+                    onClick={() =>
+                      setExpandSummary((prevState) => ({
+                        ...prevState,
+                        [index]: !prevState[index],
+                      }))
+                    }
+                    height={20}
+                  />
+                </div>
               </div>
-              {expandSummaryIndex[index] && (
-                <div className={"text-dark-grey max-w-100"}>{args.summary}</div>
+            </td>
+            <td className="text-truncate bold" style={{ maxWidth: 150 }}>
+              {treasuryDaoID}
+            </td>
+            <td className="text-truncate bold" style={{ maxWidth: 150 }}>
+              {args.receiver_id}
+            </td>
+            <td className="text-center">
+              {isReceiverkycbVerified ? (
+                <img
+                  src="https://ipfs.near.social/ipfs/bafkreidqveupkcc7e3rko2e67lztsqrfnjzw3ceoajyglqeomvv7xznusm"
+                  height={30}
+                />
+              ) : (
+                "Need icon"
               )}
-            </div>
-            <div className="cursor">
-              <img
-                src={
-                  expandSummaryIndex[index]
-                    ? "https://ipfs.near.social/ipfs/bafkreic35n4yddasdpl532oqcxjwore66jrjx2qc433hqdh5wi2ijy4ida"
-                    : "https://ipfs.near.social/ipfs/bafkreiaujwid7iigy6sbkrt6zkwmafz5umocvzglndugvofcz2fpw5ur3y"
-                }
-                onClick={() =>
-                  setExpandSummary((prevState) => ({
-                    ...prevState,
-                    [index]: !prevState[index],
-                  }))
-                }
-                height={20}
-              />
-            </div>
-          </div>
-        </td>
-        <td className="text-truncate bold" style={{ maxWidth: 150 }}>
-          {treasuryDaoID}
-        </td>
-        <td className="text-truncate bold" style={{ maxWidth: 150 }}>
-          {args.receiver_id}
-        </td>
-        <td className="text-center">
-          {isReceiverkycbVerified ? (
-            <img
-              src="https://ipfs.near.social/ipfs/bafkreidqveupkcc7e3rko2e67lztsqrfnjzw3ceoajyglqeomvv7xznusm"
-              height={30}
-            />
-          ) : (
-            "Need icon"
-          )}
-        </td>
-        <td className="bold">{item.token}</td>
-        <td className="bold">
-          {parseFloat(args.amount).toLocaleString("en-US")}
-        </td>
-        <td className="text-grey">{getRelativeTime(item.submission_time)}</td>
-        <td>
-          <button onClick={() => onPay(item.id)}>Pay</button>
-        </td>
-      </tr>
-    );
-  });
+            </td>
+            <td className="bold">{item.token}</td>
+            <td className="bold">
+              {parseFloat(args.amount).toLocaleString("en-US")}
+            </td>
+            <td className="text-grey">
+              {getRelativeTime(item.submission_time)}
+            </td>
+            <td>
+              <button onClick={() => onPay(item.id)}>Pay</button>
+            </td>
+          </tr>
+        );
+      })}
+    </tbody>
+  );
 };
 
 return (
@@ -193,9 +207,7 @@ return (
             <td>PAY</td>
           </tr>
         </thead>
-        <tbody>
-          <ProposalsComponent />
-        </tbody>
+        <ProposalsComponent />
       </table>
     </div>
     <div className="d-flex align-items-center justify-content-center">
diff --git a/src/devhub/entity/trustee/history.jsx b/src/devhub/entity/trustee/history.jsx
index b27b8c366..1ee91d04a 100644
--- a/src/devhub/entity/trustee/history.jsx
+++ b/src/devhub/entity/trustee/history.jsx
@@ -57,101 +57,111 @@ const Container = styled.div`
 `;
 
 // filter approved proposals
-const historyProposals = proposals.filter(
-  (item) =>
-    item.kind?.FunctionCall?.actions?.[0]?.method_name === "ft_transfer" &&
-    item.status === "Approved"
-);
+const historyProposals = proposals.filter((item) => {
+  if (item.kind?.FunctionCall?.actions?.[0]?.method_name) {
+    return (
+      item.kind?.FunctionCall?.actions?.[0]?.method_name === "ft_transfer" &&
+      item.status === "Approved"
+    );
+  }
+  return false;
+});
 
 const ProposalsComponent = () => {
-  historyProposals?.map((item, index) => {
-    // decode args
-    const actions = item.kind?.FunctionCall?.actions?.[0];
-    const args = JSON.parse(atob(actions?.args ?? ""));
-    const isReceiverkycbVerified = true;
-    const isNEAR = true;
-    const address = item.token;
-    let ftMetadata = {
-      symbol: "NEAR",
-      decimals: 24,
-    };
-    if (!isNEAR) {
-      ftMetadata = Near.view(address, "ft_metadata", {});
-      if (ftMetadata === null) return null;
-    }
-    let amount = amountWithDecimals;
-    if (amountWithoutDecimals !== undefined) {
-      amount = Big(amountWithoutDecimals)
-        .div(Big(10).pow(ftMetadata.decimals))
-        .toString();
-    }
-    return (
-      <tr className={expandSummaryIndex[index] ? "text-grey-100" : ""}>
-        <td>{item.id}</td>
-        <td>
-          <div className="d-flex flex-row gap-2">
-            <div
-              className="d-flex flex-column gap-2 flex-wrap"
-              style={{ maxWidth: 320 }}
-            >
-              <div
-                className={
-                  "h6 bold max-w-100" +
-                  (!expandSummaryIndex[index] && " text-truncate")
-                }
-              >
-                {args.title}
+  return (
+    <tbody>
+      {historyProposals?.map((item, index) => {
+        // decode args
+        const actions = item.kind?.FunctionCall?.actions?.[0];
+        const args = JSON.parse(atob(actions?.args ?? ""));
+        const isReceiverkycbVerified = true;
+        const isNEAR = true;
+        const address = item.token;
+        let ftMetadata = {
+          symbol: "NEAR",
+          decimals: 24,
+        };
+        if (!isNEAR) {
+          ftMetadata = Near.view(address, "ft_metadata", {});
+          if (ftMetadata === null) return null;
+        }
+        let amount = amountWithDecimals;
+        if (amountWithoutDecimals !== undefined) {
+          amount = Big(amountWithoutDecimals)
+            .div(Big(10).pow(ftMetadata.decimals))
+            .toString();
+        }
+        return (
+          <tr className={expandSummaryIndex[index] ? "text-grey-100" : ""}>
+            <td>{item.id}</td>
+            <td>
+              <div className="d-flex flex-row gap-2">
+                <div
+                  className="d-flex flex-column gap-2 flex-wrap"
+                  style={{ maxWidth: 320 }}
+                >
+                  <div
+                    className={
+                      "h6 bold max-w-100" +
+                      (!expandSummaryIndex[index] && " text-truncate")
+                    }
+                  >
+                    {args.title}
+                  </div>
+                  {expandSummaryIndex[index] && (
+                    <div className={"text-dark-grey max-w-100"}>
+                      {args.summary}
+                    </div>
+                  )}
+                </div>
+                <div className="cursor">
+                  <img
+                    src={
+                      expandSummaryIndex[index]
+                        ? "https://ipfs.near.social/ipfs/bafkreic35n4yddasdpl532oqcxjwore66jrjx2qc433hqdh5wi2ijy4ida"
+                        : "https://ipfs.near.social/ipfs/bafkreiaujwid7iigy6sbkrt6zkwmafz5umocvzglndugvofcz2fpw5ur3y"
+                    }
+                    onClick={() =>
+                      setExpandSummary((prevState) => ({
+                        ...prevState,
+                        [index]: !prevState[index],
+                      }))
+                    }
+                    height={20}
+                  />
+                </div>
               </div>
-              {expandSummaryIndex[index] && (
-                <div className={"text-dark-grey max-w-100"}>{args.summary}</div>
+            </td>
+            <td className="text-truncate bold" style={{ maxWidth: 150 }}>
+              {treasuryDaoID}
+            </td>
+            <td className="text-truncate bold" style={{ maxWidth: 150 }}>
+              {args.receiver_id}
+            </td>
+            <td className="text-center">
+              {isReceiverkycbVerified ? (
+                <img
+                  src="https://ipfs.near.social/ipfs/bafkreidqveupkcc7e3rko2e67lztsqrfnjzw3ceoajyglqeomvv7xznusm"
+                  height={30}
+                />
+              ) : (
+                "Need icon"
               )}
-            </div>
-            <div className="cursor">
-              <img
-                src={
-                  expandSummaryIndex[index]
-                    ? "https://ipfs.near.social/ipfs/bafkreic35n4yddasdpl532oqcxjwore66jrjx2qc433hqdh5wi2ijy4ida"
-                    : "https://ipfs.near.social/ipfs/bafkreiaujwid7iigy6sbkrt6zkwmafz5umocvzglndugvofcz2fpw5ur3y"
-                }
-                onClick={() =>
-                  setExpandSummary((prevState) => ({
-                    ...prevState,
-                    [index]: !prevState[index],
-                  }))
-                }
-                height={20}
-              />
-            </div>
-          </div>
-        </td>
-        <td className="text-truncate bold" style={{ maxWidth: 150 }}>
-          {treasuryDaoID}
-        </td>
-        <td className="text-truncate bold" style={{ maxWidth: 150 }}>
-          {args.receiver_id}
-        </td>
-        <td className="text-center">
-          {isReceiverkycbVerified ? (
-            <img
-              src="https://ipfs.near.social/ipfs/bafkreidqveupkcc7e3rko2e67lztsqrfnjzw3ceoajyglqeomvv7xznusm"
-              height={30}
-            />
-          ) : (
-            "Need icon"
-          )}
-        </td>
-        <td className="bold">{item.token}</td>
-        <td className="bold">
-          {parseFloat(args.amount).toLocaleString("en-US")}
-        </td>
-        <td>{Object.keys(item.votes ?? {}).join(", ")}</td>
-        <td className="text-truncate" style={{ maxWidth: 150 }}>
-          {item.txnHash}
-        </td>
-        <td className="text-grey">{getRelativeTime(item.approvedAt)}</td>
-      </tr>
-    );
-  });
+            </td>
+            <td className="bold">{item.token}</td>
+            <td className="bold">
+              {parseFloat(args.amount).toLocaleString("en-US")}
+            </td>
+            <td>{Object.keys(item.votes ?? {}).join(", ")}</td>
+            <td className="text-truncate" style={{ maxWidth: 150 }}>
+              {item.txnHash}
+            </td>
+            <td className="text-grey">{getRelativeTime(item.approvedAt)}</td>
+          </tr>
+        );
+      })}
+    </tbody>
+  );
 };
 return (
   <Container className="d-flex flex-column gap-4">
@@ -180,9 +190,8 @@ return (
             <td>WHEN</td>
           </tr>
         </thead>
-        <tbody>
-          <ProposalsComponent />
-        </tbody>
+
+        <ProposalsComponent />
       </table>
     </div>
     <div className="d-flex align-items-center justify-content-center">
diff --git a/src/devhub/entity/trustee/login.jsx b/src/devhub/entity/trustee/login.jsx
index b224d97a8..573e18d80 100644
--- a/src/devhub/entity/trustee/login.jsx
+++ b/src/devhub/entity/trustee/login.jsx
@@ -22,7 +22,7 @@ return (
         <i class="bi bi-person-circle"></i>
         <div className="h5">Login Below</div>
         <div
-          onClick={() => props.setIsTrustee(true)}
+          onClick={() => {}} // do login?
           className="rounded-4 bg-grey p-2 text-center d-flex gap-2 flex-row justify-content-center align-items-center cursor"
           style={{ width: 230 }}
         >