Csv import fixes

back-end/apps/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@back-end/api",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "",
   "author": "",
   "main": "index.js",

back-end/apps/chain/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@back-end/chain",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "",
   "author": "",
   "main": "index.js",

back-end/apps/notifications/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@back-end/notifications",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "",
   "author": "",
   "main": "index.js",

back-end/package.json

@@ -1,6 +1,6 @@
 {
   "name": "back-end",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "",
   "author": "",
   "private": true,

front-end/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hedera-transaction-tool",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "Transaction tool application",
   "author": {
     "name": "Hedera",

front-end/src/renderer/pages/CreateTransactionGroup/CreateTransactionGroup.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, onMounted, ref } from 'vue';
 
-import { Hbar, KeyList, PublicKey, TransferTransaction, Transaction } from '@hashgraph/sdk';
+import { Hbar, KeyList, PublicKey, TransferTransaction, Transaction, HbarUnit } from '@hashgraph/sdk';
 
 import useUserStore from '@renderer/stores/storeUser';
 import useTransactionGroupStore from '@renderer/stores/storeTransactionGroup';
@@ -15,6 +15,7 @@ import { deleteGroup } from '@renderer/services/transactionGroupsService';
 
 import {
   assertUserLoggedIn,
+  formatHbarTransfers,
   getErrorMessage,
   getPropagationButtonLabel,
   isLoggedInOrganization,
@@ -208,7 +209,7 @@ async function handleOnFileChanged(e: Event) {
   const target = e.target as HTMLInputElement;
   reader.readAsText(target.files![0]);
   reader.onload = () => {
-    const result = (reader.result as string).replace(/['"]+/g, '');
+    const result = reader.result as string;
     const rows = result.split(/\r?\n|\r|\n/g);
     let senderAccount = '';
     let feePayer = '';
@@ -218,27 +219,34 @@ async function handleOnFileChanged(e: Event) {
     let memo = '';
     let validStart: Date | null = null;
     for (const row of rows) {
-      const title = row.split(',')[0].toLowerCase();
+      const rowInfo = row.match(/(?:"(?:\\"|[^"])*"|[^,]+)(?=,|$)/g)
+        ?.map(s => s.trim()
+          .replace(/^"|"$/g, '')
+          .replace(/\\"/g, '"')) || [];
+      const title = rowInfo[0]?.toLowerCase();
       switch (title) {
+        case 'transaction description':
+          groupDescription.value = rowInfo[1];
+          break;
         case 'sender account':
-          senderAccount = row.split(',')[1];
+          senderAccount = rowInfo[1];
           break;
         case 'fee payer account':
-          feePayer = row.split(',')[1];
+          feePayer = rowInfo[1];
           break;
         case 'sending time':
-          sendingTime = row.split(',')[1];
+          sendingTime = rowInfo[1];
           break;
         case 'node ids':
           break;
         case 'transaction fee':
-          transactionFee = row.split(',')[1];
+          transactionFee = rowInfo[1];
           break;
         case 'transaction valid duration':
-          txValidDuration = row.split(',')[1];
+          txValidDuration = rowInfo[1];
           break;
         case 'memo':
-          memo = row.split(',')[1];
+          memo = rowInfo[1];
           break;
         case 'accountid':
         case 'account id':
@@ -249,7 +257,7 @@ async function handleOnFileChanged(e: Event) {
           } else {
             // Create the new validStart value, or add 1 millisecond to the existing one for subsequent transactions
             if (!validStart) {
-              const startDate = row.split(',')[2];
+              const startDate = rowInfo[2];
               validStart = new Date(`${startDate} ${sendingTime}`);
               if (validStart < new Date()) {
                 validStart = new Date();
@@ -261,16 +269,23 @@ async function handleOnFileChanged(e: Event) {
               .setTransactionValidDuration(txValidDuration ? Number.parseInt(txValidDuration) : 180)
               .setMaxTransactionFee(
                 transactionFee
-                  ? new Hbar(transactionFee)
-                  : Hbar.fromString(maxTransactionFee.value.toString()),
+                  ? new Hbar(transactionFee, HbarUnit.Tinybar)
+                  : maxTransactionFee.value
               );
 
             transaction.setTransactionId(
               createTransactionId(feePayer ? feePayer : senderAccount, validStart),
             );
-            transaction.addHbarTransfer(row.split(',')[0], row.split(',')[1]);
-            transaction.addHbarTransfer(senderAccount, Number.parseFloat(row.split(',')[1]) * -1);
-            transaction.setTransactionMemo(memo);
+            const transferAmount = rowInfo[1].replace(/,/g, '');
+            transaction.addHbarTransfer(rowInfo[0], new Hbar(transferAmount, HbarUnit.Tinybar));
+            transaction.addHbarTransfer(senderAccount, new Hbar(-transferAmount, HbarUnit.Tinybar));
+            // If memo is not provided for the row, use the memo from the header portion
+            // otherwise check if the memo is not 'n/a' and set it
+            if (rowInfo.length < 4 || !(rowInfo[3]?.trim())) {
+              transaction.setTransactionMemo(memo);
+            } else if (!/^(n\/a)$/i.test(rowInfo[3])) {
+              transaction.setTransactionMemo(rowInfo[3]);
+            }
 
             const transactionBytes = transaction.toBytes();
             const keys = new Array<string>();
@@ -315,12 +330,8 @@ function makeTransfer(index: number) {
       transactionGroup.groupItems[index].transactionBytes,
     ) as TransferTransaction
   ).hbarTransfersList;
-  const transfer =
-    transfers.length == 2
-      ? `${transfers[0].accountId} --> ${transfers[1].amount} --> ${transfers[1].accountId}`
-      : 'Multiple Transfers';
 
-  return transfer;
+  return formatHbarTransfers(transfers);
 }
 
 /* Hooks */
@@ -480,17 +491,14 @@ onBeforeRouteLeave(async to => {
               <div
                 class="align-self-center text-truncate col text-center mx-5"
                 :data-testid="'span-transaction-timestamp-' + index"
-              >
-                {{
-                  groupItem.type == 'Transfer Transaction'
-                    ? makeTransfer(index)
-                    : groupItem.description != ''
-                      ? groupItem.description
-                      : Transaction.fromBytes(groupItem.transactionBytes).transactionMemo
-                        ? Transaction.fromBytes(groupItem.transactionBytes).transactionMemo
-                        : createTransactionId(groupItem.payerAccountId, groupItem.validStart)
-                }}
-              </div>
+                v-html="groupItem.type == 'Transfer Transaction'
+                  ? makeTransfer(index)
+                  : groupItem.description != ''
+                    ? groupItem.description
+                    : Transaction.fromBytes(groupItem.transactionBytes).transactionMemo
+                      ? Transaction.fromBytes(groupItem.transactionBytes).transactionMemo
+                      : createTransactionId(groupItem.payerAccountId, groupItem.validStart)"
+              ></div>
               <div class="d-flex col justify-content-end">
                 <AppButton
                   type="button"

front-end/src/renderer/utils/index.ts

@@ -1,7 +1,7 @@
 import type { AccountInfo } from '@main/shared/interfaces';
 import type { HederaAccount } from '@prisma/client';
 
-import { AccountId, Client } from '@hashgraph/sdk';
+import { AccountId, Client, Hbar, HbarUnit } from '@hashgraph/sdk';
 
 import useUserStore from '@renderer/stores/storeUser';
 import useNetworkStore from '@renderer/stores/storeNetwork';
@@ -15,6 +15,7 @@ import { isAccountId } from './validator';
 export * from './dom';
 export * from './sdk';
 export * from './transactions';
+export * from './transferTransactions';
 export * from './validator';
 export * from './axios';
 export * from './ipc';
@@ -186,6 +187,15 @@ export const getAccountIdWithChecksum = (accountId: string): string => {
   }
 };
 
+export function stringifyHbarWithFont(hbar: Hbar, fontClass: string): string {
+  const tinybars = Math.abs(hbar.toTinybars());
+  const isHbar = tinybars >= Hbar.fromTinybars(1_000_000).toTinybars();
+  const symbol = isHbar ? HbarUnit.Hbar._symbol : HbarUnit.Tinybar._symbol;
+  const amountString = isHbar ? hbar.to(HbarUnit.Hbar).toString() : hbar.to(HbarUnit.Tinybar).toString();
+
+  return `${amountString} <span class="${fontClass}">${symbol}</span>`;
+}
+
 export const splitMultipleAccounts = (input: string, client: Client): string[] => {
   input = input.trim();
 

front-end/src/renderer/utils/transferTransactions.ts

@@ -0,0 +1,33 @@
+import { stringifyHbarWithFont } from './index';
+
+export function formatHbarTransfers(transfers): string {
+  if (transfers.length === 0) {
+    return 'No transfers';
+  }
+
+  if (transfers.length === 1) {
+    const amount = transfers[0].amount;
+    if (amount.isNegative()) {
+      return 'Missing receiver';
+    } else {
+      return 'Missing sender';
+    }
+  }
+
+  if (transfers.length === 2) {
+    // the JS SDK sorts the order of the transfers by account ID. We don't want this. We want the sender to be on the
+    // left and the receiver to be on the right. So we need to check if the amount is negative or positive and then
+    // arrange the transfers accordingly
+    let sender = transfers[0];
+    let receiver = transfers[1];
+    if (receiver.amount.isNegative()) {
+      sender = transfers[1];
+      receiver = transfers[0];
+    }
+    return `${sender.accountId} --> ${stringifyHbarWithFont(
+      receiver.amount, "text-bold text-secondary"
+    )} --> ${receiver.accountId}`;
+  }
+
+  return 'Multiple transfers';
+}