fixes

src/Simplex/Chat/Badges.hs

@@ -311,7 +311,13 @@ data ProofPresHeader
   | PHLink ByteString
   | PHUnknown Char ByteString
   deriving (Eq, Show)
-  deriving (ToJSON, FromJSON) via (StrJSON "ProofPresHeader" ProofPresHeader)
+
+instance ToJSON ProofPresHeader where
+  toJSON = toJSON . BBSPresHeader . strEncode
+  toEncoding = toEncoding . BBSPresHeader . strEncode
+
+instance FromJSON ProofPresHeader where
+  parseJSON v = parseJSON v >>= \(BBSPresHeader ph) -> either fail pure $ strDecode ph
 
 instance StrEncoding ProofPresHeader where
   strEncode = \case

src/Simplex/Chat/Library/Commands.hs

@@ -1663,7 +1663,7 @@ processChatCommand cxt nm = \case
   APISetUserUIThemes uId uiThemes -> withUser $ \user@User {userId} -> do
     user'@User {userId = uId'} <- withFastStore $ \db -> do
       user' <- getUser db uId
-      liftIO $ setUserUIThemes db user uiThemes
+      liftIO $ setUserUIThemes db user' uiThemes
       pure user'
     when (userId == uId') $ chatWriteVar currentUser $ Just (user :: User) {uiThemes}
     ok user'
@@ -4043,7 +4043,7 @@ processChatCommand cxt nm = \case
           p'' = (p' :: Profile) {contactDomain = if isJust contactLink then claim else Nothing}
        in updateProfile_ user' p'' True $ withFastStore $ \db -> updateUserProfile db user' p''
     updateProfile_ :: User -> Profile -> Bool -> CM User -> CM ChatResponse
-    updateProfile_ user@User {userId, profile = p@LocalProfile {displayName = n}} p'@Profile {displayName = n', image = img'} shouldUpdateAddressData updateUser
+    updateProfile_ user@User {userId, profile = p@LocalProfile {displayName = n, image = img}} p'@Profile {displayName = n', image = img'} shouldUpdateAddressData updateUser
       | p' == fromLocalProfile p = pure $ CRUserProfileNoChange user
       | n /= n' = do
           checkValidName n'
@@ -4053,7 +4053,7 @@ processChatCommand cxt nm = \case
       | otherwise = update
       where
         update = do
-          checkProfileImageSize img'
+          when (img /= img') $ checkProfileImageSize img'
           checkProfileSize p'
           when shouldUpdateAddressData $ do
             ts <- liftIO getCurrentTime
@@ -4148,10 +4148,10 @@ processChatCommand cxt nm = \case
               lift . when (directOrUsed ct') $ createSndFeatureItems user ct ct'
           pure $ CRContactPrefsUpdated user ct ct'
     runUpdateGroupProfile :: User -> GroupInfoKeys -> GroupProfile -> Bool -> CM ChatResponse
-    runUpdateGroupProfile user (GIK gInfo@GroupInfo {businessChat, groupProfile = p@GroupProfile {displayName = n}} gks) p'@GroupProfile {displayName = n', image = img', memberAdmission = ma'} domainVerified = do
+    runUpdateGroupProfile user (GIK gInfo@GroupInfo {businessChat, groupProfile = p@GroupProfile {displayName = n, image = img}} gks) p'@GroupProfile {displayName = n', image = img', memberAdmission = ma'} domainVerified = do
       assertUserGroupRole gInfo GROwner
       when (n /= n') $ checkValidName n'
-      checkProfileImageSize img'
+      when (img /= img') $ checkProfileImageSize img'
       checkGroupProfileSize p'
       when (useRelays' gInfo && isJust (ma' >>= review)) $ throwCmdError "Admission review is not supported in channels"
       -- updateGroupProfile clears domain verification; re-set it when the caller already re-resolved the name

src/Simplex/Chat/Store/Groups.hs

@@ -3568,7 +3568,7 @@ createLinkOwnerMember db cxt user@User {userId, userContactId} GroupInfo {groupI
   where
     VersionRange minV maxV = vr cxt
     newOwnerProfile currentTs = do
-      (ldn, pId, _) <- createNewMemberProfile_ db cxt user (profileFromName $ nameFromMemberId memberId) currentTs
+      (ldn, pId, _, _) <- createNewMemberProfile_ db cxt user (profileFromName $ nameFromMemberId memberId) Nothing currentTs
       pure (ldn, pId)
     contactNameAndProfile ctId = do
       Contact {localDisplayName = ldn, profile = LocalProfile {profileId = pId}} <- getContact db cxt user ctId