fix: show solana frozen account error for wallet ata

hoodieshq · Jan 16, 2024 · 28e6323 · 28e6323
1 parent 4e501d5
commit 28e6323
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/apps/ledger-live-desktop/static/i18n/en/app.json b/apps/ledger-live-desktop/static/i18n/en/app.json
@@ -5762,7 +5762,7 @@
       "title": "Account will be funded"
     },
     "SolanaTokenAccountFrozen": {
-      "title": "Account assets are frozen"
+      "title": "Token account assets are frozen"
     },
     "SolanaTokenAccounNotInitialized": {
       "title": "Account not initialized"

diff --git a/apps/ledger-live-mobile/src/locales/en/common.json b/apps/ledger-live-mobile/src/locales/en/common.json
@@ -756,6 +756,9 @@
     "SolanaAssociatedTokenAccountWillBeFunded": {
       "title": "Account will be funded"
     },
+    "SolanaTokenAccountFrozen": {
+      "title": "Token account assets are frozen"
+    },
     "SolanaAddressOfEd25519": {
       "title": "Address off ed25519 curve"
     },

diff --git a/libs/ledger-live-common/src/families/solana/js-prepareTransaction.ts b/libs/ledger-live-common/src/families/solana/js-prepareTransaction.ts
@@ -238,6 +238,17 @@ async function getTokenRecipient(
       api,
     ));
 
+    if (!shouldCreateAsAssociatedTokenAccount) {
+      const associatedTokenAccount = await getMaybeTokenAccount(
+        recipientAssociatedTokenAccountAddress,
+        api,
+      );
+      if (associatedTokenAccount instanceof Error) throw recipientTokenAccount;
+      if (associatedTokenAccount?.state === "frozen") {
+        return new SolanaTokenAccountFrozen();
+      }
+    }
+
     return {
       walletAddress: recipientAddress,
       shouldCreateAsAssociatedTokenAccount,