merge changes

Emurgo · Apr 18, 2024 · a3a7572 · a3a7572
1 parent 3933694
commit a3a7572
Show file tree

Hide file tree

Showing 430 changed files with 11,132 additions and 5 deletions.
diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json
@@ -126,12 +126,13 @@
     "@yoroi/common": "1.5.2",
     "@yoroi/exchange": "2.0.1",
     "@yoroi/links": "1.5.4",
-    "@yoroi/resolver": "2.0.4",
+    "@yoroi/portfolio": "1.0.0",
+    "@yoroi/resolver": "2.0.5",
+    "@yoroi/setup-wallet": "1.0.0",
     "@yoroi/staking": "1.5.1",
     "@yoroi/swap": "1.5.2",
     "@yoroi/theme": "^1.0.0",
     "@yoroi/transfer": "1.0.0",
-    "@yoroi/setup-wallet": "1.0.0",
     "add": "2.0.6",
     "assert": "^2.0.0",
     "axios": "^1.5.0",

diff --git a/packages/dapp-connector/lib/commonjs/adapters/async-storage.js b/packages/dapp-connector/lib/commonjs/adapters/async-storage.js
diff --git a/packages/dapp-connector/lib/commonjs/adapters/async-storage.js.map b/packages/dapp-connector/lib/commonjs/adapters/async-storage.js.map
diff --git a/packages/dapp-connector/lib/commonjs/connector.js b/packages/dapp-connector/lib/commonjs/connector.js
diff --git a/packages/dapp-connector/lib/commonjs/connector.js.map b/packages/dapp-connector/lib/commonjs/connector.js.map