request_region_record fix for new release (#214)

* request_region_record fix * fix para id * lint
RegionX-Labs · Aug 11, 2024 · 90d82c3 · 90d82c3
1 parent 7174de3
commit 90d82c3
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 34 deletions.
diff --git a/src/components/Regions/IsmpRegionCard/index.tsx b/src/components/Regions/IsmpRegionCard/index.tsx
@@ -13,8 +13,7 @@ import TimeAgo from 'javascript-time-ago';
 import en from 'javascript-time-ago/locale/en';
 import { useEffect, useState } from 'react';
 
-import { useSubmitExtrinsic } from '@/hooks/submitExtrinsic';
-import { timesliceToTimestamp } from '@/utils/functions';
+import { sendUnsignedTx, timesliceToTimestamp } from '@/utils/functions';
 import { makeResponse, makeTimeout, queryRequest } from '@/utils/ismp';
 
 import { useAccounts } from '@/contexts/account';
@@ -48,12 +47,7 @@ export const IsmpRegionCard = ({
     timeslicePeriod,
   } = useCoretimeApi();
   const {
-    state: {
-      api: regionxApi,
-      apiState: regionxApiState,
-      symbol: regionxSymbol,
-      decimals: regionxDecimals,
-    },
+    state: { api: regionxApi, apiState: regionxApiState },
   } = useRegionXApi();
   const {
     state: { activeAccount, activeSigner },
@@ -67,7 +61,6 @@ export const IsmpRegionCard = ({
 
   const { region, coreOccupancy, status } = regionMetadata;
   const { toastWarning, toastSuccess, toastInfo, toastError } = useToast();
-  const { submitExtrinsicWithFeeInfo } = useSubmitExtrinsic();
   const [working, setWorking] = useState(false);
 
   useEffect(() => {
@@ -183,31 +176,24 @@ export const IsmpRegionCard = ({
       region.getRegionId()
     );
     setWorking(true);
-    submitExtrinsicWithFeeInfo(
-      regionxSymbol,
-      regionxDecimals,
-      request,
-      activeAccount.address,
-      activeSigner,
-      {
-        ready: () => toastInfo('Transaction was initiated'),
-        inBlock: () => toastInfo('In Block'),
-        finalized: () => {
-          /** */
-        },
-        success: () => {
-          toastSuccess('Transaction successful');
-          setWorking(false);
-          fetchRegions();
-        },
-        fail: () => {
-          toastError(`Failed to request region record`);
-        },
-        error: (e) => {
-          toastError(`Failed to request the region record. ${e}`);
-        },
-      }
-    );
+    sendUnsignedTx(request, {
+      ready: () => toastInfo('Transaction was initiated'),
+      inBlock: () => toastInfo('In Block'),
+      finalized: () => {
+        /** */
+      },
+      success: () => {
+        toastSuccess('Transaction successful');
+        setWorking(false);
+        fetchRegions();
+      },
+      fail: () => {
+        toastError(`Failed to request region record`);
+      },
+      error: (e) => {
+        toastError(`Failed to request the region record. ${e}`);
+      },
+    });
   };
 
   return (

diff --git a/src/utils/functions/api.ts b/src/utils/functions/api.ts
@@ -37,6 +37,33 @@ export const sendTx = async (
   }
 };
 
+export const sendUnsignedTx = async (
+  tx: SubmittableExtrinsic<'promise', ISubmittableResult>,
+  handlers: TxStatusHandlers
+) => {
+  try {
+    const unsub = await tx.send(({ status, events }) => {
+      if (status.isReady) handlers.ready();
+      else if (status.isInBlock) handlers.inBlock();
+      else if (status.isFinalized) {
+        handlers.finalized();
+        events.forEach(({ event: { method } }) => {
+          if (method === 'ExtrinsicSuccess') {
+            handlers.success();
+          } else if (method === 'ExtrinsicFailed') {
+            handlers.fail();
+          }
+        });
+        unsub();
+      }
+    });
+  } catch (e) {
+    handlers.error(e);
+  } finally {
+    handlers.finally && handlers.finally();
+  }
+};
+
 export const enableRegionX = (network: NetworkType): boolean => {
   return network === NetworkType.ROCOCO || EXPERIMENTAL;
 };