chore: fix merge conflicts

masa-finance · Aug 6, 2024 · ceee3b7 · ceee3b7
1 parent 653590e
commit ceee3b7
Show file tree

Hide file tree

Showing 3 changed files with 334 additions and 7 deletions.
diff --git a/src/contracts/contract-modules/soul-name.ts b/src/contracts/contract-modules/soul-name.ts
@@ -3,8 +3,8 @@ import { TypedDataField } from "ethers";
 
 import { Messages } from "../../collections";
 import type { BaseResult } from "../../interface";
+import { isSigner } from "../../utils";
 import { MasaContractModuleBase } from "./masa-contract-module-base";
-import { isSigner } from "../../utils"
 
 export class SoulName extends MasaContractModuleBase {
   /**

diff --git a/src/modules/identity/load.ts b/src/modules/identity/load.ts
@@ -2,7 +2,7 @@ import type { BigNumber } from "@ethersproject/bignumber";
 
 import { Messages } from "../../collections";
 import type { IdentityDetails, MasaInterface } from "../../interface";
-import { isBigNumber, patchMetadataUrl } from "../../utils";
+import { isBigNumber, isSigner, patchMetadataUrl } from "../../utils";
 import { resolveReverseIdentity } from "./resolve";
 
 export const loadIdentityByAddress = async (