fix(SafeTypes): update SafeInfoResponse type

Author: twodam

components/TenderlySimulation/SafeTenderlySimulationButton.tsx

@@ -28,7 +28,7 @@ export default function SafeTenderlySimulationButton({
 
   const chain = useChainConfigOfSpace();
   const { data: safeInfo } = useSafeInfo(address, !!address);
-  const firstOwnerAddress = safeInfo?.owners?.[0] || zeroAddress;
+  const firstOwnerAddress = safeInfo?.owners?.[0].value || zeroAddress;
   const { encodedTransaction, safeTransaction, error } =
     useCreateTransactionForSimulation(address, transactions, true);
 

components/Transaction/SafeTransactionCreator.tsx

@@ -39,6 +39,8 @@ export default function SafeTransactionCreator({
     useHistoryTransactions(safeAddress, 1, safeAddress !== "");
   const { data: walletClient } = useWalletClient();
 
+  const nextNonce =
+    (historyTxs?.results?.[0].transaction.executionInfo.nonce || -1) + 1;
   const queueNotReady =
     !walletClient || !safeTransaction || !nonce || !safeAddress || loading;
 
@@ -54,10 +56,10 @@ export default function SafeTransactionCreator({
   }
 
   useEffect(() => {
-    if (nonce === "" && historyTxs?.results.length) {
-      setNonce(historyTxs?.results.length.toString());
+    if (nonce === "" && nextNonce) {
+      setNonce(nextNonce.toString());
     }
-  }, [historyTxs]);
+  }, [nextNonce]);
 
   return (
     <div className="flex flex-col space-y-2 sm:space-y-0 space-x-0 sm:space-x-2 sm:flex-row">
@@ -87,7 +89,7 @@ export default function SafeTransactionCreator({
         <input
           type="number"
           step={1}
-          min={historyTxs?.results.length || 0}
+          min={nextNonce}
           value={nonce}
           onChange={(e) => setNonce(e.target.value)}
           className="relative -ml-px inline-flex w-20 items-center rounded-r-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus:z-10"

components/Transaction/SafeTransactionSelector.tsx

@@ -1,14 +1,16 @@
-import { formatDistanceToNowStrict, parseISO } from "date-fns";
+import { formatDistanceToNowStrict, toDate } from "date-fns";
 import { useMultisigTransactions } from "@/utils/hooks/Safe/SafeHooks";
 import SearchableComboBox, {
   Option,
 } from "@/components/common/SearchableComboBox";
-import { SafeMultisigTransactionListResponse } from "@safe-global/api-kit";
-import { RevisedSafeMultisigTransactionResponse } from "@/models/SafeTypes";
+import {
+  SafeTransactionsResponse,
+  SafetransactionsResponseResult,
+} from "@/models/SafeTypes";
 import { useQueryParams, withDefault, StringParam } from "next-query-params";
 import { useEffect } from "react";
 
-export type TxOption = Option & { tx: RevisedSafeMultisigTransactionResponse };
+export type TxOption = Option & { tx: SafetransactionsResponseResult };
 export type AddressMap = { [address: string]: string };
 
 export function SafeTransactionSelector({
@@ -29,21 +31,24 @@ export function SafeTransactionSelector({
   const { data: txns, isLoading } = useMultisigTransactions(safeAddress, 20);
 
   const convertToOptions = (
-    res: SafeMultisigTransactionListResponse | undefined,
-    status: boolean,
+    res: SafeTransactionsResponse | undefined,
+    status: boolean
   ) => {
     if (!res) return [];
-    return res.results.map((_tx) => {
-      const tx = _tx as any as RevisedSafeMultisigTransactionResponse;
-      const addressLabel = addressMap[tx.to] ? `${addressMap[tx.to]}.` : "";
+    return res.results.map((tx) => {
+      const txTo = tx.transaction.txInfo.to.value;
+      const addressLabel = addressMap[txTo] ? `${addressMap[txTo]}.` : "";
       return {
-        id: tx.safeTxHash,
-        label: `Tx ${tx.nonce} ${addressLabel}${
-          tx.dataDecoded ? tx.dataDecoded.method : "unknown"
+        id: tx.transaction.id,
+        label: `Tx ${tx.transaction.executionInfo.nonce} ${addressLabel}${
+          tx.transaction.txInfo.methodName || "unknown"
         }`,
-        extraLabel: formatDistanceToNowStrict(parseISO(tx.submissionDate), {
-          addSuffix: true,
-        }),
+        extraLabel: formatDistanceToNowStrict(
+          toDate(tx.transaction.timestamp),
+          {
+            addSuffix: true,
+          }
+        ),
         status,
         tx: tx,
       };

models/SafeTypes.ts

@@ -68,15 +68,19 @@ export interface SafeBalanceUsdResponse {
 }
 
 export interface SafeInfoResponse {
-  address: string;
+  address: {
+    value: string;
+  };
   nonce: number;
+  chainId: string;
   threshold: number;
-  owners: string[];
-  masterCopy: string;
-  modules: string[];
-  fallbackHandler: string;
+  owners: { value: string }[];
+  modules: string[] | null;
+  fallbackHandler: {
+    name: string;
+    value: string;
+  };
   version: string;
-  guard: string;
 }
 
 export interface SafeDelegatesResponse {
@@ -131,6 +135,17 @@ export interface SafetransactionsResponseResult {
     id: string;
     timestamp: number;
     txHash: string;
+    executionInfo: {
+      nonce: number;
+    };
+    txInfo: {
+      methodName: string;
+      humanDescription: string | null;
+      to: {
+        value: string;
+        name: string;
+      };
+    };
   };
 }
 

pages/review.tsx

@@ -8,7 +8,7 @@ import {
   withDefault,
 } from "next-query-params";
 import useProjectInfo from "../utils/hooks/juicebox/ProjectInfo";
-import { RevisedSafeMultisigTransactionResponse } from "../models/SafeTypes";
+import { SafetransactionsResponseResult } from "../models/SafeTypes";
 import parseSafeJuiceboxTx from "../utils/functions/SafeJuiceboxParser";
 import { useReconfigurationOfProject } from "../utils/hooks/juicebox/ReconfigurationOfProject";
 import DiffTableWithSection from "../components/form/DiffTableWithSection";
@@ -25,6 +25,7 @@ import {
 } from "@/components/Transaction/SafeTransactionSelector";
 import ProjectSearch from "@/components/ProjectSearch";
 import JBProjectInfo from "@/components/JuiceboxCard/JBProjectInfo";
+import { toDate } from "date-fns";
 
 const CONTRACT_MAP: AddressMap = {
   "0xFFdD70C318915879d5192e8a0dcbFcB0285b3C98": "JBController_V3",
@@ -115,13 +116,16 @@ function Compare({
   tx,
 }: {
   projectId: number;
-  tx: RevisedSafeMultisigTransactionResponse;
+  tx: SafetransactionsResponseResult;
 }) {
   const { value: currentConfig, loading: loading } =
     useReconfigurationOfProject(projectId);
   const newConfig = parseSafeJuiceboxTx(
-    tx.data || "",
-    tx?.submissionDate || "",
+    //tx.data || "",
+    // FIXME new Safe endpoint doesn't return data anymore
+    //   which makes Review page no longer working
+    "",
+    toDate(tx.transaction.timestamp).toISOString() || "",
     currentConfig.fundingCycle.fee || BigInt(0),
     currentConfig.fundingCycle.configuration || BigInt(0)
   );

utils/hooks/ContractHooks.ts

@@ -75,7 +75,7 @@ export function useContractType(rawAddress: string) {
     return ContractType.Unknown;
   }
 
-  if (!safeError && safeInfo?.masterCopy) {
+  if (!safeError && safeInfo?.owners) {
     return ContractType.Safe;
   } else {
     // there is no way to be sure if this is a governor contract

utils/hooks/Safe/SafeHooks.ts

@@ -161,7 +161,7 @@ export function useCreateTransactionForSimulation(
 
   const { value: safe, error: safeError } = useSafe(safeAddress);
   const { data: safeInfo } = useSafeInfo(safeAddress, !!safeAddress);
-  const firstOwnerAddress = safeInfo?.owners?.[0] || zeroAddress;
+  const firstOwnerAddress = safeInfo?.owners?.[0].value || zeroAddress;
 
   useEffect(() => {
     const fetch = async () => {