From f05f8988e74cedb43a8677a489ce3a2f63b94fa9 Mon Sep 17 00:00:00 2001
From: Petromir Petrov <petromirdev@gmail.com>
Date: Thu, 8 Aug 2024 11:13:15 +0300
Subject: [PATCH] update: display extension invite code modal every time

---
 .../ExtensionInviteCodeModal.js               | 16 +++-------------
 src/components/Wallet/TopBar/Links/Links.js   | 17 +++--------------
 src/components/Wallet/TopBar/TopBar.js        |  1 -
 src/components/Wallet/Wallet.js               | 19 ++-----------------
 4 files changed, 8 insertions(+), 45 deletions(-)

diff --git a/src/components/Modals/ExtensionInviteCodeModal/ExtensionInviteCodeModal.js b/src/components/Modals/ExtensionInviteCodeModal/ExtensionInviteCodeModal.js
index 1d7fc64e5..b36487a38 100644
--- a/src/components/Modals/ExtensionInviteCodeModal/ExtensionInviteCodeModal.js
+++ b/src/components/Modals/ExtensionInviteCodeModal/ExtensionInviteCodeModal.js
@@ -13,12 +13,7 @@ import styles from './ExtensionInviteCodeModal.module.scss'
 
 const CAN_CLOSE_AFTER_MS = 5000
 
-const ExtensionInviteCodeModal = ({
-  inviteCode,
-  setExtensionInviteCodeModalSeenBy,
-  accountId,
-  waitForClose = true
-}) => {
+const ExtensionInviteCodeModal = ({ inviteCode, waitForClose = true }) => {
   const { onHideModal } = useModals()
   const { addToast } = useToasts()
   const [canClose, setCanClose] = useState(!waitForClose)
@@ -26,12 +21,7 @@ const ExtensionInviteCodeModal = ({
   const handleCloseModal = useCallback(() => {
     if (!canClose) return
     onHideModal()
-    setExtensionInviteCodeModalSeenBy((prev) => {
-      if (prev.includes(accountId)) return prev
-
-      return [...prev, accountId]
-    })
-  }, [accountId, canClose, onHideModal, setExtensionInviteCodeModalSeenBy])
+  }, [canClose, onHideModal])
 
   useEffect(() => {
     const startingTime = Date.now()
@@ -45,7 +35,7 @@ const ExtensionInviteCodeModal = ({
     return () => {
       clearTimeout(timeout)
     }
-  })
+  }, [])
 
   const handleCopy = useCallback(async () => {
     try {
diff --git a/src/components/Wallet/TopBar/Links/Links.js b/src/components/Wallet/TopBar/Links/Links.js
index c748da93e..32eb8efdf 100644
--- a/src/components/Wallet/TopBar/Links/Links.js
+++ b/src/components/Wallet/TopBar/Links/Links.js
@@ -16,26 +16,15 @@ import { ReactComponent as Twitter } from './images/twitter.svg'
 import { ReactComponent as Telegram } from './images/telegram.svg'
 import { ReactComponent as Tos } from './images/tos.svg'
 
-const Links = ({ extensionInviteCodeUsed, inviteCode, accountId }) => {
+const Links = ({ extensionInviteCodeUsed, inviteCode }) => {
   const { showModal } = useModals()
-  const [, setExtensionInviteCodeModalSeenBy] = useLocalStorage({
-    key: 'extensionInviteCodeModalSeenBy',
-    defaultValue: []
-  })
   const [linksViewed, setLinksViewed] = useLocalStorage({ key: 'linksViewed', defaultValue: false })
 
   const onOpen = useCallback(() => setLinksViewed(true), [setLinksViewed])
 
   const openExtensionInviteCodeModal = useCallback(() => {
-    showModal(
-      <ExtensionInviteCodeModal
-        inviteCode={inviteCode}
-        setExtensionInviteCodeModalSeenBy={setExtensionInviteCodeModalSeenBy}
-        accountId={accountId}
-        waitForClose={false}
-      />
-    )
-  }, [accountId, inviteCode, setExtensionInviteCodeModalSeenBy, showModal])
+    showModal(<ExtensionInviteCodeModal inviteCode={inviteCode} waitForClose={false} />)
+  }, [inviteCode, showModal])
 
   return (
     <DropDown
diff --git a/src/components/Wallet/TopBar/TopBar.js b/src/components/Wallet/TopBar/TopBar.js
index 8448a6302..397a5ac5c 100644
--- a/src/components/Wallet/TopBar/TopBar.js
+++ b/src/components/Wallet/TopBar/TopBar.js
@@ -166,7 +166,6 @@ const TopBar = ({
             dapModeTopBar={dappModeTopBar}
           />
           <Links
-            accountId={selectedAcc}
             inviteCode={rewardsData?.rewards?.extensionKey?.key}
             extensionInviteCodeUsed={rewardsData?.rewards?.extensionKey?.used}
           />
diff --git a/src/components/Wallet/Wallet.js b/src/components/Wallet/Wallet.js
index b3926a322..1026b0450 100644
--- a/src/components/Wallet/Wallet.js
+++ b/src/components/Wallet/Wallet.js
@@ -43,10 +43,6 @@ export default function Wallet(props) {
     key: 'dAppsAdvancedMode',
     defaultValue: []
   })
-  const [extensionInviteCodeModalSeenBy, setExtensionInviteCodeModalSeenBy] = useLocalStorage({
-    key: 'extensionInviteCodeModalSeenBy',
-    defaultValue: []
-  })
 
   const routes = [
     {
@@ -261,18 +257,7 @@ export default function Wallet(props) {
 
     if (!key || used || rewardsAccountAddr !== account.id) return
 
-    const isSeen = extensionInviteCodeModalSeenBy.includes(account.id)
-
-    if (isSeen) return
-
-    showModal(
-      <ExtensionInviteCodeModal
-        inviteCode={key}
-        setExtensionInviteCodeModalSeenBy={setExtensionInviteCodeModalSeenBy}
-        accountId={account.id}
-      />,
-      { disableClose: true }
-    )
+    showModal(<ExtensionInviteCodeModal inviteCode={key} />, { disableClose: true })
   }, [
     props.accounts,
     props.relayerURL,
@@ -280,12 +265,12 @@ export default function Wallet(props) {
     props.showThankYouPage,
     props.rewardsData?.rewards.extensionKey?.key,
     props.rewardsData?.rewards.extensionKey?.used,
+    props.rewardsData?.rewards.accountAddr,
     props.selectedAcc,
     arePermissionsLoaded,
     isClipboardGranted,
     isNoticationsGranted,
     modalHidden,
-    extensionInviteCodeModalSeenBy,
     showModal
   ])