Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
chaitanyapotti committed Dec 14, 2023
2 parents 2200575 + 4ea96ff commit 71e5f0f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ export default {
},
// we do the isCustomDapp check to differentiate b/w app.tor.us and dapps without isCustomLogin flag
isCustomLogin: isCustomLogin === 'true' || !!sessionNamespace,
isPlugin: false,

simplexApiHost: 'https://simplex-api.tor.us',
moonpayApiHost: 'https://moonpay-api.tor.us',
Expand Down
1 change: 1 addition & 0 deletions src/store/mutations.js
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ export default {
},
setIsPlugin(state, payload) {
state.isPlugin = payload
config.isPlugin = payload
},
}
function localThemeSet(payload, state) {
Expand Down
2 changes: 2 additions & 0 deletions src/utils/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -1199,6 +1199,8 @@ export const parsePopupUrl = (url) => {
localUrl.searchParams.append('isCustomLogin', config.isCustomLogin)
if (config.isCustomLogin) {
localUrl.searchParams.append('sessionNamespace', iframeOrigin.hostname)
}
if (config.isPlugin) {
const sessionId = getSessionIdFromStorage()
// this is for torus wallet plugin
if (sessionId) {
Expand Down

0 comments on commit 71e5f0f

Please sign in to comment.