Merge branch 'refs/heads/develop' into beta

# Conflicts:
#	package.json

Author: Aleksandar Cakalic

src/connectors/webwallet/helpers/openWebwallet.ts

@@ -60,16 +60,16 @@ export const openWebwallet = async (
   const { allowedDapps } = await fetchAllowedDapps(network)
 
   if (allowedDapps.includes(window.location.hostname)) {
-    const modalId = "argent-webwallet-modal"
+    const backdropId = "argent-webwallet-backdrop"
     const iframeId = "argent-webwallet-iframe"
 
-    const existingModal = document.getElementById(modalId)
+    const existingBackdrop = document.getElementById(backdropId)
     const existingIframe = document.getElementById(iframeId)
 
     // avoid duplicate iframes
-    if (existingIframe && existingIframe && existingModal) {
+    if (existingIframe && existingIframe && existingBackdrop) {
       existingIframe.remove()
-      existingModal.remove()
+      existingBackdrop.remove()
     }
     const { iframe, backdrop } = await createModal(origin, false)
 

src/connectors/webwallet/index.ts

@@ -126,7 +126,9 @@ export class WebWalletConnector extends Connector {
     approvalRequests: ApprovalRequest[]
     sessionTypedData: TypedData
   }) {
-    await this.ensureWallet()
+    if (!this._wallet) {
+      await this.ensureWallet()
+    }
 
     if (!this._wallet) {
       throw new ConnectorNotFoundError()
@@ -161,7 +163,9 @@ export class WebWalletConnector extends Connector {
   }
 
   async connect(_args: ConnectArgs = {}): Promise<ConnectorData> {
-    await this.ensureWallet()
+    if (!this._wallet) {
+      await this.ensureWallet()
+    }
 
     if (!this._wallet) {
       throw new ConnectorNotFoundError()
@@ -209,6 +213,10 @@ export class WebWalletConnector extends Connector {
   async request<T extends RpcMessage["type"]>(
     call: RequestFnCall<T>,
   ): Promise<RpcTypeToMessageMap[T]["result"]> {
+    if (!this._wallet) {
+      await this.ensureWallet()
+    }
+
     if (!this._wallet) {
       throw new ConnectorNotConnectedError()
     }