fix: rpc send transfer recipient default network

leather-io · Apr 22, 2024 · d285924 · d285924
1 parent a6f774c
commit d285924
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/background/messaging/rpc-methods/send-transfer.ts b/src/background/messaging/rpc-methods/send-transfer.ts
@@ -5,6 +5,7 @@ import {
   type RpcSendTransferParams,
   type RpcSendTransferParamsLegacy,
   convertRpcSendTransferLegacyParamsToNew,
+  defaultRpcSendTransferNetwork,
   getRpcSendTransferParamErrors,
   validateRpcSendTransferLegacyParams,
   validateRpcSendTransferParams,
@@ -63,7 +64,7 @@ export async function rpcSendTransfer(
   const requestParams: RequestParams = [
     ...recipients,
     ...amounts,
-    ['network', params.network ?? 'mainnet'],
+    ['network', params.network ?? defaultRpcSendTransferNetwork],
     ['requestId', message.id],
   ];
 

diff --git a/src/shared/rpc/methods/send-transfer.ts b/src/shared/rpc/methods/send-transfer.ts
@@ -17,6 +17,8 @@ import {
   validateRpcParams,
 } from './validation.utils';
 
+export const defaultRpcSendTransferNetwork = 'mainnet';
+
 export const rpcSendTransferParamsSchemaLegacy = yup.object().shape({
   account: accountSchema,
   address: yup.string().required(),
@@ -38,7 +40,9 @@ export const rpcSendTransferParamsSchema = yup.object().shape({
           FormErrorMessages.IncorrectNetworkAddress,
           (value, context) => {
             const contextOptions = context.options as any;
-            const network = contextOptions.from[1].value.network as BitcoinNetworkModes;
+            const network =
+              (contextOptions.from[1].value.network as BitcoinNetworkModes) ||
+              defaultRpcSendTransferNetwork;
             return btcAddressNetworkValidator(network).isValidSync(value);
           }
         ),