Merge pull request #193 from proximax-foundry/develop

release v1.2.2 - fix plain message
proximax-foundry · Apr 12, 2023 · dfd40da · dfd40da
2 parents ee2c26c + 8b19fdc
commit dfd40da
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 36 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "explorer-vite",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "private": true,
   "scripts": {
     "dev": "vite ",
@@ -29,7 +29,7 @@
     "primeicons": "^5.0.0",
     "primevue": "^3.21.0",
     "rxjs": "^7.8.0",
-    "tsjs-xpx-chain-sdk": "^0.9.19",
+    "tsjs-xpx-chain-sdk": "^0.9.20",
     "utf-8-validate": "^5.0.10",
     "v-tooltip": "^2.1.3",
     "vite-plugin-node-polyfills": "^0.7.0",

diff --git a/src/util/transactionUtils.ts b/src/util/transactionUtils.ts
@@ -3761,7 +3761,7 @@ export class TransactionUtils {
 
     const sdas: SDA[] = [];
 
-    txnDetails.message = transferTxn.message.payload;
+    txnDetails.message = transferTxn.message.message ? transferTxn.message.message : transferTxn.message.payload;
     txnDetails.messageType = transferTxn.message.type;
 
     switch (txnDetails.messageType) {
@@ -4132,7 +4132,7 @@ export class TransactionUtils {
 
       if (txns[i].type === TransactionType.TRANSFER) {
         const transferTxn = txns[i] as TransferTransaction;
-        txn.message = transferTxn.message.payload;
+        txn.message = transferTxn.message.message ? transferTxn.message.message : transferTxn.message.payload;
         txn.messageType = transferTxn.message.type;
 
         if (txn.messageType === MessageType.PlainMessage) {
@@ -4321,7 +4321,7 @@ export class TransactionUtils {
 
       if (txns[i].type === TransactionType.TRANSFER) {
         const transferTxn = txns[i] as TransferTransaction;
-        txn.message = transferTxn.message.payload;
+        txn.message = transferTxn.message.message ? transferTxn.message.message : transferTxn.message.payload;
         txn.messageType = transferTxn.message.type;
 
         // if(txn.messageType === MessageType.PlainMessage){
@@ -4526,7 +4526,7 @@ export class TransactionUtils {
 
       if (txns[i].type === TransactionType.TRANSFER) {
         const transferTxn = txns[i] as TransferTransaction;
-        txn.message = transferTxn.message.payload;
+        txn.message = transferTxn.message.message ? transferTxn.message.message : transferTxn.message.payload;
         txn.messageType = transferTxn.message.type;
 
         if (txn.messageType === MessageType.PlainMessage) {
@@ -4753,7 +4753,7 @@ export class TransactionUtils {
 
     if (transaction.type === TransactionType.TRANSFER) {
       const transferTxn = transaction as TransferTransaction;
-      txn.message = transferTxn.message.payload;
+      txn.message = transferTxn.message.message ? transferTxn.message.message : transferTxn.message.payload;
       txn.messageType = transferTxn.message.type;
       if (txn.messageType === MessageType.PlainMessage) {
         const newType = TransactionUtils.convertToSwapType(txn.message);