Merge pull request #511 from syscoin/develop

v2.0.12
syscoin · Dec 8, 2023 · aa2e678 · aa2e678
2 parents 88d602b + c383e81
commit aa2e678
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Pali Wallet",
-  "version": "2.0.11",
+  "version": "2.0.12",
   "icons": {
     "16": "assets/icons/favicon-16.png",
     "32": "assets/icons/favicon-32.png",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "paliwallet",
-  "version": "2.0.11",
+  "version": "2.0.12",
   "description": "A Non-Custodial Crypto Wallet",
   "private": true,
   "repository": {

diff --git a/source/scripts/Provider/EthProvider.ts b/source/scripts/Provider/EthProvider.ts
@@ -32,25 +32,27 @@ export const EthProvider = (host: string) => {
       validateTxToAddress
     ) as IDecodedTx;
     if (!decodedTx) throw cleanErrorStack(ethErrors.rpc.invalidRequest());
-    //Open Send Component
-    if (validateTxToAddress.wallet || isLegacyTx || !tx.data) {
+
+    //Open Contract Interaction component
+    if (validateTxToAddress.contract || !isLegacyTx) {
       const resp = await popupPromise({
         host,
         data: { tx, decodedTx, external: true },
-        route: 'tx/send/nTokenTx',
-        eventName: 'nTokenTx',
+        route: 'tx/send/ethTx',
+        eventName: 'txSend',
       });
-
       return resp;
     }
-    //Open Contract Interaction component
-    if (validateTxToAddress.contract) {
+
+    //Open Send Component
+    if (validateTxToAddress.wallet || isLegacyTx || !tx.data) {
       const resp = await popupPromise({
         host,
         data: { tx, decodedTx, external: true },
-        route: 'tx/send/ethTx',
-        eventName: 'txSend',
+        route: 'tx/send/nTokenTx',
+        eventName: 'nTokenTx',
       });
+
       return resp;
     }