Merge pull request #1552 from Bilb/fix-animateed-profile-pic-small-issues

fix: address small issues with Animated profile pic

Author: Bilb

ts/components/dialog/DeleteAccountModal.tsx

@@ -5,10 +5,7 @@ import { updateDeleteAccountModal } from '../../state/ducks/modalDialog';
 import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
 import { SessionSpinner } from '../loading';
 
-import {
-  deleteEverythingAndNetworkData,
-  sendConfigMessageAndDeleteEverything,
-} from '../../util/accountManager';
+import { deleteEverythingAndNetworkData, deleteAccountLocally } from '../../util/accountManager';
 import { SessionRadioGroup } from '../basic/SessionRadioGroup';
 import { tr } from '../../localization/localeTools';
 import {
@@ -92,7 +89,7 @@ export const DeleteAccountModal = () => {
       try {
         window.log.warn('Deleting everything on device but keeping network data');
 
-        await sendConfigMessageAndDeleteEverything();
+        await deleteAccountLocally();
       } catch (e) {
         window.log.warn(e);
       } finally {

ts/components/dialog/EditProfilePictureModal.tsx

@@ -48,6 +48,7 @@ const StyledAvatarContainer = styled.div`
 
 const StyledCTADescription = styled.span<{ reverseDirection: boolean }>`
   text-align: center;
+  cursor: pointer;
   font-size: var(--font-size-lg);
   color: var(--text-secondary-color);
   line-height: normal;
@@ -276,7 +277,7 @@ export const EditProfilePictureModal = ({ conversationId }: EditProfilePictureMo
       }
     >
       {isMe && proBadgeCb.cb ? (
-        <StyledCTADescription reverseDirection={userHasPro}>
+        <StyledCTADescription reverseDirection={userHasPro} onClick={proBadgeCb.cb}>
           {tr(
             userHasPro
               ? 'proAnimatedDisplayPictureModalDescription'

ts/components/leftpane/ActionsPanel.tsx

@@ -215,7 +215,7 @@ const triggerSyncIfNeeded = async () => {
 
 const triggerAvatarReUploadIfNeeded = async () => {
   const lastAvatarUploadExpiryMs =
-    (await Data.getItemById(SettingsKey.ntsAvatarExpiryMs))?.value || 0;
+    (await Data.getItemById(SettingsKey.ntsAvatarExpiryMs))?.value || Number.MAX_SAFE_INTEGER;
 
   if (NetworkTime.now() > lastAvatarUploadExpiryMs) {
     window.log.info('Reuploading avatar...');

ts/interactions/avatar-interactions/nts-avatar-interactions.ts

@@ -31,6 +31,7 @@ export async function reuploadCurrentAvatarUs() {
   const profileKey = ourConvoProfileKey ? fromHexToArray(ourConvoProfileKey) : null;
   if (!profileKey || isEmpty(profileKey)) {
     window.log.info('reuploadCurrentAvatarUs: our profileKey empty');
+
     return null;
   }
   // Note: we do want to grab the current non-static avatar path here

ts/util/accountManager.ts

@@ -16,14 +16,12 @@ import { getSwarmPollingInstance } from '../session/apis/snode_api';
 import { mnDecode, mnEncode } from '../session/crypto/mnemonic';
 import { getOurPubKeyStrFromCache } from '../session/utils/User';
 import { LibSessionUtil } from '../session/utils/libsession/libsession_utils';
-import { forceSyncConfigurationNowIfNeeded } from '../session/utils/sync/syncUtils';
 import { updateConfirmModal, updateDeleteAccountModal } from '../state/ducks/modalDialog';
 import { userActions } from '../state/ducks/user';
 import { Registration } from './registration';
 import { Storage, saveRecoveryPhrase, setLocalPubKey, setSignInByLinking } from './storage';
 import { PromiseUtils } from '../session/utils';
 import { SnodeAPI } from '../session/apis/snode_api/SNodeAPI';
-import { ReduxOnionSelectors } from '../state/selectors/onions';
 import { tr } from '../localization/localeTools';
 
 /**
@@ -269,18 +267,10 @@ export const deleteDbLocally = async () => {
   window.localStorage.setItem('restart-reason', 'delete-account');
 };
 
-export async function sendConfigMessageAndDeleteEverything() {
+export async function deleteAccountLocally() {
   try {
-    // DELETE LOCAL DATA ONLY, NOTHING ON NETWORK
-    window?.log?.info('DeleteAccount => Sending a last SyncConfiguration');
-    if (ReduxOnionSelectors.isOnlineOutsideRedux()) {
-      // be sure to wait for the message being effectively sent. Otherwise we won't be able to encrypt it for our devices !
-      await forceSyncConfigurationNowIfNeeded(true);
-      window?.log?.info('Last configuration message sent!');
-    } else {
-      window?.log?.warn('sendConfigMessageAndDeleteEverything: we are offline, just deleting');
-    }
-
+    // Note: no point uploading a last config message as
+    // the user configs are being pushed after every changes made to them.
     await deleteDbLocally();
   } catch (error) {
     // if an error happened, it's not related to the delete everything on network logic as this is handled above.