Fix currentUser config in fcl.mutate (#2004)

onflow · Nov 14, 2024 · 6f2b075 · 6f2b075
1 parent bac8c54
commit 6f2b075
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/packages/fcl-core/src/exec/mutate.js b/packages/fcl-core/src/exec/mutate.js
@@ -7,13 +7,11 @@ import {isNumber} from "../utils/is"
 
 /**
  * @description
- * Factory function that returns a mutate function.
+ * Factory function that returns a mutate function for a given currentUser.
  *
- * @param {object} opts - Configuration Options
- * @param {string} opts.platform - Platform
- * @param {object} [opts.discovery] - Discovery options
+ * @param {ReturnType<typeof import("../current-user").getCurrentUser> | import("../current-user").CurrentUserConfig} currentUserOrConfig - CurrentUser actor or configuration
  */
-export const getMutate = ({platform, discovery}) => {
+export const getMutate = currentUserOrConfig => {
   /**
    * @description
    * Allows you to submit transactions to the blockchain to potentially mutate the state.
@@ -66,10 +64,12 @@ export const getMutate = ({platform, discovery}) => {
     try {
       await preMutate(opts)
       opts = await prepTemplateOpts(opts)
-      const currentUser = getCurrentUser({platform, discovery})
       // Allow for a config to overwrite the authorization function.
       // prettier-ignore
-      const authz = await sdk.config().get("fcl.authz", currentUser().authorization)
+      const currentUser = typeof currentUserOrConfig === "function" ? currentUserOrConfig : getCurrentUser(currentUserOrConfig)
+      const authz = await sdk
+        .config()
+        .get("fcl.authz", currentUser().authorization)
 
       txid = sdk
         .send([

diff --git a/packages/fcl-react-native/src/fcl-react-native.ts b/packages/fcl-react-native/src/fcl-react-native.ts
@@ -69,16 +69,14 @@ import {
   initServiceRegistry,
   setIsReactNative,
 } from "@onflow/fcl-core"
-export const mutate = getMutate({platform: "react-native"})
 
-const currentUser = getCurrentUser({
+export const currentUser = getCurrentUser({
   platform: "react-native",
   getStorageProvider: async () => {
     return (await config().get("fcl.storage")) || getAsyncStorage()
   },
 })
-
-export {currentUser}
+export const mutate = getMutate(currentUser)
 
 export const authenticate = (opts = {}) => currentUser().authenticate(opts)
 export const unauthenticate = () => currentUser().unauthenticate()

diff --git a/packages/fcl/src/fcl.ts b/packages/fcl/src/fcl.ts
@@ -75,7 +75,6 @@ const discoveryOpts = {
   execStrategy: execStrategyHook,
 }
 
-export const mutate = getMutate({platform: "web", discovery: discoveryOpts})
 export const currentUser = getCurrentUser({
   platform: "web",
   discovery: discoveryOpts,
@@ -85,6 +84,7 @@ export const currentUser = getCurrentUser({
     )
   },
 })
+export const mutate = getMutate(currentUser)
 
 export const authenticate = (opts = {}) => currentUser().authenticate(opts)
 export const unauthenticate = () => currentUser().unauthenticate()