Merge branch 'develop'

torusresearch · Dec 14, 2023 · b3f999c · b3f999c
2 parents 827ac09 + d41a6b9
commit b3f999c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/binance.yml b/.github/workflows/binance.yml
@@ -78,7 +78,7 @@ jobs:
       - name: Run build
         run: |
           . ./scripts/setup.sh
-          npm version minor -m 'Updating version to %s [skip ci]'
+          npm version patch -m 'Updating version to %s [skip ci]'
           npm run build
           . ./scripts/gitPush.sh
         env:

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -78,7 +78,7 @@ jobs:
       - name: Run build
         run: |
           . ./scripts/setup.sh
-          npm version minor -m 'Updating version to %s [skip ci]'
+          npm version patch -m 'Updating version to %s [skip ci]'
           npm run build
           . ./scripts/gitPush.sh
         env:

diff --git a/scripts/updateIframeIntegrity.sh b/scripts/updateIframeIntegrity.sh
@@ -7,11 +7,11 @@ git config user.name "torus-bot"
 cd ~/torus-embed/
 
 if [[ "$GITHUB_REF" = 'refs/heads/master' ]]; then 
-    npm version minor -m 'Updating iframe integrity and publish %s'
+    npm version patch -m 'Updating iframe integrity and publish %s'
     git push origin master
     git push --tags 
 fi
 if [[ "$GITHUB_REF" = 'refs/heads/binance' ]]; then 
-    npm version minor -m 'Updating iframe integrity and publish %s'
+    npm version patch -m 'Updating iframe integrity and publish %s'
     git push origin binance
 fi
diff --git a/src/utils/utils.js b/src/utils/utils.js
@@ -1199,6 +1199,13 @@ export const parsePopupUrl = (url) => {
   localUrl.searchParams.append('isCustomLogin', config.isCustomLogin)
   if (config.isCustomLogin) {
     localUrl.searchParams.append('sessionNamespace', iframeOrigin.hostname)
+    const sessionId = getSessionIdFromStorage()
+    // this is for torus wallet plugin
+    if (sessionId) {
+      const hashParams = new URLSearchParams()
+      hashParams.append('sessionId', sessionId)
+      localUrl.hash = hashParams.toString()
+    }
   }
   return localUrl
 }