Add testing env and remove modals in testing env

dappforce · Nov 28, 2023 · efc44dd · efc44dd
1 parent ff8d663
commit efc44dd
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 12 deletions.
diff --git a/.github/workflows/feature-based.yaml b/.github/workflows/feature-based.yaml
@@ -57,6 +57,7 @@ jobs:
             GH_USER_ID_SALT=salt
             GH_CRUST_IPFS_AUTH=eyJkYXRhIjp7ImRvbWFpbiI6eyJjaGFpbklkIjoiNSIsIm5hbWUiOiJDbG91ZDMuY2MiLCJ2ZXJpZnlpbmdDb250cmFjdCI6IjB4Q2NDQ2NjY2NDQ0NDY0NDQ0NDQ2NDY0NjY0NjQ0NDY0NjY2NjY2NjQyIsInZlcnNpb24iOiIxIn0sIm1lc3NhZ2UiOnsiZGVzY3JpcHRpb24iOiJTaWduIGZvciBXMyBCdWNrZXQgQWNjZXNzIEF1dGhlbnRpY2F0aW9uIiwic2lnbmluZ0FkZHJlc3MiOiIweDAwNDFjNzA1ZTEwNmVlOWRFMjI3Q2ExMzlBZDRBOTlEQjY0NENCM2EiLCJ0b2tlbkFkZHJlc3MiOiIweDM5ODY2Mzg0MjY4MDMzMkExQWJBM0IwM2JkNmRCNDdhRTk4NDk5NEMiLCJ0b2tlbklkIjoiMzAwMDAzNyIsImVmZmVjdGl2ZVRpbWVzdGFtcCI6MTY3ODUzNzYxNywiZXhwaXJhdGlvblRpbWVzdGFtcCI6MH0sInByaW1hcnlUeXBlIjoiVzNCdWNrZXQiLCJ0eXBlcyI6eyJXM0J1Y2tldCI6W3sibmFtZSI6ImRlc2NyaXB0aW9uIiwidHlwZSI6InN0cmluZyJ9LHsibmFtZSI6InNpZ25pbmdBZGRyZXNzIiwidHlwZSI6ImFkZHJlc3MifSx7Im5hbWUiOiJ0b2tlbkFkZHJlc3MiLCJ0eXBlIjoiYWRkcmVzcyJ9LHsibmFtZSI6InRva2VuSWQiLCJ0eXBlIjoic3RyaW5nIn0seyJuYW1lIjoiZWZmZWN0aXZlVGltZXN0YW1wIiwidHlwZSI6InVpbnQyNTYifSx7Im5hbWUiOiJleHBpcmF0aW9uVGltZXN0YW1wIiwidHlwZSI6InVpbnQyNTYifV19fSwic2lnbmF0dXJlIjoiMHhhMTUxODkyZGNhMTZlMTJkZmViYTFjY2FkMjNmZjM5MGVmODQ1MzdhMGI2MWI4YWQ1NDY1ZGI1ZjI1NjZkMWJmMjc3MGE1OTQyMzFmNzFmYzA5YWVlZGJhNzJkZjM5Y2Y4NDIxMTQ3YzJkNWQyNTFkNDZjNGQyMDFlOGM1MmUzZTFjIn0=
             GH_NEXT_PUBLIC_SPACE_IDS=1002,1005,1010,1011,1023,1025,1030,1031
+            GH_NEXT_PUBLIC_IS_TESTING_ENV=true
             GH_MODERATION_URL=https://staging-moderation.subsocial.network/graphql
             GH_MODERATION_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhZG1pbiI6dHJ1ZX0.Ao4w7g-TvV-o5KgxEiHvSgdxN6MAe0mHe7jS0ZT5rLY
             GH_NOTIFICATIONS_URL=https://staging-grill-notifications.subsocial.network/graphql

diff --git a/ci.env b/ci.env
@@ -3,6 +3,7 @@ CAPTCHA_SECRET='$GH_CAPTCHA_SECRET'
 SERVER_MNEMONIC='$GH_SERVER_MNEMONIC'
 SERVER_DISCUSSION_CREATOR_MNEMONIC='$GH_SERVER_DISCUSSION_CREATOR_MNEMONIC'
 NEXT_PUBLIC_SPACE_IDS='$GH_NEXT_PUBLIC_SPACE_IDS'
+NEXT_PUBLIC_IS_TESTING_ENV='$GH_NEXT_PUBLIC_IS_TESTING_ENV'
 MODERATION_URL='$GH_MODERATION_URL'
 MODERATION_TOKEN='$GH_MODERATION_TOKEN'
 NEXT_PUBLIC_NOTIFICATION_APP_ID='$GH_NEXT_PUBLIC_NOTIFICATION_APP_ID'

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -7,6 +7,7 @@ ARG GH_USER_ID_SALT
 ARG GH_CRUST_IPFS_AUTH
 ARG GH_NEXT_PUBLIC_CAPTCHA_SITE_KEY
 ARG GH_NEXT_PUBLIC_SPACE_IDS
+ARG GH_NEXT_PUBLIC_IS_TESTING_ENV
 ARG GH_MODERATION_URL
 ARG GH_MODERATION_TOKEN
 ARG GH_NEXT_PUBLIC_NOTIFICATION_APP_ID
