From 8a03cf637d082f2fc7ca3af46e9a0dd09d1915bd Mon Sep 17 00:00:00 2001
From: Bryan White <bryanchriswhite@gmail.com>
Date: Fri, 30 Sep 2022 20:10:50 +0200
Subject: [PATCH] fix: swaps handler null checking

---
 src/mappings/mappingHandlers.ts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/mappings/mappingHandlers.ts b/src/mappings/mappingHandlers.ts
index 7528402b1..4d60741a2 100644
--- a/src/mappings/mappingHandlers.ts
+++ b/src/mappings/mappingHandlers.ts
@@ -308,11 +308,13 @@ export async function handleLegacyBridgeSwap(msg: CosmosMessage<LegacyBridgeSwap
   logger.info(`[handleLegacyBridgeSwap] (tx ${msg.tx.hash}): indexing LegacyBridgeSwap ${id}`)
   logger.debug(`[handleLegacyBridgeSwap] (msg.msg): ${JSON.stringify(msg.msg, null, 2)}`)
 
-  const {
-    msg: {swap: {destination}},
-    funds: [{amount, denom}],
-    contract,
-  } = msg.msg.decodedMsg;
+  const contract = msg.msg.decodedMsg.contract;
+  const swapMsg = msg.msg.decodedMsg.msg;
+  const destination = swapMsg?.swap?.destination;
+
+  const funds = msg.msg.decodedMsg.funds || [];
+  const amount = funds[0]?.amount;
+  const denom = funds[0]?.denom;
 
   // gracefully skip indexing "swap" messages that doesn't fullfill the bridge contract
   // otherwise, the node will just crashloop trying to save the message to the db with required null fields.