-
+
+
-
On-RAMP Support
-
- Easily purchase a wide range of crypto assets directly within the wallet
- using our integrated on-ramp providers.
-
-
-
+
+
On-RAMP Support
+
+ Easily purchase a wide range of crypto assets directly within the wallet
+ using our integrated on-ramp providers.
+
+
+
+
diff --git a/src/pages/globalRedirect.vue b/src/pages/globalRedirect.vue
index 9782b4ea..2d22fec0 100644
--- a/src/pages/globalRedirect.vue
+++ b/src/pages/globalRedirect.vue
@@ -47,7 +47,9 @@ onMounted(async () => {
app.id = appId
app.isMfaEnabled = provider.appConfig.mfa_enabled
app.curve =
- provider.appConfig.chain_type == 'EVM' ? CURVE.SECP256K1 : CURVE.ED25519
+ provider.appConfig.chain_type.toLowerCase() == 'evm'
+ ? CURVE.SECP256K1
+ : CURVE.ED25519
const info = provider.getUserInfo()
const userInfo: LoginInfo = {
@@ -85,7 +87,9 @@ onMounted(async () => {
}
}
try {
- await cleanup()
+ if (cleanup) {
+ await cleanup()
+ }
} catch (e) {
console.log({ e })
}
diff --git a/src/pages/initPageV2.vue b/src/pages/initPageV2.vue
index 28527263..6cb82f6f 100644
--- a/src/pages/initPageV2.vue
+++ b/src/pages/initPageV2.vue
@@ -9,6 +9,7 @@ import type { InitParentConnectionApi } from '@/models/Connection'
import { useAppStore } from '@/store/app'
import { useUserStore } from '@/store/user'
import { createInitParentConnection } from '@/utils/createParentConnection'
+import { devLogger } from '@/utils/devLogger'
import emailScheme from '@/utils/emailScheme'
import { getAuthProvider } from '@/utils/getAuthProvider'
import {
@@ -70,7 +71,11 @@ async function handleSocialLoginRequest(
if (authProvider) {
const { url, state } = await user.handleSocialLogin(authProvider, type)
const loginSrc = await (await parentConnection?.promise)?.getLoginSource()
- if (!loginSrc || !['rn', 'flutter', 'unity'].includes(loginSrc)) {
+ devLogger.log({ loginSrc })
+ if (
+ !loginSrc ||
+ !['rn', 'flutter', 'unity', 'unity-ws'].includes(loginSrc)
+ ) {
await catchupSigninPage(state)
}
return url
diff --git a/src/pages/loggedInView.vue b/src/pages/loggedInView.vue
index 96fa9dff..5b193417 100644
--- a/src/pages/loggedInView.vue
+++ b/src/pages/loggedInView.vue
@@ -16,6 +16,7 @@ import { useRouter, onBeforeRouteLeave } from 'vue-router'
import AppLoader from '@/components/AppLoader.vue'
import type { ParentConnectionApi } from '@/models/Connection'
import { RpcConfigWallet } from '@/models/RpcConfigList'
+import StarterTips from '@/pages/StarterTips/index-page.vue'
import { getEnabledChainList } from '@/services/chainlist.service'
import {
getGaslessEnabledStatus,
@@ -27,6 +28,7 @@ import useCurrencyStore from '@/store/currencies'
import { useParentConnectionStore } from '@/store/parentConnection'
import { useRequestStore } from '@/store/request'
import { useRpcStore } from '@/store/rpc'
+import { useStarterTipsStore } from '@/store/starterTips'
import { useUserStore } from '@/store/user'
import { CreateAccountHandler, EVMAccountHandler } from '@/utils/accountHandler'
import { ChainType } from '@/utils/chainType'
@@ -54,6 +56,7 @@ const userStore = useUserStore()
const appStore = useAppStore()
const rpcStore = useRpcStore()
const activitiesStore = useActivitiesStore()
+const starterTipsStore = useStarterTipsStore()
const showMfaBanner = ref(false)
const parentConnectionStore = useParentConnectionStore()
const requestStore = useRequestStore()
@@ -93,12 +96,12 @@ function stopCurrencyInterval() {
if (currencyInterval.value) clearInterval(currencyInterval.value)
}
-function showStarterTips() {
+function setShowStarterTips() {
const userId = userStore.info.id
const loginCount = storage.local.getLoginCount(userId)
const hasStarterTipShown = storage.local.getHasStarterTipShown(userId)
if (Number(loginCount) <= 2 && !hasStarterTipShown) {
- router.push({ name: 'StarterTips' })
+ starterTipsStore.setShowStarterTips()
return
}
}
@@ -147,7 +150,7 @@ onMounted(async () => {
console.log(e)
} finally {
loader.value.show = false
- showStarterTips()
+ setShowStarterTips()
}
})
@@ -461,7 +464,9 @@ function getWalletAddressType() {
async function sendAddressType(addressType: string) {
const parentConnectionInstance = await parentConnection.promise
- parentConnectionInstance.setAddressType(addressType)
+ if (parentConnectionInstance.setAddressType) {
+ parentConnectionInstance.setAddressType(addressType)
+ }
}
watch(
@@ -531,5 +536,9 @@ watch(
+
diff --git a/src/pages/loginRedirect.vue b/src/pages/loginRedirect.vue
index dfdf169d..7531bbea 100644
--- a/src/pages/loginRedirect.vue
+++ b/src/pages/loginRedirect.vue
@@ -42,7 +42,10 @@ async function init() {
const storage = getStorage()
const loginSrc = storage.local.getLoginSrc()
const isStandalone =
- loginSrc === 'rn' || loginSrc === 'flutter' || loginSrc === 'unity'
+ loginSrc === 'rn' ||
+ loginSrc === 'flutter' ||
+ loginSrc === 'unity' ||
+ loginSrc === 'unity-ws'
try {
const state = getStateFromUrl(route.fullPath)
storage.session.setState(state)
diff --git a/src/pages/profileScreen.vue b/src/pages/profileScreen.vue
index 7f5c5979..d4ca137f 100644
--- a/src/pages/profileScreen.vue
+++ b/src/pages/profileScreen.vue
@@ -14,11 +14,11 @@ import { useAppStore } from '@/store/app'
import { useModalStore } from '@/store/modal'
import { useParentConnectionStore } from '@/store/parentConnection'
import { useRpcStore } from '@/store/rpc'
+import { useStarterTipsStore } from '@/store/starterTips'
import { useUserStore } from '@/store/user'
import { AUTH_URL } from '@/utils/constants'
import { getAuthProvider } from '@/utils/getAuthProvider'
import { getImage } from '@/utils/getImage'
-import { isInAppLogin } from '@/utils/isInAppLogin'
import { getWindowFeatures } from '@/utils/popupProps'
import { getStorage } from '@/utils/storageWrapper'
@@ -36,6 +36,7 @@ const loader = ref({
show: false,
message: '',
})
+const starterTipsStore = useStarterTipsStore()
const {
info: { email, name },
@@ -114,9 +115,15 @@ async function handleMFASetupClick() {
return
}
- if (isInAppLogin(info.loginType)) {
+ if (getStorage().session.getInAppLogin()) {
modalStore.setShowModal(false)
- router.push({ name: 'MFASetup', params: { appId: appStore.id } })
+ router.push({
+ name: 'MFASetup',
+ params: { appId: appStore.id },
+ query: {
+ inApp: '1',
+ },
+ })
} else {
cleanExit = false
const mfaSetupPath = new URL(`mfa/${appStore.id}/setup`, AUTH_URL)
@@ -238,14 +245,20 @@ watch(