Update conversation hero message

Co-authored-by: trevor-signal <131492920+trevor-signal@users.noreply.github.com>

_locales/en/messages.json

@@ -2118,7 +2118,7 @@
     "description": "Header of the full-screen delete data confirmation screen"
   },
   "icu:deleteAllDataBody": {
-    "messageformat": "Delete all data and messages from this version of Signal Desktop? You can always relink this desktop, but your messages will not restore. Your Signal account and data on your phone or other linked devices will not be deleted.",
+    "messageformat": "Delete all data and messages from this version of Signal Desktop? Your Signal account and data on your phone or other linked devices will not be deleted.",
     "description": "Text describing what exactly will happen if the user clicks the button to delete all data"
   },
   "icu:deleteAllDataProgress": {

stylesheets/components/ConversationHero.scss

@@ -194,34 +194,4 @@
       }
     }
   }
-
-  &__linkNotification {
-    @include mixins.font-body-2;
-
-    margin-top: 12px;
-    text-align: center;
-    user-select: none;
-
-    &::before {
-      content: '';
-      display: inline-block;
-      height: 16px;
-      margin-inline-end: 8px;
-      vertical-align: middle;
-      width: 16px;
-
-      @include mixins.light-theme {
-        @include mixins.color-svg(
-          '../images/icons/v3/info/info.svg',
-          variables.$color-gray-60
-        );
-      }
-      @include mixins.dark-theme {
-        @include mixins.color-svg(
-          '../images/icons/v3/info/info.svg',
-          variables.$color-gray-25
-        );
-      }
-    }
-  }
 }

ts/components/conversation/ConversationHero.stories.tsx

@@ -27,7 +27,6 @@ export default {
     updateSharedGroups: action('updateSharedGroups'),
     viewUserStories: action('viewUserStories'),
     toggleAboutContactModal: action('toggleAboutContactModal'),
-    isRestoredFromBackup: false,
   },
 } satisfies Meta<Props>;
 
@@ -154,11 +153,6 @@ NoteToSelf.args = {
   isMe: true,
 };
 
-export const ImportedFromBackup = Template.bind({});
-ImportedFromBackup.args = {
-  isRestoredFromBackup: true,
-};
-
 export const UnreadStories = Template.bind({});
 UnreadStories.args = {
   hasStories: HasStories.Unread,

ts/components/conversation/ConversationHero.tsx

@@ -27,7 +27,6 @@ export type Props = {
   i18n: LocalizerType;
   isMe: boolean;
   isSignalConversation?: boolean;
-  isRestoredFromBackup: boolean;
   membersCount?: number;
   phoneNumber?: string;
   sharedGroupNames?: ReadonlyArray<string>;
@@ -145,7 +144,6 @@ export function ConversationHero({
   hasStories,
   id,
   isMe,
-  isRestoredFromBackup,
   isSignalConversation,
   membersCount,
   sharedGroupNames = [],
@@ -278,11 +276,6 @@ export function ConversationHero({
             phoneNumber,
             sharedGroupNames,
           })}
-        {!isSignalConversation && !isRestoredFromBackup && (
-          <div className="module-conversation-hero__linkNotification">
-            {i18n('icu:messageHistoryUnsynced')}
-          </div>
-        )}
       </div>
       {isShowingMessageRequestWarning && (
         <ConfirmationDialog

ts/components/conversation/Timeline.stories.tsx

@@ -411,7 +411,6 @@ const renderHeroRow = () => {
         id={getDefaultConversation().id}
         i18n={i18n}
         isMe={false}
-        isRestoredFromBackup={false}
         phoneNumber={getPhoneNumber()}
         profileName={getProfileName()}
         sharedGroupNames={['NYC Rock Climbers', 'Dinner Party']}

ts/state/selectors/items.ts

@@ -273,8 +273,3 @@ export const getBackupMediaDownloadProgress = createSelector(
     downloadBannerDismissed: state.backupMediaDownloadBannerDismissed ?? false,
   })
 );
-
-export const getIsRestoredFromBackup = createSelector(
-  getItems,
-  (state: ItemsStateType): boolean => state.isRestoredFromBackup === true
-);

ts/state/smart/HeroRow.tsx

@@ -8,7 +8,6 @@ import { getIntl, getTheme } from '../selectors/user';
 import { getHasStoriesSelector } from '../selectors/stories2';
 import { isSignalConversation } from '../../util/isSignalConversation';
 import { getConversationSelector } from '../selectors/conversations';
-import { getIsRestoredFromBackup } from '../selectors/items';
 import { useConversationsActions } from '../ducks/conversations';
 import { useGlobalModalActions } from '../ducks/globalModals';
 import { useStoriesActions } from '../ducks/stories';
@@ -25,7 +24,6 @@ export const SmartHeroRow = memo(function SmartHeroRow({
   const getPreferredBadge = useSelector(getPreferredBadgeSelector);
   const hasStoriesSelector = useSelector(getHasStoriesSelector);
   const conversationSelector = useSelector(getConversationSelector);
-  const isRestoredFromBackup = useSelector(getIsRestoredFromBackup);
   const conversation = conversationSelector(id);
   if (conversation == null) {
     throw new Error(`Did not find conversation ${id} in state!`);
@@ -62,7 +60,6 @@ export const SmartHeroRow = memo(function SmartHeroRow({
       i18n={i18n}
       id={id}
       isMe={isMe}
-      isRestoredFromBackup={isRestoredFromBackup}
       isSignalConversation={isSignalConversationValue}
       membersCount={membersCount}
       phoneNumber={phoneNumber}

ts/test-mock/messaging/reaction_test.ts

@@ -46,8 +46,8 @@ async function getReactionsForMessage(page: Page, timestamp: number) {
         reactor,
       ]);
     }
-    // click away
-    await page.getByText("chat history isn't transferred").click();
+    // dismiss reaction popup
+    await page.keyboard.press('Escape');
   } catch {
     // pass
   }