From 37d76afa0a14ab33d69d6ab1be75f370045ec843 Mon Sep 17 00:00:00 2001
From: Dylan Jeffers <dylan@audius.co>
Date: Thu, 13 Jul 2023 12:37:28 -0700
Subject: [PATCH] [C-1608 C-2750] Fix edit profile/cover photo (#3735)

---
 packages/common/src/store/cache/reducer.ts    | 34 ++++++++++++++-----
 .../edit-profile-screen/EditProfileScreen.tsx |  3 +-
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/packages/common/src/store/cache/reducer.ts b/packages/common/src/store/cache/reducer.ts
index 5fb35d5da6..072a641127 100644
--- a/packages/common/src/store/cache/reducer.ts
+++ b/packages/common/src/store/cache/reducer.ts
@@ -152,6 +152,25 @@ export const mergeCustomizer = (objValue: any, srcValue: any, key: string) => {
   }
 }
 
+const updateImageCache = (existing: Metadata, next: Metadata, merged: any) => {
+  if (
+    'profile_picture_sizes' in existing &&
+    'profile_picture_sizes' in next &&
+    existing.profile_picture_sizes !== next.profile_picture_sizes
+  ) {
+    merged._profile_picture_sizes = {}
+  }
+  if (
+    'cover_photo_sizes' in existing &&
+    'cover_photo_sizes' in next &&
+    existing.cover_photo_sizes !== next.cover_photo_sizes
+  ) {
+    merged._cover_photo_sizes = {}
+  }
+
+  return merged
+}
+
 const addEntries = (state: CacheState, entries: any[], replace?: boolean) => {
   const { cacheType } = state
   const newEntries = { ...state.entries }
@@ -181,12 +200,13 @@ const addEntries = (state: CacheState, entries: any[], replace?: boolean) => {
     ) {
       // do nothing
     } else if (existing) {
-      const newMetadata = mergeWith(
+      let newMetadata = mergeWith(
         {},
         existing,
         entity.metadata,
         mergeCustomizer
       )
+      newMetadata = updateImageCache(existing, entity.metadata, newMetadata)
       if (cacheType === 'safe-fast' && isEqual(existing, newMetadata)) {
         // do nothing
       } else {
@@ -248,14 +268,10 @@ const actionsMap = {
     const newSubscriptions = { ...state.subscriptions }
 
     action.entries.forEach((e: { id: string | number; metadata: any }) => {
-      newEntries[e.id] = wrapEntry(
-        mergeWith(
-          {},
-          { ...unwrapEntry(state.entries[e.id]) },
-          e.metadata,
-          mergeCustomizer
-        )
-      )
+      const existing = { ...unwrapEntry(state.entries[e.id]) }
+      let newEntry = mergeWith({}, existing, e.metadata, mergeCustomizer)
+      newEntry = updateImageCache(existing, e.metadata, newEntry)
+      newEntries[e.id] = wrapEntry(newEntry)
     })
 
     action.subscriptions.forEach((s: { id: any; kind: any; uids: any }) => {
diff --git a/packages/mobile/src/screens/edit-profile-screen/EditProfileScreen.tsx b/packages/mobile/src/screens/edit-profile-screen/EditProfileScreen.tsx
index 5a6a9c5e42..ee1d7ce55f 100644
--- a/packages/mobile/src/screens/edit-profile-screen/EditProfileScreen.tsx
+++ b/packages/mobile/src/screens/edit-profile-screen/EditProfileScreen.tsx
@@ -33,7 +33,8 @@ const useStyles = makeStyles(({ palette, spacing }) => ({
   coverPhoto: {
     height: 96,
     width: '100%',
-    borderRadius: 0
+    borderRadius: 0,
+    aspectRatio: undefined
   },
   profilePicture: {
     position: 'absolute',