From 8b0c8a26a9717f674f4e099be1cf6b88d5cfa93d Mon Sep 17 00:00:00 2001
From: neocybereth <sean@arrowburn.co.nz>
Date: Tue, 18 Nov 2025 18:22:23 +1300
Subject: [PATCH 1/2] fix: add memo with default

---
 apps/namadillo/src/constants.ts            |  0
 apps/namadillo/src/lib/query.ts            |  5 ++++-
 apps/namadillo/src/workers/MaspTxWorker.ts | 16 ++++++++--------
 3 files changed, 12 insertions(+), 9 deletions(-)
 delete mode 100644 apps/namadillo/src/constants.ts

diff --git a/apps/namadillo/src/constants.ts b/apps/namadillo/src/constants.ts
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/namadillo/src/lib/query.ts b/apps/namadillo/src/lib/query.ts
index 2e09dc6bf3..05b9f79be6 100644
--- a/apps/namadillo/src/lib/query.ts
+++ b/apps/namadillo/src/lib/query.ts
@@ -18,6 +18,8 @@ import {
 import { textToErrorDetail, toErrorDetail } from "utils";
 import { getSdkInstance } from "utils/sdk";
 
+const DEFAULT_TRANSACTION_MEMO = "Powered by Namadillo";
+
 export type TransactionPair<T> = {
   encodedTxData: EncodedTxData<T>;
   signedTxs: Uint8Array[];
@@ -65,7 +67,8 @@ const getTxProps = (
     gasLimit: gasConfig.gasLimit,
     chainId: chain.chainId,
     publicKey: account.publicKey!,
-    memo,
+    memo:
+      memo ? `${memo} ${DEFAULT_TRANSACTION_MEMO}` : DEFAULT_TRANSACTION_MEMO,
   };
 };
 
diff --git a/apps/namadillo/src/workers/MaspTxWorker.ts b/apps/namadillo/src/workers/MaspTxWorker.ts
index b450bc77db..2e7375dcb7 100644
--- a/apps/namadillo/src/workers/MaspTxWorker.ts
+++ b/apps/namadillo/src/workers/MaspTxWorker.ts
@@ -178,7 +178,7 @@ async function unshield(
   sdk: Sdk,
   payload: Unshield["payload"]
 ): Promise<EncodedTxData<UnshieldingTransferProps>> {
-  const { account, gasConfig, chain, props } = payload;
+  const { account, gasConfig, chain, props, memo } = payload;
   await sdk.masp.loadMaspParams("", chain.chainId);
   const encodedTxData = await buildTx<UnshieldingTransferProps>(
     sdk,
@@ -187,7 +187,7 @@ async function unshield(
     chain,
     props,
     sdk.tx.buildUnshieldingTransfer,
-    undefined,
+    memo,
     false
   );
 
@@ -198,7 +198,7 @@ async function shieldedTransfer(
   sdk: Sdk,
   payload: ShieldedTransfer["payload"]
 ): Promise<EncodedTxData<ShieldedTransferProps>> {
-  const { account, gasConfig, chain, props } = payload;
+  const { account, gasConfig, chain, props, memo } = payload;
   await sdk.masp.loadMaspParams("", chain.chainId);
   const encodedTxData = await buildTx<ShieldedTransferProps>(
     sdk,
@@ -207,7 +207,7 @@ async function shieldedTransfer(
     chain,
     props,
     sdk.tx.buildShieldedTransfer,
-    undefined,
+    memo,
     false
   );
 
@@ -218,7 +218,7 @@ async function ibcTransfer(
   sdk: Sdk,
   payload: IbcTransfer["payload"]
 ): Promise<EncodedTxData<IbcTransferProps>> {
-  const { account, gasConfig, chain, props, publicKeyRevealed } = payload;
+  const { account, gasConfig, chain, props, publicKeyRevealed, memo } = payload;
 
   await sdk.masp.loadMaspParams("", chain.chainId);
   const encodedTxData = await buildTx<IbcTransferProps>(
@@ -228,7 +228,7 @@ async function ibcTransfer(
     chain,
     props,
     sdk.tx.buildIbcTransfer,
-    undefined,
+    memo,
     !publicKeyRevealed
   );
 
@@ -239,7 +239,7 @@ async function osmosisSwap(
   sdk: Sdk,
   payload: OsmosisSwap["payload"]
 ): Promise<EncodedTxData<OsmosisSwapMsgValue>> {
-  const { account, gasConfig, chain, props } = payload;
+  const { account, gasConfig, chain, props, memo } = payload;
 
   await sdk.masp.loadMaspParams("", chain.chainId);
   const encodedTxData = await buildTx<OsmosisSwapMsgValue>(
@@ -249,7 +249,7 @@ async function osmosisSwap(
     chain,
     props,
     sdk.tx.buildOsmosisSwap,
-    undefined,
+    memo,
     false
   );
 

From 96a99f365091555790e7f7cd778e866e95b299a1 Mon Sep 17 00:00:00 2001
From: neocybereth <sean@arrowburn.co.nz>
Date: Wed, 19 Nov 2025 18:05:31 +1300
Subject: [PATCH 2/2] fix: cleanup

---
 apps/namadillo/src/lib/query.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/apps/namadillo/src/lib/query.ts b/apps/namadillo/src/lib/query.ts
index 05b9f79be6..2e09dc6bf3 100644
--- a/apps/namadillo/src/lib/query.ts
+++ b/apps/namadillo/src/lib/query.ts
@@ -18,8 +18,6 @@ import {
 import { textToErrorDetail, toErrorDetail } from "utils";
 import { getSdkInstance } from "utils/sdk";
 
-const DEFAULT_TRANSACTION_MEMO = "Powered by Namadillo";
-
 export type TransactionPair<T> = {
   encodedTxData: EncodedTxData<T>;
   signedTxs: Uint8Array[];
@@ -67,8 +65,7 @@ const getTxProps = (
     gasLimit: gasConfig.gasLimit,
     chainId: chain.chainId,
     publicKey: account.publicKey!,
-    memo:
-      memo ? `${memo} ${DEFAULT_TRANSACTION_MEMO}` : DEFAULT_TRANSACTION_MEMO,
+    memo,
   };
 };