resolve conflict

52ccd0b3 · StyleZhang · 672ea497 · 178e9d52 · 52ccd0b3 · 52ccd0b3
Commit 52ccd0b3 authored Jul 11, 2023 by StyleZhang
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

index.tsx web/app/components/share/chat/index.tsx +2 -1

index.tsx web/app/components/share/text-generation/index.tsx +2 -1

No files found.
--- a/web/app/components/share/chat/index.tsx
+++ b/web/app/components/share/chat/index.tsx
@@ -310,7 +310,8 @@ const Main: FC<IMainProps> = ({
  }

  const fetchInitData = async () => {
-    await checkOrSetAccessToken()
+    if (!isInstalledApp)
+      await checkOrSetAccessToken()

    return Promise.all([isInstalledApp
      ? {

--- a/web/app/components/share/text-generation/index.tsx
+++ b/web/app/components/share/text-generation/index.tsx
@@ -259,7 +259,8 @@ const TextGeneration: FC<IMainProps> = ({
  }

  const fetchInitData = async () => {
-    await checkOrSetAccessToken()
+    if (!isInstalledApp)
+      await checkOrSetAccessToken()

    return Promise.all([isInstalledApp
      ? {