add default soul name the first in the return array of getSoulNames()

masa-finance · May 8, 2023 · 22ab4ae · 22ab4ae
1 parent ac32793
commit 22ab4ae
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/contracts/SoulName.sol b/contracts/SoulName.sol
@@ -340,14 +340,29 @@ contract SoulName is MasaNFT, ISoulName, ReentrancyGuard {
         string[] memory _sbtNames = new string[](results);
         uint256 index = 0;
 
-        for (uint256 i = 0; i < balance; i++) {
-            uint256 tokenId = tokenOfOwnerByIndex(owner, i);
+        if (defaultSoulName[owner].exists) {
+            uint256 tokenId = defaultSoulName[owner].tokenId;
             if (tokenData[tokenId].expirationDate >= block.timestamp) {
                 _sbtNames[index] = Utils.toLowerCase(tokenData[tokenId].name);
                 index = index.add(1);
             }
         }
 
+        for (uint256 i = 0; i < balance; i++) {
+            uint256 tokenId = tokenOfOwnerByIndex(owner, i);
+            if (
+                !defaultSoulName[owner].exists ||
+                tokenId != defaultSoulName[owner].tokenId
+            ) {
+                if (tokenData[tokenId].expirationDate >= block.timestamp) {
+                    _sbtNames[index] = Utils.toLowerCase(
+                        tokenData[tokenId].name
+                    );
+                    index = index.add(1);
+                }
+            }
+        }
+
         // return identity names if exists and are active
         return _sbtNames;
     }