refactor: move fuelSign into utils

src/hooks/useSubmit/useSubmit.ts

@@ -7,9 +7,8 @@ import { useCallback, useState } from "react"
 import useSWR from "swr"
 import { useChainId, usePublicClient, useWalletClient } from "wagmi"
 import { DEFAULT_MESSAGE, DEFAULT_SIGN_LOADING_TEXT } from "./constants"
-import { fuelSign } from "./fuelSign"
 import { SignProps, UseSubmitOptions, Validation } from "./types"
-import { getMessage, sign } from "./utils"
+import { fuelSign, getMessage, sign } from "./utils"
 import gnosisSafeSignCallback from "./utils/gnosisSafeSignCallback"
 
 type FetcherFunction<ResponseType> = ({

src/hooks/useSubmit/utils.ts

@@ -10,7 +10,7 @@ import {
 import { wagmiConfig } from "wagmiConfig"
 import { Chain, Chains, supportedChains } from "wagmiConfig/chains"
 import { DEFAULT_MESSAGE } from "./constants"
-import { MessageParams, SignProps, Validation } from "./types"
+import { FuelSignProps, MessageParams, SignProps, Validation } from "./types"
 
 export const signWithKeyPair = (keyPair: CryptoKeyPair, params: MessageParams) =>
   window.crypto.subtle
@@ -151,3 +151,26 @@ export const chainsOfAddressWithDeployedContract = async (
 
   return res
 }
+
+export const fuelSign = async ({
+  wallet,
+  address,
+  payload,
+  keyPair,
+  forcePrompt,
+  msg = DEFAULT_MESSAGE,
+  ts,
+}: FuelSignProps): Promise<[string, Validation]> => {
+  const params = createMessageParams(address, ts, msg, payload)
+  let sig = null
+
+  if (!!keyPair && !forcePrompt) {
+    params.method = ValidationMethod.KEYPAIR
+    sig = await signWithKeyPair(keyPair, params)
+  } else {
+    params.method = ValidationMethod.FUEL
+    sig = await wallet.signMessage(getMessage(params))
+  }
+
+  return [payload, { params, sig }]
+}

src/utils/fetcher.ts

@@ -1,6 +1,6 @@
 import { env } from "env"
-import { fuelSign } from "hooks/useSubmit/fuelSign"
 import { FuelSignProps, SignProps } from "hooks/useSubmit/types"
+import { fuelSign } from "hooks/useSubmit/utils"
 import { sign } from "hooks/useSubmit/utils"
 import { pushToIntercomSetting } from "./intercom"