soramitsu
diff --git a/‎env.json‎
Lines changed: 1 addition & 0 deletions b/‎env.json‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎package.json‎
Lines changed: 2 additions & 2 deletions b/‎package.json‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/assets/img/networks/acala.svg‎
Lines changed: 34 additions & 0 deletions b/‎src/assets/img/networks/acala.svg‎
Lines changed: 34 additions & 0 deletions
diff --git a/‎src/assets/img/networks/moonbase.svg‎
Lines changed: 136 additions & 0 deletions b/‎src/assets/img/networks/moonbase.svg‎
Lines changed: 136 additions & 0 deletions
diff --git a/‎src/components/mixins/BridgeTransactionMixin.ts‎
Lines changed: 7 additions & 3 deletions b/‎src/components/mixins/BridgeTransactionMixin.ts‎
Lines changed: 7 additions & 3 deletions
diff --git a/‎src/components/mixins/NetworkFormatterMixin.ts‎
Lines changed: 4 additions & 0 deletions b/‎src/components/mixins/NetworkFormatterMixin.ts‎
Lines changed: 4 additions & 0 deletions
@@ -56,6 +56,7 @@
     "KusamaSora": true,
     "Polkadot": true,
     "PolkadotSora": true,
+    "PolkadotAcala": true,
     "Liberland": false
   },
   "EVM_NETWORKS_IDS": [56, 8217],
 
@@ -1,6 +1,6 @@
 {
   "name": "polkaswap-exchange-web",
-  "version": "1.32.2",
+  "version": "1.33.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/sora-xor/polkaswap-exchange-web.git"
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@metamask/detect-provider": "^2.0.0",
-    "@soramitsu/soraneo-wallet-web": "1.32.8-beta",
+    "@soramitsu/soraneo-wallet-web": "1.33.1",
     "@walletconnect/ethereum-provider": "^2.11.2",
     "@walletconnect/modal": "^2.6.2",
     "core-js": "^3.36.0",
 
@@ -49,7 +49,7 @@ export default class BridgeTransactionMixin extends Mixins(NetworkFormatterMixin
     return this.tx?.blockId ?? '';
   }
 
-  get txEventIndex(): number | undefined {
+  get txInternalEventIndex(): number | undefined {
     return this.tx?.payload?.eventIndex;
   }
 
@@ -65,6 +65,10 @@ export default class BridgeTransactionMixin extends Mixins(NetworkFormatterMixin
     return this.tx?.externalBlockId ?? '';
   }
 
+  get txExternalEventIndex(): number | undefined {
+    return this.tx && 'externalEventIndex' in this.tx ? this.tx.externalEventIndex : undefined;
+  }
+
   get externalNetworkType(): Nullable<BridgeNetworkType> {
     return this.tx?.externalNetworkType;
   }
@@ -78,7 +82,7 @@ export default class BridgeTransactionMixin extends Mixins(NetworkFormatterMixin
       this.soraNetwork,
       this.txSoraId,
       this.txInternalBlockNumber ?? this.txInternalBlockId,
-      this.txEventIndex
+      this.txInternalEventIndex
     );
   }
 
@@ -90,7 +94,7 @@ export default class BridgeTransactionMixin extends Mixins(NetworkFormatterMixin
       this.externalNetworkId,
       this.txExternalHash,
       this.txExternalBlockNumber ?? this.txExternalBlockId,
-      this.txEventIndex
+      this.txExternalEventIndex
     );
   }
 
 
@@ -141,6 +141,8 @@ export default class NetworkFormatterMixin extends Mixins(TranslationMixin) {
         return 'polkadot';
       case SubNetworkId.PolkadotSora:
         return 'sora-polkadot';
+      case SubNetworkId.PolkadotAcala:
+        return 'acala';
       case SubNetworkId.Kusama:
         return 'kusama';
       case SubNetworkId.Rococo:
@@ -151,6 +153,8 @@ export default class NetworkFormatterMixin extends Mixins(TranslationMixin) {
         return 'sora-kusama';
       case SubNetworkId.Liberland:
         return 'liberland';
+      case SubNetworkId.AlphanetMoonbase:
+        return 'moonbase';
       default:
         return 'ethereum';
     }
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ export default class BridgeTransactionMixin extends Mixins(NetworkFormatterMixin`
`49`	`49`	`return this.tx?.blockId ?? '';`
`50`	`50`	`}`
`51`	`51`
`52`		`- get txEventIndex(): number \| undefined {`
	`52`	`+ get txInternalEventIndex(): number \| undefined {`
`53`	`53`	`return this.tx?.payload?.eventIndex;`
`54`	`54`	`}`
`55`	`55`
`@@ -65,6 +65,10 @@ export default class BridgeTransactionMixin extends Mixins(NetworkFormatterMixin`
`65`	`65`	`return this.tx?.externalBlockId ?? '';`
`66`	`66`	`}`
`67`	`67`
	`68`	`+ get txExternalEventIndex(): number \| undefined {`
	`69`	`+ return this.tx && 'externalEventIndex' in this.tx ? this.tx.externalEventIndex : undefined;`
	`70`	`+ }`
	`71`	`+`
`68`	`72`	`get externalNetworkType(): Nullable<BridgeNetworkType> {`
`69`	`73`	`return this.tx?.externalNetworkType;`
`70`	`74`	`}`
`@@ -78,7 +82,7 @@ export default class BridgeTransactionMixin extends Mixins(NetworkFormatterMixin`
`78`	`82`	`this.soraNetwork,`
`79`	`83`	`this.txSoraId,`
`80`	`84`	`this.txInternalBlockNumber ?? this.txInternalBlockId,`
`81`		`- this.txEventIndex`
	`85`	`+ this.txInternalEventIndex`
`82`	`86`	`);`
`83`	`87`	`}`
`84`	`88`
`@@ -90,7 +94,7 @@ export default class BridgeTransactionMixin extends Mixins(NetworkFormatterMixin`
`90`	`94`	`this.externalNetworkId,`
`91`	`95`	`this.txExternalHash,`
`92`	`96`	`this.txExternalBlockNumber ?? this.txExternalBlockId,`
`93`		`- this.txEventIndex`
	`97`	`+ this.txExternalEventIndex`
`94`	`98`	`);`
`95`	`99`	`}`
`96`	`100`