filter multisig response and db errors

migrations/1694633909572-AddMultisigSessionEntity.ts

@@ -30,6 +30,7 @@ export class AddMultisigSessionEntity1694633909572
           {
             name: 'safeTransactionHash',
             type: 'varchar',
+            isNullable: true,
           },
           {
             name: 'network',

migrations/1695476070385-UpdateMultisigSessionEntity.ts

@@ -13,6 +13,13 @@ export class UpdateMultisigSessionEntity1695476070385
     const table = await queryRunner.getTable('multisig_session');
     if (!table) return;
 
+    const safeTransactionHashColumnExists = table.columns.some(
+      c => c.name === 'safeTransactionHash',
+    );
+    if (safeTransactionHashColumnExists) {
+      await queryRunner.dropColumn('multisig_session', 'safeTransactionHash');
+    }
+
     // Adding new columns
     const statusColumnExists = table.columns.some(c => c.name === 'status');
     if (!statusColumnExists) {

migrations/1695508418383-RemoveSafeTransactionHash.ts

@@ -0,0 +1,19 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class RemoveSafeTransactionHash1695508418383
+  implements MigrationInterface
+{
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    const table = await queryRunner.getTable('multisig_session');
+    if (!table) return;
+
+    const safeTransactionHashColumnExists = table.columns.some(
+      c => c.name === 'safeTransactionHash',
+    );
+    if (safeTransactionHashColumnExists) {
+      await queryRunner.dropColumn('multisig_session', 'safeTransactionHash');
+    }
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {}
+}

src/services/safeServices.ts

@@ -3,6 +3,7 @@ import { ethers } from 'ethers';
 import SafeApiKit from '@safe-global/api-kit';
 import { EthersAdapter } from '@safe-global/protocol-kit';
 import { findObjectByClosestTimestamp } from '../utils/utils';
+import axios from 'axios';
 
 export const fetchSafeMessage = async (
   safeMessageHash: string,
@@ -12,14 +13,13 @@ export const fetchSafeMessage = async (
   const chainUrl = getSafeTransactionNetworkUrl(networkId);
 
   try {
-    safeMessage = await fetch(`${chainUrl}/v1/messages/${safeMessageHash}/`, {
-      headers: { 'Content-Type': 'application/json' },
-    }).then(res => {
-      if (!res.ok) {
-        return Promise.reject('Invalid response when fetching SafeMessage');
-      }
-      return res.json();
-    });
+    const response = await axios.get(
+      `${chainUrl}/v1/messages/${safeMessageHash}/`,
+      {
+        headers: { 'Content-Type': 'application/json' },
+      },
+    );
+    safeMessage = response.data;
   } catch (e) {
     console.error(e);
   }
@@ -34,20 +34,15 @@ export const fetchSafeMessageByTimestamp = async (
 ) => {
   let safeMessage;
   try {
-    const safeMessages = await fetch(
+    const response = await axios.get(
       `https://safe-client.safe.global/v1/chains/${networkId}/safes/${safeAddress}/messages`,
       {
         headers: { 'Content-Type': 'application/json' },
       },
-    ).then(res => {
-      if (!res.ok) {
-        return Promise.reject('Invalid response when fetching SafeMessage');
-      }
-      return res.json();
-    });
+    );
     safeMessage = findObjectByClosestTimestamp(
       safeMessageTimestamp,
-      safeMessages.results,
+      response.data.results,
     );
   } catch (e) {
     console.error(e);

src/utils/utils.ts

@@ -20,11 +20,13 @@ export const findObjectByClosestTimestamp = (
 ) => {
   if (objects.length === 0) return null;
 
-  let closestObj = objects[0];
+  let dateLabelObjects = objects.filter(item => item.type !== 'DATE_LABEL');
+
+  let closestObj = dateLabelObjects[0];
   let closestTimestamp = closestObj.creationTimestamp;
   let smallestDifference = Math.abs(target - closestTimestamp);
 
-  objects.forEach(obj => {
+  dateLabelObjects.forEach(obj => {
     const difference = Math.abs(target - obj.creationTimestamp);
     if (difference < smallestDifference) {
       smallestDifference = difference;