Merge 4953269 into e2274aa

app.json

@@ -3,10 +3,10 @@
     "newArchEnabled": false,
     "version": "2.1.0",
     "ios": {
-      "buildNumber": "69"
+      "buildNumber": "70"
     },
     "android": {
-      "versionCode": 270
+      "versionCode": 271
     }
   }
 }

components/AccountSettingsButton.tsx

@@ -60,7 +60,7 @@ export default function AccountSettingsButton({ account }: Props) {
     const methods = {
       [translate("your_profile_page")]: async () => {
         if (account) {
-          invalidateProfileSocialsQuery(account, account);
+          invalidateProfileSocialsQuery(account);
           setCurrentAccount(account, false);
           router.navigate("Chats");
           navigate("Profile", {

components/StateHandlers/HydrationStateHandler.tsx

@@ -13,8 +13,12 @@ export default function HydrationStateHandler() {
       const startTime = new Date().getTime();
       const accounts = getAccountsList();
       if (accounts.length === 0) {
-        // Awaiting before showing onboarding
-        await getInstalledWallets(false);
+        try {
+          // Awaiting before showing onboarding
+          await getInstalledWallets(false);
+        } catch (e) {
+          logger.error("[Hydration] Error getting installed wallets", e);
+        }
       } else {
         // note(lustig) I don't think this does anything?
         getInstalledWallets(false);
@@ -26,26 +30,27 @@ export default function HydrationStateHandler() {
       logger.debug(
         "[Hydration] Fetching persisted conversation list for all accounts"
       );
-      await Promise.allSettled(
-        accounts.map(async (account) => {
-          const accountStartTime = new Date().getTime();
-          logger.debug(
-            `[Hydration] Fetching persisted conversation list for ${account}`
-          );
-
-          prefetchInboxIdQuery({ account });
-          prefetchConversationsQuery({ account });
-
-          const accountEndTime = new Date().getTime();
-          logger.debug(
-            `[Hydration] Done fetching persisted conversation list for ${account} in ${
-              (accountEndTime - accountStartTime) / 1000
-            } seconds`
-          );
-        })
-      );
 
-      logger.debug("[Hydration] Done fetching persisted conversation list");
+      accounts.map((account) => {
+        const accountStartTime = new Date().getTime();
+        logger.debug(
+          `[Hydration] Fetching persisted conversation list for ${account}`
+        );
+
+        prefetchInboxIdQuery({ account });
+        prefetchConversationsQuery({ account });
+
+        const accountEndTime = new Date().getTime();
+        logger.debug(
+          `[Hydration] Done fetching persisted conversation list for ${account} in ${
+            (accountEndTime - accountStartTime) / 1000
+          } seconds`
+        );
+      });
+
+      logger.debug(
+        "[Hydration] Done prefetching all accounts conversation lists"
+      );
 
       useAppStore.getState().setHydrationDone(true);
       logger.debug(

components/StateHandlers/MainIdentityStateHandler.tsx

@@ -15,7 +15,7 @@ export default function MainIdentityStateHandler() {
   useEffect(() => {
     if (userAddress) {
       saveUser(userAddress, privyAccountId[userAddress] as string);
-      invalidateProfileSocialsQuery(userAddress, userAddress);
+      invalidateProfileSocialsQuery(userAddress);
     }
   }, [privyAccountId, userAddress]);
 

features/groups/invite-to-group/invite-users-to-exisiting-group.screen.tsx

@@ -196,7 +196,7 @@ export function InviteUsersToExistingGroupScreen({
 
                 if (!isEmptyObject(profiles)) {
                   // Let's save the profiles for future use
-                  setProfileRecordSocialsQueryData(currentAccount(), profiles);
+                  setProfileRecordSocialsQueryData(profiles);
                   setStatus({
                     loading: false,
                     error: "",
@@ -233,7 +233,7 @@ export function InviteUsersToExistingGroupScreen({
 
           if (!isEmptyObject(profiles)) {
             // Let's save the profiles for future use
-            setProfileRecordSocialsQueryData(currentAccount(), profiles);
+            setProfileRecordSocialsQueryData(profiles);
             setStatus({
               loading: false,
               error: "",

hooks/useProfileSocials.ts

@@ -1,7 +1,5 @@
-import { useCurrentAccount } from "@data/store/accountsStore";
 import { useProfileSocialsQuery } from "@queries/useProfileSocialsQuery";
 
 export const useProfileSocials = (peerAddress: string) => {
-  const currentAccount = useCurrentAccount();
-  return useProfileSocialsQuery(currentAccount!, peerAddress);
+  return useProfileSocialsQuery(peerAddress);
 };

hooks/useProfilesSocials.ts

@@ -7,6 +7,5 @@ import { useProfileSocialsQueries } from "@queries/useProfileSocialsQuery";
  * @returns
  */
 export const useProfilesSocials = (peerAddresses: string[]) => {
-  const currentAccount = useCurrentAccount();
-  return useProfileSocialsQueries(currentAccount!, peerAddresses);
+  return useProfileSocialsQueries(peerAddresses);
 };

ios/ConverseNotificationExtension/MMKV.swift

@@ -56,9 +56,9 @@ func getAccountsState() -> Accounts? {
   }
 }
 
-func getProfilesStore(account: String, address: String) -> ProfileSocials? {
+func getProfilesStore(address: String) -> ProfileSocials? {
   let mmkv = getMmkv()
-  let key = "profileSocials-\(account.lowercased())-\(address.lowercased())"
+  let key = "profileSocials-\(address.lowercased())"
   let profilesString = mmkv?.string(forKey: key)
   if (profilesString == nil) {
     return nil
@@ -72,9 +72,9 @@ func getProfilesStore(account: String, address: String) -> ProfileSocials? {
   }
 }
 
-func getInboxIdProfilesStore(account: String, inboxId: String) -> ProfileSocials? {
+func getInboxIdProfilesStore(inboxId: String) -> ProfileSocials? {
   let mmkv = getMmkv()
-  let key = "inboxProfileSocials-\(account.lowercased())-\(inboxId.lowercased())"
+  let key = "inboxProfileSocials-\(inboxId.lowercased())"
   let profilesString = mmkv?.string(forKey: key)
   if (profilesString == nil) {
     return nil
@@ -88,21 +88,21 @@ func getInboxIdProfilesStore(account: String, inboxId: String) -> ProfileSocials
   }
 }
 
-func saveProfileSocials(account: String, address: String, socials: ProfileSocials) {
+func saveProfileSocials(address: String, socials: ProfileSocials) {
   let updatedAt = Int(Date().timeIntervalSince1970)
   let newProfile = Profile(updatedAt: updatedAt, socials: socials)
   let mmkv = getMmkv()
   if let jsonData = try? JSONEncoder().encode(newProfile), let jsonString = String(data: jsonData, encoding: .utf8) {
-    mmkv?.set(jsonString, forKey: "profileSocials-\(account.lowercased())-\(address.lowercased())")
+    mmkv?.set(jsonString, forKey: "profileSocials-\(address.lowercased())")
   }
 }
 
-func saveInboxIdProfileSocials(account: String, inboxId: String, socials: ProfileSocials) {
+func saveInboxIdProfileSocials(inboxId: String, socials: ProfileSocials) {
   let updatedAt = Int(Date().timeIntervalSince1970)
   let newProfile = Profile(updatedAt: updatedAt, socials: socials)
   let mmkv = getMmkv()
   if let jsonData = try? JSONEncoder().encode(newProfile), let jsonString = String(data: jsonData, encoding: .utf8) {
-    mmkv?.set(jsonString, forKey: "inboxProfileSocials-\(account.lowercased())-\(inboxId.lowercased())")
+    mmkv?.set(jsonString, forKey: "inboxProfileSocials-\(inboxId.lowercased())")
   }
 }
 

ios/ConverseNotificationExtension/Profile.swift

@@ -8,40 +8,40 @@
 import Foundation
 import Alamofire
 
-func getProfile(account: String, address: String) async -> ProfileSocials? {
-  var profileFromStore = getProfilesStore(account: account, address: address)
+func getProfile(address: String) async -> ProfileSocials? {
+  var profileFromStore = getProfilesStore(address: address)
   let formattedAddress =  address.lowercased()
   if let profile = profileFromStore {
     return profile
   }
 
   // If profile is nil, let's refresh it
-  try? await refreshProfileFromBackend(account: account, address: formattedAddress)
+  try? await refreshProfileFromBackend(address: formattedAddress)
 
-  profileFromStore = getProfilesStore(account: account, address: address)
+  profileFromStore = getProfilesStore(address: address)
   if let profile = profileFromStore {
     return profile
   }
   return nil
 }
 
-func getInboxIdProfile(account: String, inboxId: String) async -> ProfileSocials? {
-  var profileFromStore = getInboxIdProfilesStore(account: account, inboxId: inboxId)
+func getInboxIdProfile(inboxId: String) async -> ProfileSocials? {
+  var profileFromStore = getInboxIdProfilesStore(inboxId: inboxId)
   if let profile = profileFromStore {
     return profile
   }
 
   // If profile is nil, let's refresh it
-  try? await refreshInboxProfileFromBackend(account: account, inboxId: inboxId)
+  try? await refreshInboxProfileFromBackend(inboxId: inboxId)
 
-  profileFromStore = getInboxIdProfilesStore(account: account, inboxId: inboxId)
+  profileFromStore = getInboxIdProfilesStore(inboxId: inboxId)
   if let profile = profileFromStore {
     return profile
   }
   return nil
 }
 
-func refreshProfileFromBackend(account: String, address: String) async throws  {
+func refreshProfileFromBackend(address: String) async throws  {
   let apiURI = getApiURI()
   if (apiURI != nil && !apiURI!.isEmpty) {
     let profileURI = "\(apiURI ?? "")/api/profile"
@@ -63,15 +63,15 @@ func refreshProfileFromBackend(account: String, address: String) async throws  {
     let decoder = JSONDecoder()
 
     if let socials = try? decoder.decode(ProfileSocials.self, from: response) {     
-      saveProfileSocials(account: account, address: address, socials: socials)
+      saveProfileSocials(address: address, socials: socials)
     }
 
 
   }
 
 }
 
-func refreshInboxProfileFromBackend(account: String, inboxId: String) async throws  {
+func refreshInboxProfileFromBackend(inboxId: String) async throws  {
   let apiURI = getApiURI()
   if (apiURI != nil && !apiURI!.isEmpty) {
     let profileURI = "\(apiURI ?? "")/api/inbox"
@@ -93,7 +93,7 @@ func refreshInboxProfileFromBackend(account: String, inboxId: String) async thro
     let decoder = JSONDecoder()
 
     if let socials = try? decoder.decode(ProfileSocials.self, from: response) {
-      saveInboxIdProfileSocials(account: account, inboxId: inboxId, socials: socials)
+      saveInboxIdProfileSocials(inboxId: inboxId, socials: socials)
     }
 
   }

ios/ConverseNotificationExtension/Xmtp/Messages.swift

@@ -78,7 +78,7 @@ func handleV3Message(xmtpClient: XMTP.Client, envelope: XMTP.Xmtp_MessageApi_V1_
               }
               // We replaced decodedMessage.senderAddress from inboxId to actual address
               // so it appears well in the app until inboxId is a first class citizen
-              if let senderProfileSocials = await getInboxIdProfile(account: xmtpClient.address, inboxId: decodedMessage.senderInboxId) {
+              if let senderProfileSocials = await getInboxIdProfile(inboxId: decodedMessage.senderInboxId) {
                 bestAttemptContent.subtitle = getPreferredName(address: decodedMessage.senderInboxId, socials: senderProfileSocials)
               }
 
@@ -89,7 +89,7 @@ func handleV3Message(xmtpClient: XMTP.Client, envelope: XMTP.Xmtp_MessageApi_V1_
               messageIntent = getIncomingGroupMessageIntent(group: group, content: bestAttemptContent.body, senderId: decodedMessage.senderInboxId, senderName: bestAttemptContent.subtitle)
             } else if case .dm(let dm) = conversation {
               var senderAvatar: String? = nil
-              if let senderProfileSocials = await getInboxIdProfile(account: xmtpClient.address, inboxId: decodedMessage.senderInboxId) {
+              if let senderProfileSocials = await getInboxIdProfile(inboxId: decodedMessage.senderInboxId) {
                 let name = getPreferredName(address: decodedMessage.senderInboxId, socials: senderProfileSocials)
                 bestAttemptContent.title = getPreferredName(address: decodedMessage.senderInboxId, socials: senderProfileSocials)
                 senderAvatar = getPreferredAvatar(socials: senderProfileSocials)