Merge pull request #1138 from near/SQC-540/add-signin-multi-breaking-…

…change-fix fix near-mobile-wallet, near-snap and ramper-wallet methods
near · Jul 25, 2024 · 565665d · 565665d
2 parents 6c1e65c + 142c447
commit 565665d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/packages/near-mobile-wallet/src/lib/init.wallet.ts b/packages/near-mobile-wallet/src/lib/init.wallet.ts
@@ -55,13 +55,13 @@ export const initNearMobileWallet: NearMobileWalletInit = async (config) => {
     async signAndSendTransaction(data) {
       logger.log("[NearMobileWallet]: signAndSendTransaction", data);
 
-      const { contract } = store.getState();
-      if (!contract) {
+      const { contracts } = store.getState();
+      if (contracts.length < 1) {
         throw new Error("Wallet not signed in");
       }
 
       return await nearMobileWallet.signAndSendTransaction({
-        receiverId: contract.contractId,
+        receiverId: data.receiverId,
         ...data,
       });
     },

diff --git a/packages/near-snap/src/lib/selector.ts b/packages/near-snap/src/lib/selector.ts
@@ -44,19 +44,19 @@ export const initNearSnap: WalletBehaviourFactory<InjectedWallet> = async (
 
     async signAndSendTransaction(data) {
       logger.log("NearSnap:signAndSendTransaction", data);
+      const { contracts } = store.getState();
 
-      if (account == null) {
+      if (account === null || contracts.length < 1) {
         throw new Error("Wallet not signed in");
       }
 
-      const { contract } = store.getState();
-      const receiverId = data.receiverId ?? contract?.contractId;
+      const receiverId = data.receiverId;
 
       if (receiverId == null) {
         throw new Error("ReceiverId is not defined");
       }
 
-      return await account.executeTransaction({ receiverId, ...data });
+      return await account.executeTransaction({ ...data, receiverId });
     },
 
     async signMessage({ message, nonce, recipient }) {

diff --git a/packages/ramper-wallet/src/lib/ramper-wallet.ts b/packages/ramper-wallet/src/lib/ramper-wallet.ts
@@ -73,9 +73,9 @@ const RamperWallet: WalletBehaviourFactory<InjectedWallet> = async ({
     transactions: Array<Optional<Transaction, "signerId">>
   ) => {
     const accounts = await getAccounts();
-    const { contract } = store.getState();
+    const { contracts } = store.getState();
 
-    if (!accounts.length || !contract) {
+    if (!accounts.length || contracts.length < 1) {
       throw new Error("Wallet not signed in");
     }
 
@@ -85,7 +85,7 @@ const RamperWallet: WalletBehaviourFactory<InjectedWallet> = async ({
       );
 
       return {
-        receiverId: transaction.receiverId || contract.contractId,
+        receiverId: transaction.receiverId,
         actions: parsedActions,
       };
     });
@@ -127,10 +127,10 @@ const RamperWallet: WalletBehaviourFactory<InjectedWallet> = async ({
     }: Omit<Transaction, "signerId">) {
       logger.log("signAndSendTransaction", { receiverId, actions });
 
-      const { contract } = store.getState();
+      const { contracts } = store.getState();
       const accounts = await getAccounts();
 
-      if (!accounts.length || !contract) {
+      if (!accounts.length || contracts.length < 1) {
         throw new Error("Wallet not signed in");
       }