Drop prepaid option in useSendMessage hook (#1445)

gear-tech · Nov 1, 2023 · 3390569 · 3390569
1 parent 0bb61de
commit 3390569
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/utils/gear-hooks/package.json b/utils/gear-hooks/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gear-js/react-hooks",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "React hooks used across Gear applications",
   "author": "Gear Technologies",
   "license": "GPL-3.0",

diff --git a/utils/gear-hooks/src/hooks/api/useSendMessage.ts b/utils/gear-hooks/src/hooks/api/useSendMessage.ts
@@ -25,7 +25,7 @@ type SendMessageOptions = {
   onError?: () => void;
 };
 
-type VaraSendMessageOptions = Omit<SendMessageOptions, 'keepAlive' | 'withVoucher'> & { prepaid?: boolean };
+type VaraSendMessageOptions = Omit<SendMessageOptions, 'keepAlive'>;
 
 function useSendMessage(
   destination: HexString,
@@ -107,7 +107,7 @@ function useSendMessage(
 
     const alertId = disableAlerts ? '' : alert.loading('Sign In', { title });
 
-    const { payload, gasLimit, value = 0, onSuccess, onInBlock, onError } = args;
+    const { payload, gasLimit, value = 0, withVoucher = false, onSuccess, onInBlock, onError } = args;
     const { address, decodedAddress, meta } = account;
     const { source } = meta;
 
@@ -116,8 +116,7 @@ function useSendMessage(
     let message: IMessageSendOptions | VaraMessageSendOptions;
 
     if (isVaraVersion) {
-      const prepaid = 'prepaid' in args ? args.prepaid : false;
-      message = { ...baseMessage, prepaid, account: prepaid ? decodedAddress : undefined };
+      message = { ...baseMessage, prepaid: withVoucher, account: withVoucher ? decodedAddress : undefined };
     } else {
       const keepAlive = 'keepAlive' in args ? args.keepAlive : false;
       message = { ...baseMessage, keepAlive };
@@ -131,7 +130,6 @@ function useSendMessage(
         extrinsic = sendExtrinsic;
       } else {
         // TODO: voucher call into standalone hook?
-        const withVoucher = 'withVoucher' in args ? args.withVoucher : false;
         extrinsic = withVoucher ? api.voucher.call({ SendMessage: sendExtrinsic }) : sendExtrinsic;
       }
 

diff --git a/utils/gear-hooks/src/hooks/handlers/use-send-message-handler.ts b/utils/gear-hooks/src/hooks/handlers/use-send-message-handler.ts
@@ -22,7 +22,7 @@ function useSendMessageHandler(
   const calculateGas = useHandleCalculateGas(destination, metadata);
   const sendMessage = useSendMessage(destination, metadata, options);
 
-  return (args: Omit<SendMessageOptions | VaraSendMessageOptions, 'gasLimit'>) => {
+  return (args: Omit<SendMessageOptions, 'gasLimit'> | Omit<VaraSendMessageOptions, 'gasLimit'>) => {
     if (!isApiReady) throw new Error('API is not initialized');
 
     const { payload, value } = args;