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

4 years ago · d14807d2ab
parent 7d4ae4ca6b 8970daf292
commit d14807d2ab
1 changed files with 17 additions and 15 deletions
--- a/ts/components/session/conversation/SessionCompositionBox.tsx
+++ b/ts/components/session/conversation/SessionCompositionBox.tsx
@ -247,6 +247,7 @@ class SessionCompositionBoxInner extends React.Component<Props, State> {
    if (this.isURL(pastedText) && !window.getSettingValue('link-preview-setting', false)) {
      const alreadyDisplayedPopup =
        (await getItemById(hasLinkPreviewPopupBeenDisplayed))?.value || false;
+      if (!alreadyDisplayedPopup) {
        window.inboxStore?.dispatch(
          updateConfirmModal({
            shouldShowConfirm:
@ -264,6 +265,7 @@ class SessionCompositionBoxInner extends React.Component<Props, State> {
        );
      }
    }
+  }

  /**
   *