merge: resolve conflicts from master

packages/apps-electron/webpack.main.cjs

@@ -47,7 +47,7 @@ function createWebpack () {
       ],
       resolve: {
         alias: {
-          '@polkadot/hw-ledger-transports': require.resolve('@polkadot/hw-ledger-transports/node')
+          '@pezkuwi/hw-ledger-transports': require.resolve('@pezkuwi/hw-ledger-transports/node')
         },
         extensionAlias: {
           '.js': ['.ts', '.tsx', '.js']

packages/react-signer/package.json

@@ -17,8 +17,8 @@
   "version": "1.0.2-1-x",
   "dependencies": {
     "@pezkuwi/hw-ledger": "^14.0.11",
-    "@pezkuwi/merkleize-metadata": "^1.0.0",
-    "@pezkuwi/react-components": "^1.0.2-1-x"
+    "@pezkuwi/react-components": "^1.0.2-1-x",
+    "@polkadot-api/merkleize-metadata": "^1.1.27"
   },
   "peerDependencies": {
     "react": "*",