Merge remote-tracking branch 'upstream/clearnet' into add-message-bottom-keep-scroll

ts/components/session/conversation/SessionCompositionBox.tsx

@@ -247,21 +247,23 @@ class SessionCompositionBoxInner extends React.Component<Props, State> {
     if (this.isURL(pastedText) && !window.getSettingValue('link-preview-setting', false)) {
       const alreadyDisplayedPopup =
         (await getItemById(hasLinkPreviewPopupBeenDisplayed))?.value || false;
-      window.inboxStore?.dispatch(
-        updateConfirmModal({
-          shouldShowConfirm:
-            !window.getSettingValue('link-preview-setting') && !alreadyDisplayedPopup,
-          title: window.i18n('linkPreviewsTitle'),
-          message: window.i18n('linkPreviewsConfirmMessage'),
-          okTheme: SessionButtonColor.Danger,
-          onClickOk: () => {
-            window.setSettingValue('link-preview-setting', true);
-          },
-          onClickClose: async () => {
-            await createOrUpdateItem({ id: hasLinkPreviewPopupBeenDisplayed, value: true });
-          },
-        })
-      );
+      if (!alreadyDisplayedPopup) {
+        window.inboxStore?.dispatch(
+          updateConfirmModal({
+            shouldShowConfirm:
+              !window.getSettingValue('link-preview-setting') && !alreadyDisplayedPopup,
+            title: window.i18n('linkPreviewsTitle'),
+            message: window.i18n('linkPreviewsConfirmMessage'),
+            okTheme: SessionButtonColor.Danger,
+            onClickOk: () => {
+              window.setSettingValue('link-preview-setting', true);
+            },
+            onClickClose: async () => {
+              await createOrUpdateItem({ id: hasLinkPreviewPopupBeenDisplayed, value: true });
+            },
+          })
+        );
+      }
     }
   }