Merge pull request #2713 from w3f/will-v3.1.4

fix identity query
w3f · Mar 6, 2024 · 439a97e · 439a97e
2 parents 80d2430 + df4ba7d
commit 439a97e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/packages/common/src/chaindata/queries/Identity.ts b/packages/common/src/chaindata/queries/Identity.ts
@@ -88,6 +88,23 @@ export const getFormattedIdentity = async (
     const identityInfo = await chaindata.api?.derive.accounts.identity(addr);
     if (!identityInfo) return null;
 
+    const hasSubs = await chaindata.api?.query.identity.subsOf(addr);
+    if (hasSubs && hasSubs[1].length > 0) {
+      for (const subaccountAddress of hasSubs[1]) {
+        const subAccountIdentity =
+          await chaindata.api?.derive.accounts.identity(
+            subaccountAddress.toString(),
+          );
+        if (subAccountIdentity) {
+          const subAccount: { name: string; address: string } = {
+            name: subAccountIdentity.display || "",
+            address: subaccountAddress.toString(),
+          };
+          subAccounts.push(subAccount);
+        }
+      }
+    }
+
     const {
       display,
       email,

diff --git a/packages/common/test/chaindata/chaindata.int.test.ts b/packages/common/test/chaindata/chaindata.int.test.ts
@@ -340,7 +340,7 @@ describe("ChainData Integration Tests", () => {
     "should fetch identity",
     async () => {
       const getIdentity = await chainData.getIdentity(
-        "J4hAvZoHCviZSoPHoSwLida8cEkZR1NXJcGrcfx9saHTk7D",
+        "DBfT2GUqHX89afMhTzGCCbAc44zX33d4XySWX2qAPxZ35KE",
       );
       expect(getIdentity).toBeDefined();
     },
@@ -351,7 +351,7 @@ describe("ChainData Integration Tests", () => {
     "should fetch formatted identity",
     async () => {
       const identity = await chainData.getFormattedIdentity(
-        "J4hAvZoHCviZSoPHoSwLida8cEkZR1NXJcGrcfx9saHTk7D",
+        "CbaNLeJQ8e8aCJMTLa9euDKuTDmnT5oPmGFt4AmuvXmYFGN",
       );
       expect(identity).toBeDefined();
     },