Merge branch 'main' into develop

lerna.json

@@ -1,6 +1,6 @@
 {
   "packages": ["packages/*"],
-  "version": "5.3.14",
+  "version": "5.3.15",
   "npmClient": "yarn",
   "useWorkspaces": true
 }

packages/dapp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@argent-x/dapp",
-  "version": "5.3.14",
+  "version": "5.3.15",
   "private": true,
   "scripts": {
     "dev": "next dev",
@@ -10,8 +10,8 @@
     "lint": "next lint"
   },
   "dependencies": {
-    "@argent/get-starknet": "^5.3.14",
-    "@argent/x-sessions": "^5.3.14",
+    "@argent/get-starknet": "^5.3.15",
+    "@argent/x-sessions": "^5.3.15",
     "ethers": "^5.5.1",
     "next": "^13.0.0",
     "react": "^18.0.0",

packages/extension/manifest/v2.json

@@ -2,7 +2,7 @@
   "$schema": "https://json.schemastore.org/chrome-manifest.json",
   "name": "Argent X",
   "description": "The security of Ethereum with the scale of StarkNet",
-  "version": "5.3.14",
+  "version": "5.3.15",
   "manifest_version": 2,
   "browser_action": {
     "default_icon": {

packages/extension/manifest/v3.json

@@ -2,7 +2,7 @@
   "$schema": "https://json.schemastore.org/chrome-manifest.json",
   "name": "Argent X",
   "description": "The security of Ethereum with the scale of StarkNet",
-  "version": "5.3.14",
+  "version": "5.3.15",
   "manifest_version": 3,
   "action": {
     "default_icon": {

packages/extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@argent-x/extension",
-  "version": "5.3.14",
+  "version": "5.3.15",
   "main": "index.js",
   "license": "MIT",
   "devDependencies": {
@@ -74,13 +74,13 @@
     "push-release-branch": "git push --set-upstream origin release/v$npm_package_version --follow-tags"
   },
   "dependencies": {
-    "@argent/guardian": "^5.3.14",
-    "@argent/stack-router": "^5.3.14",
-    "@argent/ui": "^5.3.14",
-    "@argent/x-multicall": "^5.3.14",
-    "@argent/x-sessions": "^5.3.14",
-    "@argent/x-swap": "^5.3.14",
-    "@argent/x-window": "^5.3.14",
+    "@argent/guardian": "^5.3.15",
+    "@argent/stack-router": "^5.3.15",
+    "@argent/ui": "^5.3.15",
+    "@argent/x-multicall": "^5.3.15",
+    "@argent/x-sessions": "^5.3.15",
+    "@argent/x-swap": "^5.3.15",
+    "@argent/x-window": "^5.3.15",
     "@chakra-ui/icons": "^2.0.15",
     "@chakra-ui/react": "2.5.1",
     "@extend-chrome/messages": "^1.2.2",

packages/extension/src/ui/services/backgroundAccounts.ts

@@ -5,6 +5,7 @@ import {
   WalletAccount,
 } from "../../shared/wallet.model"
 import { walletStore } from "../../shared/wallet/walletStore"
+import { Account } from "../features/accounts/Account"
 import { decryptFromBackground, generateEncryptedSecret } from "./crypto"
 
 export const createNewAccount = async (networkId: string) => {
@@ -48,9 +49,19 @@ export const accountsOnNetwork = (
   networkId: string,
 ) => accounts.filter((account) => account.networkId === networkId)
 
+function isNotBaseWalletAccount(
+  account?: BaseWalletAccount,
+): account is Account {
+  return Boolean(account && "toBaseWalletAccount" in account)
+}
+
 export const selectAccount = async (
   account?: BaseWalletAccount,
 ): Promise<void> => {
+  /** coerce to sparse BaseWalletAccount to prevent DataCloneError from full Account class instance on FireFox */
+  if (isNotBaseWalletAccount(account)) {
+    account = account.toBaseWalletAccount()
+  }
   await walletStore.set("selected", account ?? null)
 
   return connectAccount(account)

packages/get-starknet/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@argent/get-starknet",
-  "version": "5.3.14",
+  "version": "5.3.15",
   "repository": "github:argentlabs/argent-x",
   "private": false,
   "main": "dist/",

packages/guardian/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@argent/guardian",
-  "version": "5.3.14",
+  "version": "5.3.15",
   "license": "MIT",
   "private": false,
   "type": "module",

packages/multicall/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@argent/x-multicall",
-  "version": "5.3.14",
+  "version": "5.3.15",
   "description": "A library for batched calls to Starknet smart contracts",
   "keywords": [
     "starknet",

packages/sessions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@argent/x-sessions",
-  "version": "5.3.14",
+  "version": "5.3.15",
   "description": "Manage sessions for Argent X wallets",
   "keywords": [
     "starknet",

packages/stack-router/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@argent/stack-router",
-  "version": "5.3.14",
+  "version": "5.3.15",
   "license": "MIT",
   "private": true,
   "files": [
@@ -32,7 +32,7 @@
     "lodash-es": "^4.17.21"
   },
   "devDependencies": {
-    "@argent/ui": "^5.3.14",
+    "@argent/ui": "^5.3.15",
     "@types/lodash-es": "^4.17.6",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",

packages/storybook/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@argent-x/storybook",
-  "version": "5.3.14",
+  "version": "5.3.15",
   "private": true,
   "devDependencies": {
-    "@argent-x/extension": "^5.3.14",
-    "@argent/ui": "^5.3.14",
+    "@argent-x/extension": "^5.3.15",
+    "@argent/ui": "^5.3.15",
     "@babel/core": "^7.18.5",
     "@chakra-ui/storybook-addon": "^4.0.12",
     "@storybook/addon-actions": "^6.5.9",

packages/swap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@argent/x-swap",
-  "version": "5.3.14",
+  "version": "5.3.15",
   "license": "MIT",
   "private": true,
   "files": [

packages/ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@argent/ui",
-  "version": "5.3.14",
+  "version": "5.3.15",
   "license": "MIT",
   "private": true,
   "files": [

packages/window/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@argent/x-window",
-  "version": "5.3.14",
+  "version": "5.3.15",
   "license": "MIT",
   "files": [
     "dist"