fix(merge): merge with main

main sync

packages/custodyKeyring/src/CustodyKeyring.ts

@@ -359,7 +359,7 @@ export abstract class CustodyKeyring extends EventEmitter {
     const normalisedSupportedChainIds = supportedChainIds.map(chainId => Number(chainId).toString());
 
     if (!normalisedSupportedChainIds.includes(chainId)) {
-      throw new Error(`This network ${chainId} is not supported by ${this.custodianType.name}`);
+      throw new Error(`This network ${chainId} is not configured or supported with your custody provider.`);
     }
 
     let payload: IEIP1559TxParams | ILegacyTXParams;

packages/custodyKeyring/src/custodianTypes/jupiter/JupiterCustodyKeyring.test.ts

@@ -417,7 +417,7 @@ describe("CustodyKeyring", () => {
       } as unknown as MetamaskTransaction;
 
       await expect(custodyKeyring.signTransaction(fromAddress, ethTx, txMeta)).rejects.toThrowError(
-        "This network 777 is not supported by Jupiter",
+        "This network 777 is not configured or supported with your custody provider.",
       );
     });
 

packages/extension/src/ExtensionUtils.ts

@@ -295,34 +295,32 @@ export async function handleTxStatusUpdate(
       };
       txMeta.txParams = newTxParams;
     }
-    
+
     // Sometimes custodians do not send a webhook when a transaction is submitted -
     // They may only send one when the TX is confirmed (e.g. Safe) so we need to handle
     // submission the same as confirmation
 
     // Metamask resolves the promise in transaction controller when the TX is submitted
-    // So we can yield control back to that function as early as we can 
+    // So we can yield control back to that function as early as we can
 
-    /** 
-     * Previously, we were waiting for transaction confirmation from custodians before yielding 
+    /**
+     * Previously, we were waiting for transaction confirmation from custodians before yielding
      * We are now yielding on submission
      * This has two effects
      * 1. Interaction is yieled by MMI back to the dapp before confirmation, meaning it is much quicker
      * 2. On-chain failures do not cause the dapp's RPC promise to be rejected, which is more in line with MetaMask's behaviour
-     * */ 
-
+     * */
 
     if (
       txData.transaction.status.submitted ||
       (txData.transaction.status.finished &&
-      txData.transaction.status.success &&
-      txMeta.status !== MetaMaskTransactionStatuses.CONFIRMED)
+        txData.transaction.status.success &&
+        txMeta.status !== MetaMaskTransactionStatuses.CONFIRMED)
     ) {
       // We don't need to wait for the custodian to confirm the TX, since MM's internal
       // block tracker will do that for us
 
       txStateManager.setTxStatusSubmitted(txMeta.id);
-
     } else if (txData.transaction.status.finished && !txData.transaction.status.success) {
       let message = `Transaction status from custodian: ${txMeta.custodyStatusDisplayText}`; // Clever English language hack IMO
 
@@ -338,4 +336,3 @@ export async function handleTxStatusUpdate(
   }
   return null;
 }
-

packages/extension/src/index.ts

@@ -1,17 +1,3 @@
-export {
-  updateCustodianTransactions,
-  custodianEventHandlerFactory,
-  showCustodianDeepLink,
-} from "./ExtensionUtils";
-
-export {
-  getWaitForConfirmDeepLinkDialog,
-  getTransactionStatusMap,
-  getCustodyAccountSupportedChains,
-  getMmiPortfolioEnabled,
-  getMmiPortfolioUrl,
-  getConfiguredCustodians,
-  getCustodianIconForAddress,
-} from "./ExtensionSelectors";
+export { updateCustodianTransactions, custodianEventHandlerFactory, showCustodianDeepLink } from "./ExtensionUtils";
 
 export { mmiActionsFactory } from "./ExtensionActions";

packages/sdk/src/custodianApi/bitgo/BitgoClient.ts

