refactoring

gnoverse · Oct 17, 2024 · c0d7e6d · c0d7e6d
1 parent 5a30f83
commit c0d7e6d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/mobile/redux/features/linkingSlice.ts b/mobile/redux/features/linkingSlice.ts
@@ -1,4 +1,4 @@
-import { MakeTxResponse } from "@gnolang/gnonative";
+import { GnoNativeApi, MakeTxResponse } from "@gnolang/gnonative";
 import { createAsyncThunk, createSlice } from "@reduxjs/toolkit";
 import * as Linking from 'expo-linking';
 import { ThunkExtra } from "redux/redux-provider";
@@ -33,7 +33,7 @@ export const makeCallTxAndRedirectToSign = createAsyncThunk<MakeTxResponse, Make
     const gasFee = "1000000ugnot";
     const gasWanted = BigInt(10000000);
 
-    const res = await thunkAPI.dispatch(makeCallTx({ packagePath, fnc, args, gasFee, gasWanted, callerAddressBech32 })).unwrap();
+    const res = await makeCallTx({ packagePath, fnc, args, gasFee, gasWanted, callerAddressBech32 }, thunkAPI.extra.gnonative);
 
     setTimeout(() => {
         const params = [`tx=${encodeURIComponent(res.txJson)}`, `address=${callerAddressBech32}`, `client_name=dSocial`, `reason=Post a message`];
@@ -54,16 +54,14 @@ type MakeCallTxParams = {
     callerAddressBech32: string,
 };
 
-export const makeCallTx = createAsyncThunk<MakeTxResponse, MakeCallTxParams, ThunkExtra>("tx/makeCallTx", async (props, thunkAPI) => {
+export const makeCallTx = async (props : MakeCallTxParams, gnonative: GnoNativeApi) : Promise<MakeTxResponse> => {
     const { packagePath, fnc, callerAddressBech32, gasFee, gasWanted, args } = props;
 
     console.log("making a tx for: ", callerAddressBech32);
-
-    const gnonative = thunkAPI.extra.gnonative;
     const address = await gnonative.addressFromBech32(callerAddressBech32);
 
     return await gnonative.makeCallTx(packagePath, fnc, args, gasFee, gasWanted, address)
-})
+}
 
 export const broadcastTxCommit = createAsyncThunk<void, string, ThunkExtra>("tx/broadcastTxCommit", async (signedTx, thunkAPI) => {
     console.log("broadcasting tx: ", signedTx);

diff --git a/mobile/redux/features/profileSlice.ts b/mobile/redux/features/profileSlice.ts
@@ -3,7 +3,8 @@ import { makeCallTx } from "./linkingSlice";
 import { Following } from "@gno/types";
 import { ThunkExtra } from "redux/redux-provider";
 import * as Linking from 'expo-linking';
-import { set } from "date-fns";
+
+const CLIENT_NAME_PARAM = 'client_name=dSocial';
 
 export interface ProfileState {
   following: Following[];
@@ -33,10 +34,10 @@ export const followAndRedirectToSign = createAsyncThunk<void, { address: string,
   const gasWanted = BigInt(10000000);
   const callerAddressBech32 = await gnonative.addressToBech32(callerAddress);
 
-  const res = await thunkAPI.dispatch(makeCallTx({ packagePath, fnc, args, gasFee, gasWanted, callerAddressBech32 })).unwrap();
+  const res = await makeCallTx({ packagePath, fnc, args, gasFee, gasWanted, callerAddressBech32 }, thunkAPI.extra.gnonative);
 
   setTimeout(() => {
-    const params = [`tx=${encodeURIComponent(res.txJson)}`, `address=${callerAddressBech32}`, 'client_name=dSocial', 'reason=Follow a user', `callback=${encodeURIComponent('tech.berty.dsocial://account')}`];
+    const params = [`tx=${encodeURIComponent(res.txJson)}`, `address=${callerAddressBech32}`, CLIENT_NAME_PARAM, 'reason=Follow a user', `callback=${encodeURIComponent('tech.berty.dsocial://account')}`];
     Linking.openURL('land.gno.gnokey://tosign?' + params.join('&'))
   }, 500)
 });
@@ -52,10 +53,10 @@ export const unfollowAndRedirectToSign = createAsyncThunk<void, { address: strin
   const gasWanted = BigInt(10000000);
   const callerAddressBech32 = await gnonative.addressToBech32(callerAddress);
 
-  const res = await thunkAPI.dispatch(makeCallTx({ packagePath, fnc, args, gasFee, gasWanted, callerAddressBech32 })).unwrap();
+  const res = await makeCallTx({ packagePath, fnc, args, gasFee, gasWanted, callerAddressBech32 }, thunkAPI.extra.gnonative);
 
   setTimeout(() => {
-    const params = [`tx=${encodeURIComponent(res.txJson)}`, `address=${callerAddressBech32}`, 'client_name=dSocial', 'reason=Unfollow a user', `callback=${encodeURIComponent('tech.berty.dsocial://account')}`];
+    const params = [`tx=${encodeURIComponent(res.txJson)}`, `address=${callerAddressBech32}`, CLIENT_NAME_PARAM, 'reason=Unfollow a user', `callback=${encodeURIComponent('tech.berty.dsocial://account')}`];
     Linking.openURL('land.gno.gnokey://tosign?' + params.join('&'))
   }, 500)
 });