{{ t('dappProvider.requestFrom') }}
diff --git a/src/components/Confirm/ConfirmForm/ConfirmForm.vue b/src/components/Confirm/ConfirmForm/ConfirmForm.vue
index b4b4d152c..7faffca39 100644
--- a/src/components/Confirm/ConfirmForm/ConfirmForm.vue
+++ b/src/components/Confirm/ConfirmForm/ConfirmForm.vue
@@ -380,7 +380,7 @@
{{ t('dappProvider.requestFrom') }}
diff --git a/src/components/WalletHome/WalletConnectCard/WalletConnectCard.scss b/src/components/WalletHome/WalletConnectCard/WalletConnectCard.scss
deleted file mode 100644
index 740724e72..000000000
--- a/src/components/WalletHome/WalletConnectCard/WalletConnectCard.scss
+++ /dev/null
@@ -1,39 +0,0 @@
-.promotion-card {
- height: 159px;
- .torus-btn1--whitelabel {
- border: 1px solid var(--v-torusBrand1-base) !important;
- }
- &.isMobile {
- height: inherit;
- }
- &.fromEmbed {
- height: unset;
- padding-top: 12px;
- }
-}
-.more-details-container {
- margin-top: 16px;
- @media screen and (max-width: 600px) {
- margin-top: 16px;
- position: inherit;
- }
-}
-
-.copy-link {
- border: 1px solid var(--v-text_3-base);
- border-radius: 4px;
- height: 44px;
- cursor: pointer;
- font-size: 12px;
- font-weight: 500;
- &.theme--dark {
- border: 1px solid var(--v-text_3-base);
- }
-}
-
-.close-btn {
- position: absolute;
- top: 5px;
- right: 5px;
- color: #d3d3d4;
-}
diff --git a/src/components/WalletHome/WalletConnectCard/WalletConnectCard.vue b/src/components/WalletHome/WalletConnectCard/WalletConnectCard.vue
deleted file mode 100644
index 991d5a004..000000000
--- a/src/components/WalletHome/WalletConnectCard/WalletConnectCard.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
- {{ t('walletConnect.title') }}
-
-
- {{ t('walletConnect.caption') }}
-
-
-
-
+
+
-
-
-
-
-
- {{ !guideOn ? t('walletConnect.viewGuide') : t('walletConnect.hideGuide') }}
-
-
-
-
- $vuetify.icons.close
-
-
-
-
-
-
-
-
- $vuetify.icons.status
-
-
-
- {{ t('walletConnect.gotoApp') }}
- $vuetify.icons.link
-
-
- $vuetify.icons.scan
-
-
-
-
-
-
- {{ t('walletConnect.disconnect') }}
-
-
- {{ t('walletConnect.connect') }}
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/components/helpers/WalletConnect/index.js b/src/components/helpers/WalletConnect/index.js
deleted file mode 100644
index 51409b3eb..000000000
--- a/src/components/helpers/WalletConnect/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './WalletConnect.vue'
diff --git a/src/components/helpers/WalletConnectModal/WalletConnectModal.scss b/src/components/helpers/WalletConnectModal/WalletConnectModal.scss
new file mode 100644
index 000000000..ea3c08b36
--- /dev/null
+++ b/src/components/helpers/WalletConnectModal/WalletConnectModal.scss
@@ -0,0 +1,41 @@
+.v-btn.wallet-connect-btn:not(.v-btn--flat):not(.v-btn--text):not(.v-btn--outlined) {
+ background-color: var(--v-torusGray4-base);
+ color: #7f8fa4;
+ border-radius: 12px;
+ letter-spacing: 0.1px;
+ font-size: 12px;
+ font-weight: bold;
+ &.theme--dark {
+ background-color: var(--v-torusBlack2-base);
+ color: #5c6c7f;
+ }
+ &.wallet-connect-btn--success {
+ background-color: var(--v-success-lighten5);
+ color: var(--v-success-base);
+ }
+}
+
+.card-header {
+ box-sizing: border-box;
+ border-radius: 6px;
+ line-height: 0;
+
+ .close-btn {
+ position: absolute;
+ top: 5px;
+ right: 5px;
+ color: var(--v-text_1-base);
+ }
+}
+
+::v-deep .v-text-field.v-text-field--outlined.qr-field {
+ .v-input__slot {
+ padding-right: 0;
+
+ .v-input__append-inner {
+ margin-top: 0;
+ padding-left: 0;
+ border-left: 1px solid #d3d5e2;
+ }
+ }
+}
diff --git a/src/components/helpers/WalletConnectModal/WalletConnectModal.vue b/src/components/helpers/WalletConnectModal/WalletConnectModal.vue
new file mode 100644
index 000000000..a4beb6bc3
--- /dev/null
+++ b/src/components/helpers/WalletConnectModal/WalletConnectModal.vue
@@ -0,0 +1,346 @@
+
+
-
- {{ t('walletConnect.guideInfo') }}
-{{ t(wcErrorMsg) }}
-
-
- $vuetify.icons.close
-
-
-
+
+ ![]()
+ {{ t('walletConnect.connected') }}
+ $vuetify.icons.disconnect
+
+
+ 
+ {{ t('walletConnect.useWalletConnect') }}
+
+
+
+
+
+ 
+
+ $vuetify.icons.close
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/helpers/WalletConnectModal/index.js b/src/components/helpers/WalletConnectModal/index.js
new file mode 100644
index 000000000..ba1e5d3c2
--- /dev/null
+++ b/src/components/helpers/WalletConnectModal/index.js
@@ -0,0 +1 @@
+export { default } from './WalletConnectModal.vue'
diff --git a/src/containers/WalletHome/WalletHomeMain/WalletHomeMain.vue b/src/containers/WalletHome/WalletHomeMain/WalletHomeMain.vue
index ad458b78f..7d1156ca6 100644
--- a/src/containers/WalletHome/WalletHomeMain/WalletHomeMain.vue
+++ b/src/containers/WalletHome/WalletHomeMain/WalletHomeMain.vue
@@ -4,12 +4,12 @@
+ {{ t('walletConnect.useWalletConnect') }}
+
+ {{ headerText }}
+
+ ![Success]()
+
+ {{ t('walletConnect.disconnect') }}
+ $vuetify.icons.disconnect
+
+
+
+
+ {{ wcMessage ? t('walletConnect.youAllSet') : t('walletConnect.keepWalletOpen', [connectedAppName]) }}
+
+
+
+
+ {{ t('walletConnect.step', [1]) }}:
+ {{ t('walletConnect.step1Message') }}
+
+
+ {{ t('walletConnect.step', [2]) }}
+ {{ t('walletConnect.step2Message') }}
+
+
+ {{ t('walletConnect.step', [3]) }}
+ {{ t('walletConnect.step3Message') }}
+
+
+ {{ t('walletConnect.step', [4]) }}
+ {{ t('walletConnect.step4Message') }}
+
+
+
+
+
+ $vuetify.icons.scan
+ {{ t('walletConnect.qrScan') }}
+
+
+
+
+ {{ t(wcErrorMsg) }}
+
+
+
+
+
+
+
+ $vuetify.icons.close
+
+
+
{{ t('walletHome.walletHome') }}
-
+
@@ -94,40 +94,8 @@
-
-
-
!!x.customTokenId)
},
- apiStreamSupported() {
- return apiStreamSupported()
- },
},
mounted() {
this.setDateUpdated()
diff --git a/src/containers/WalletSwap/WalletSwap.vue b/src/containers/WalletSwap/WalletSwap.vue
index 7dd6fa442..2a847532c 100644
--- a/src/containers/WalletSwap/WalletSwap.vue
+++ b/src/containers/WalletSwap/WalletSwap.vue
@@ -144,6 +144,7 @@ import torus from '../../torus'
import {
ARBITRUM_MAINNET_CODE,
BSC_MAINNET_CODE,
+ CELO_MAINNET_CODE,
GOERLI_CODE,
MAINNET_CODE,
MATIC_CODE,
@@ -160,7 +161,7 @@ const uniswapSupportedChainIds = new Set([
ARBITRUM_MAINNET_CODE,
OPTIMISM_MAINNET_CODE,
MATIC_CODE,
- 42_220,
+ CELO_MAINNET_CODE,
])
export default {
diff --git a/src/controllers/PreferencesController.js b/src/controllers/PreferencesController.js
index d6225f784..5cbfcb699 100644
--- a/src/controllers/PreferencesController.js
+++ b/src/controllers/PreferencesController.js
@@ -773,7 +773,7 @@ class PreferencesController extends SafeEventEmitter {
const _web3 = new JsonRpcProvider(rpcUrls[0], 'any')
const { chainId: networkChainID } = await _web3.getNetwork()
- if (networkChainID !== Number.parseInt(chainId, 16)) {
+ if (Number.parseInt(networkChainID, 16) !== Number.parseInt(chainId, 16)) {
throw ethErrors.rpc.invalidParams(
`Provided rpc url's chainId version is not matching with provided chainId, expected: ${toQuantity(networkChainID)}, received: ${chainId}`
)
diff --git a/src/controllers/walletconnect/WalletConnectController.js b/src/controllers/walletconnect/WalletConnectController.js
index f7229946a..7e5fcc7cf 100644
--- a/src/controllers/walletconnect/WalletConnectController.js
+++ b/src/controllers/walletconnect/WalletConnectController.js
@@ -3,10 +3,14 @@ import WalletConnectV2Controller from './WalletConnectV2Controller'
class WalletConnectController {
constructor(options) {
+ const initState = {
+ sessionData: '',
+ message: '',
+ }
this.walletConnectorController = undefined
this.provider = options.provider
this.network = options.network
- this.store = new ObservableStore({})
+ this.store = new ObservableStore(initState)
this.selectedAddress = ''
}
@@ -45,8 +49,11 @@ class WalletConnectController {
store: this.store,
})
}
- this.walletConnectorController.setSelectedAddress(this.selectedAddress)
- await this.walletConnectorController.init(options)
+
+ if (this.walletConnectorController !== undefined) {
+ this.walletConnectorController.setSelectedAddress(this.selectedAddress)
+ await this.walletConnectorController.init(options)
+ }
}
setSelectedAddress(address) {
@@ -62,6 +69,10 @@ class WalletConnectController {
return this.walletConnectorController?.getPeerMetaURL()
}
+ getPeerMetaInfo() {
+ return this.walletConnectorController?.getPeerMetaInfo()
+ }
+
async disconnect() {
if (this.walletConnectorController) {
await this.walletConnectorController.disconnect()
diff --git a/src/controllers/walletconnect/WalletConnectV2Controller.js b/src/controllers/walletconnect/WalletConnectV2Controller.js
index 21d47a054..2385f711c 100644
--- a/src/controllers/walletconnect/WalletConnectV2Controller.js
+++ b/src/controllers/walletconnect/WalletConnectV2Controller.js
@@ -224,7 +224,7 @@ class WalletConnectV2Controller {
setStoreSession() {
if (this.sessionConfig.connectedTopic()) {
const sessionData = JSON.stringify(this.walletConnector.session.values)
- this.store.putState({
+ this.store.updateState({
sessionData,
})
} else {
@@ -232,6 +232,13 @@ class WalletConnectV2Controller {
}
}
+ setStoreMessage(message) {
+ this.store.updateState({
+ message,
+ })
+ setTimeout(() => this.store.updateState({ message: '' }), 8000)
+ }
+
onSessionRequest = async (requestEvent) => {
const { params, topic, id } = requestEvent
const { request, chainId } = params
@@ -296,6 +303,7 @@ class WalletConnectV2Controller {
topic,
response,
})
+ this.setStoreMessage('request_approved')
}
} catch (error) {
log.error(`FAILED REJECT REQUEST, ERROR ${error.message}`)
@@ -321,6 +329,15 @@ class WalletConnectV2Controller {
return this.walletConnector?.session?.values[0]?.peer?.metadata?.url
}
+ getPeerMetaInfo() {
+ const peerMetaURL = new URL(this.walletConnector?.session?.values[0]?.peer?.metadata?.url)
+ return {
+ name: peerMetaURL.hostname,
+ url: this.walletConnector?.session?.values[0]?.peer?.metadata?.url,
+ icon: this.walletConnector?.session?.values[0]?.peer?.metadata?.icons[0],
+ }
+ }
+
async disconnect() {
if (this.walletConnector && this.sessionConfig.connectedTopic()) {
await this.walletConnector.disconnect({
diff --git a/src/handlers/Auth/OpenLoginWindowHandler.js b/src/handlers/Auth/OpenLoginWindowHandler.js
index 22937ff23..e01fca8b9 100644
--- a/src/handlers/Auth/OpenLoginWindowHandler.js
+++ b/src/handlers/Auth/OpenLoginWindowHandler.js
@@ -2,7 +2,7 @@ import { safebtoa } from '@toruslabs/openlogin-utils'
import log from 'loglevel'
import config from '../../config'
-import { randomId } from '../../utils/utils'
+import { getTimeout, randomId } from '../../utils/utils'
import PopupWithBcHandler from '../Popup/PopupWithBcHandler'
class OpenLoginWindowHandler {
@@ -62,7 +62,12 @@ class OpenLoginWindowHandler {
}
const channelName = `redirect_openlogin_channel_${this.nonce}`
log.info('channelname', channelName)
- const verifierWindow = new PopupWithBcHandler({ channelName, url: this.finalURL, preopenInstanceId: this.preopenInstanceId })
+ const verifierWindow = new PopupWithBcHandler({
+ channelName,
+ url: this.finalURL,
+ preopenInstanceId: this.preopenInstanceId,
+ timeout: getTimeout({ typeOfLogin }),
+ })
const result = await verifierWindow.handle()
return result
}
diff --git a/src/handlers/Popup/PopupHandler.js b/src/handlers/Popup/PopupHandler.js
index 121a642d1..5ee2e7b88 100644
--- a/src/handlers/Popup/PopupHandler.js
+++ b/src/handlers/Popup/PopupHandler.js
@@ -6,16 +6,17 @@ import { parsePopupUrl } from '../../utils/utils'
import StreamWindow from './StreamWindow'
class PopupHandler extends EventEmitter {
- constructor({ url, target, features, preopenInstanceId }) {
+ constructor({ url, target, features, preopenInstanceId, timeout = 30_000 }) {
super()
const localUrl = parsePopupUrl(url)
this.url = localUrl.href
this.target = target || '_blank'
this.features = features || FEATURES_DEFAULT_POPUP_WINDOW
this.window = undefined
- this.windowTimer = {}
+ this.windowTimer = undefined
this.iClosedWindow = false
this.preopenInstanceId = preopenInstanceId
+ this.timeout = timeout
this._setupTimer()
}
@@ -23,11 +24,13 @@ class PopupHandler extends EventEmitter {
this.windowTimer = setInterval(() => {
if (this.window && this.window.closed) {
clearInterval(this.windowTimer)
- if (!this.iClosedWindow) {
- this.emit('close')
- }
- this.iClosedWindow = false
- this.window = undefined
+ setTimeout(() => {
+ if (!this.iClosedWindow) {
+ this.emit('close')
+ }
+ this.iClosedWindow = false
+ this.window = undefined
+ }, this.timeout)
}
if (this.window === undefined) clearInterval(this.windowTimer)
}, 500)
diff --git a/src/handlers/Popup/PopupWithBcHandler.js b/src/handlers/Popup/PopupWithBcHandler.js
index 3c8bfdb22..fa3e96bd3 100644
--- a/src/handlers/Popup/PopupWithBcHandler.js
+++ b/src/handlers/Popup/PopupWithBcHandler.js
@@ -6,8 +6,8 @@ import { broadcastChannelOptions, UserError } from '../../utils/utils'
import PopupHandler from './PopupHandler'
class PopupWithBcHandler extends PopupHandler {
- constructor({ url, target, features, preopenInstanceId, channelName }) {
- super({ url, target, features, preopenInstanceId })
+ constructor({ url, target, features, preopenInstanceId, channelName, timeout }) {
+ super({ url, target, features, preopenInstanceId, timeout })
this.bc = new BroadcastChannel(channelName, broadcastChannelOptions)
}
diff --git a/src/icons/DisconnectIcon.vue b/src/icons/DisconnectIcon.vue
index b102e867f..49f3db97a 100644
--- a/src/icons/DisconnectIcon.vue
+++ b/src/icons/DisconnectIcon.vue
@@ -1,10 +1,8 @@
-
+
-
+ {{ dappName }}
+
{{ t('dappProvider.requestFrom') }}
@@ -138,11 +138,17 @@ export default {
data: { type: POPUP_RESULT, approve: true },
})
bc.close()
+ setTimeout(() => {
+ window.close()
+ }, 1000)
},
async triggerDeny() {
const bc = new BroadcastChannel(this.channel, broadcastChannelOptions)
await bc.postMessage({ data: { type: POPUP_RESULT, approve: false } })
bc.close()
+ setTimeout(() => {
+ window.close()
+ }, 1000)
},
editPermissions() {
this.$router.push({ path: '/wallet/settings' }).catch((_) => {})
diff --git a/src/views/RedirectCatch/RedirectCatch.vue b/src/views/RedirectCatch/RedirectCatch.vue
index ac41e1e51..f2a6d8028 100644
--- a/src/views/RedirectCatch/RedirectCatch.vue
+++ b/src/views/RedirectCatch/RedirectCatch.vue
@@ -69,6 +69,9 @@ export default {
if (ev.error && ev.error !== '') {
log.error(ev.error)
bc.close()
+ setTimeout(() => {
+ window.close()
+ }, 1000)
}
})
} else {
@@ -78,6 +81,9 @@ export default {
if (ev.success) {
bc.close()
log.info('posted', { queryParameters, hashParameters, instanceParameters })
+ setTimeout(() => {
+ window.close()
+ }, 1000)
} else {
window.close()
this.showCloseText = true
diff --git a/src/views/Start/Start.vue b/src/views/Start/Start.vue
index c129938b5..7642319d6 100644
--- a/src/views/Start/Start.vue
+++ b/src/views/Start/Start.vue
@@ -2,11 +2,11 @@
- {{ t('login.constructYourKey') }}
- {{ dappName }}
-