@@ -33,15 +33,15 @@ export class BitgoClient {
     const headers = this.getHeaders();
 
     try {
-      const body = await fetch(`${this.bitgoApiurl}/wallets`, {
+      const response = await fetch(`${this.bitgoApiurl}/wallets`, {
         headers,
       });
 
-      if (!body.ok) {
-        throw new Error('Error fetching wallet accounts');
+      if (!response.ok) {
+        throw new Error(`Error fetching wallet accounts. Status: ${response.status} ${response.statusText}`);
       }
 
-      const accounts: IBitgoGetEthereumAccountsResponse = await body.json();
+      const accounts: IBitgoGetEthereumAccountsResponse = await response.json();
       return accounts.data;
     } catch (e) {
       throw new CustodianApiError(e);
@@ -52,15 +52,17 @@ export class BitgoClient {
     const headers = this.getHeaders();
 
     try {
-      const body = await fetch(`${this.bitgoApiurl}/mmi/wallets/address/${address}`, {
+      const response = await fetch(`${this.bitgoApiurl}/mmi/wallets/address/${address}`, {
         headers,
       });
 
-      if (!body.ok) {
-        throw new Error(`Error fetching account for address ${address}`);
+      if (!response.ok) {
+        throw new Error(
+          `Error fetching account for address ${address}. Status: ${response.status} ${response.statusText}`,
+        );
       }
 
-      const accounts: IBitgoGetEthereumAccountsResponse = await body.json();
+      const accounts: IBitgoGetEthereumAccountsResponse = await response.json();
       if (accounts.data.length) {
         return accounts.data[0];
       } else {
@@ -97,7 +99,7 @@ export class BitgoClient {
       );
 
       if (!response.ok) {
-        throw new Error('Error creating transaction');
+        throw new Error(`Error creating transaction. Status: ${response.status} ${response.statusText}`);
       }
 
       const resultWrapper: IBitgoCreateTransactionResponse = await response.json();
@@ -116,7 +118,9 @@ export class BitgoClient {
       });
 
       if (!response.ok) {
-        throw new Error(`Error getting transaction with id ${custodian_transactionId}`);
+        throw new Error(
+          `Error getting transaction with id ${custodian_transactionId}. Status: ${response.status} ${response.statusText}`,
+        );
       }
 
       const transaction = await response.json();
@@ -135,7 +139,7 @@ export class BitgoClient {
       });
 
       if (!response.ok) {
-        throw new Error('Error getting transactions');
+        throw new Error(`Error getting transactions. Status: ${response.status} ${response.statusText}`);
       }
 
       const allTransactions = await response.json();
@@ -158,7 +162,7 @@ export class BitgoClient {
       });
 
       if (!response.ok) {
-        throw new Error('Error getting Custommer Proof');
+        throw new Error(`Error getting Custommer Proof. Status: ${response.status} ${response.statusText}`);
       }
 
       const customerProof = await response.json();
@@ -191,7 +195,9 @@ export class BitgoClient {
       });
 
       if (!response.ok) {
-        throw new Error('Error doing signTypedData');
+        throw new Error(
+          `Error doing signTypedData from address: ${fromAddress}. Status: ${response.status} ${response.statusText}`,
+        );
       }
 
       const data = await response.json();
@@ -222,7 +228,9 @@ export class BitgoClient {
       });
 
       if (!response.ok) {
-        throw new Error('Error doing signPersonalMessage');
+        throw new Error(
+          `Error doing signPersonalMessage from address: ${fromAddress}. Status: ${response.status} ${response.statusText}`,
+        );
       }
 
       const data = await response.json();
@@ -248,7 +256,9 @@ export class BitgoClient {
       );
 
       if (!response.ok) {
-        throw new Error(`Error getting signed message with id ${custodian_signedMessageId}`);
+        throw new Error(
+          `Error getting signed message with id ${custodian_signedMessageId}. Status: ${response.status} ${response.statusText}`,
+        );
       }
 
       const data = await response.json();