@@ -34,6 +35,7 @@ ARG GH_NEXT_PUBLIC_OFFCHAIN_POSTING_HUBS
 
 ENV NEXT_PUBLIC_CAPTCHA_SITE_KEY=${GH_NEXT_PUBLIC_CAPTCHA_SITE_KEY} \
     NEXT_PUBLIC_SPACE_IDS=${GH_NEXT_PUBLIC_SPACE_IDS} \
+    NEXT_PUBLIC_IS_TESTING_ENV=${GH_NEXT_PUBLIC_IS_TESTING_ENV} \
     MODERATION_URL=${GH_MODERATION_URL} \
     MODERATION_TOKEN=${GH_MODERATION_TOKEN} \
     NEXT_PUBLIC_NOTIFICATION_APP_ID=${GH_NEXT_PUBLIC_NOTIFICATION_APP_ID} \
@@ -85,6 +87,7 @@ ARG GH_USER_ID_SALT
 ARG GH_CRUST_IPFS_AUTH
 ARG GH_NEXT_PUBLIC_CAPTCHA_SITE_KEY
 ARG GH_NEXT_PUBLIC_SPACE_IDS
+ARG GH_NEXT_PUBLIC_IS_TESTING_ENV
 ARG GH_MODERATION_URL
 ARG GH_MODERATION_TOKEN
 ARG GH_NEXT_PUBLIC_NOTIFICATION_APP_ID
@@ -112,6 +115,7 @@ ARG GH_NEXT_PUBLIC_OFFCHAIN_POSTING_HUBS
 
 ENV NEXT_PUBLIC_CAPTCHA_SITE_KEY=${GH_NEXT_PUBLIC_CAPTCHA_SITE_KEY} \
     NEXT_PUBLIC_SPACE_IDS=${GH_NEXT_PUBLIC_SPACE_IDS} \
+    NEXT_PUBLIC_IS_TESTING_ENV=${GH_NEXT_PUBLIC_IS_TESTING_ENV} \
     MODERATION_URL=${GH_MODERATION_URL} \
     MODERATION_TOKEN=${GH_MODERATION_TOKEN} \
     NEXT_PUBLIC_NOTIFICATION_APP_ID=${GH_NEXT_PUBLIC_NOTIFICATION_APP_ID} \

diff --git a/src/components/chats/ChatForm.tsx b/src/components/chats/ChatForm.tsx
@@ -22,7 +22,7 @@ import {
   useMyAccount,
 } from '@/stores/my-account'
 import { cx } from '@/utils/class-names'
-import { getOffchainPostingHubs } from '@/utils/env/client'
+import { getIsTestingEnv, getOffchainPostingHubs } from '@/utils/env/client'
 import { LocalStorage } from '@/utils/storage'
 import dynamic from 'next/dynamic'
 import {
@@ -346,10 +346,12 @@ export default function ChatForm({
       </CaptchaInvisible>
 
       <EmailSubscribeModal chatId={chatId} />
-      <StayUpdatedModal
-        isOpen={isOpenCtaModal}
-        closeModal={() => setIsOpenCtaModal(false)}
-      />
+      {!getIsTestingEnv() && (
+        <StayUpdatedModal
+          isOpen={isOpenCtaModal}
+          closeModal={() => setIsOpenCtaModal(false)}
+        />
+      )}
     </>
   )
 }

diff --git a/src/modules/chat/ChatPage/ChatPage.tsx b/src/modules/chat/ChatPage/ChatPage.tsx
@@ -28,7 +28,7 @@ import {
   useMyMainAddress,
 } from '@/stores/my-account'
 import { cx } from '@/utils/class-names'
-import { getDatahubConfig } from '@/utils/env/client'
+import { getDatahubConfig, getIsTestingEnv } from '@/utils/env/client'
 import { getIpfsContentUrl } from '@/utils/ipfs'
 import {
   getChatPageLink,
@@ -200,12 +200,14 @@ export default function ChatPage({
         <BottomPanel />
       </DefaultLayout>
 
-      <ChatCreateSuccessModal
-        chatId={chatId}
-        hubId={hubId}
-        isOpen={isOpenCreateSuccessModal}
-        closeModal={() => setIsOpenCreateSuccessModal(false)}
-      />
+      {!getIsTestingEnv() && (
+        <ChatCreateSuccessModal
+          chatId={chatId}
+          hubId={hubId}
+          isOpen={isOpenCreateSuccessModal}
+          closeModal={() => setIsOpenCreateSuccessModal(false)}
+        />
+      )}
     </>
   )
 }

diff --git a/src/utils/env/client.ts b/src/utils/env/client.ts
@@ -119,3 +119,12 @@ export function getOffchainPostingHubs() {
   )
   return offchainOffchainHubs.split(',')
 }
+
+export function getIsTestingEnv() {
+  return (
+    checkEnv(
+      process.env.NEXT_PUBLIC_IS_TESTING_ENV,
+      'NEXT_PUBLIC_IS_TESTING_ENV'
+    ) === 'true'
+  )
+}