diff --git a/front-end/src/renderer/components/Transaction/FileTransactionProcessor.vue b/front-end/src/renderer/components/Transaction/FileTransactionProcessor.vue
index 88e1620ac..cc362d79c 100644
--- a/front-end/src/renderer/components/Transaction/FileTransactionProcessor.vue
+++ b/front-end/src/renderer/components/Transaction/FileTransactionProcessor.vue
@@ -409,7 +409,6 @@ async function executeFileTransactions(
   } | null = null;
   processedChunks.value = 0;
   let hasFailed = false;
-  const group = transaction.transactionId?.validStart?.seconds.toString() || '';
 
   validateTransaction(transaction);
 
diff --git a/front-end/src/renderer/components/Transaction/TransactionGroupProcessor.vue b/front-end/src/renderer/components/Transaction/TransactionGroupProcessor.vue
index 87a66ad50..843647525 100644
--- a/front-end/src/renderer/components/Transaction/TransactionGroupProcessor.vue
+++ b/front-end/src/renderer/components/Transaction/TransactionGroupProcessor.vue
@@ -44,18 +44,14 @@ import AppInput from '@renderer/components/ui/AppInput.vue';
 import AppCustomIcon from '@renderer/components/ui/AppCustomIcon.vue';
 import useTransactionGroupStore, { GroupItem } from '@renderer/stores/storeTransactionGroup';
 import { TRANSACTION_MAX_SIZE } from '@main/shared/constants';
-import { addGroupItem, editGroupItem, getGroup } from '@renderer/services/transactionGroupsService';
+import { addGroupItem, editGroupItem } from '@renderer/services/transactionGroupsService';
 import { addGroup, getGroupItem } from '@renderer/services/transactionGroupsService';
 import { uint8ArrayToHex } from '@renderer/services/electronUtilsService';
 import {
-  submitTransaction,
   addApprovers,
   addObservers,
-  ApiTransaction,
   ApiGroupItem,
   submitTransactionGroup,
-  getTransactionsToSign,
-  getApiGroups,
   getApiGroupById,
   IGroup,
 } from '@renderer/services/organization';
@@ -94,7 +90,7 @@ const transactionResult = ref<{
 } | null>();
 const chunksAmount = ref<number | null>(null);
 const chunkSize = ref(1024);
-const chunkInterval = ref(0.1);
+// const chunkInterval = ref(0.1);
 const userPassword = ref('');
 const signatureKey = ref<Key | KeyList | null>(null);
 const isConfirmShown = ref(false);
@@ -114,9 +110,9 @@ const newGroupId = ref('');
 const flattenedSignatureKey = computed(() =>
   signatureKey.value ? flattenKeyList(signatureKey.value).map(pk => pk.toStringRaw()) : [],
 );
-const externalPublicKeysReq = computed(() =>
-  flattenedSignatureKey.value.filter(pk => !user.publicKeys.includes(pk)),
-);
+// const externalPublicKeysReq = computed(() =>
+//   flattenedSignatureKey.value.filter(pk => !user.publicKeys.includes(pk)),
+// );
 const localPublicKeysReq = computed(() =>
   flattenedSignatureKey.value.filter(pk => user.publicKeys.includes(pk)),
 );
@@ -412,11 +408,7 @@ async function sendSignedTransactionsToOrganization() {
   );
 
   //TODO: fix to getting actual transactions
-  const group: IGroup = await getApiGroupById(
-    user.selectedOrganization.serverUrl,
-    network.network,
-    id,
-  );
+  const group: IGroup = await getApiGroupById(user.selectedOrganization.serverUrl, id);
 
   toast.success('Transaction submitted successfully');
   props.onSubmitted && props.onSubmitted(id, body);
@@ -503,7 +495,6 @@ async function executeFileTransactions(
   } | null = null;
   processedChunks.value = 0;
   let hasFailed = false;
-  const group = transaction.transactionId?.validStart?.seconds.toString() || '';
 
   validateTransaction(transaction);
 
@@ -638,86 +629,86 @@ async function executeFileTransactions(
   }
 }
 
-async function chunkFileTransactionForOrganization(
-  transaction: FileUpdateTransaction | FileAppendTransaction,
-  chunks: Uint8Array[],
-) {
-  if (!transaction.contents) return [transaction.toBytes()];
-
-  if (!isUserLoggedIn(user.personal)) {
-    throw new Error('User is not logged in');
-  }
-
-  validateTransaction(transaction);
-
-  const transactions: Uint8Array[] = [];
-  const isUpdateTransaction = transaction instanceof FileUpdateTransaction;
+// async function chunkFileTransactionForOrganization(
+//   transaction: FileUpdateTransaction | FileAppendTransaction,
+//   chunks: Uint8Array[],
+// ) {
+//   if (!transaction.contents) return [transaction.toBytes()];
 
-  isChunkingModalShown.value = true;
-  processedChunks.value = 0;
+//   if (!isUserLoggedIn(user.personal)) {
+//     throw new Error('User is not logged in');
+//   }
 
-  if (isUpdateTransaction) {
-    const updateTransaction = new FileUpdateTransaction()
-      .setTransactionId(transaction.transactionId!)
-      .setTransactionValidDuration(180)
-      .setMaxTransactionFee(transaction.maxTransactionFee || new Hbar(2))
-      .setFileId(transaction.fileId!)
-      .setContents(chunks[0]);
-    transaction.fileMemo && updateTransaction.setFileMemo(transaction.fileMemo);
-    transaction.keys && transaction.keys.length > 0 && updateTransaction.setKeys(transaction.keys);
-    transaction.expirationTime && updateTransaction.setExpirationTime(transaction.expirationTime);
-
-    transactions[0] = await signTransaction(
-      updateTransaction.toBytes(),
-      localPublicKeysReq.value,
-      user.personal.id,
-      userPassword.value,
-    );
+//   validateTransaction(transaction);
+
+//   const transactions: Uint8Array[] = [];
+//   const isUpdateTransaction = transaction instanceof FileUpdateTransaction;
+
+//   isChunkingModalShown.value = true;
+//   processedChunks.value = 0;
+
+//   if (isUpdateTransaction) {
+//     const updateTransaction = new FileUpdateTransaction()
+//       .setTransactionId(transaction.transactionId!)
+//       .setTransactionValidDuration(180)
+//       .setMaxTransactionFee(transaction.maxTransactionFee || new Hbar(2))
+//       .setFileId(transaction.fileId!)
+//       .setContents(chunks[0]);
+//     transaction.fileMemo && updateTransaction.setFileMemo(transaction.fileMemo);
+//     transaction.keys && transaction.keys.length > 0 && updateTransaction.setKeys(transaction.keys);
+//     transaction.expirationTime && updateTransaction.setExpirationTime(transaction.expirationTime);
+
+//     transactions[0] = await signTransaction(
+//       updateTransaction.toBytes(),
+//       localPublicKeysReq.value,
+//       user.personal.id,
+//       userPassword.value,
+//     );
 
-    processedChunks.value++;
-  }
+//     processedChunks.value++;
+//   }
 
-  for (let i = isUpdateTransaction ? 1 : 0; i < chunks.length; i++) {
-    if (!transaction.transactionId) throw new Error('Transaction ID is missing');
-    if (!transaction.transactionId.accountId)
-      throw new Error('Account ID in Transaction ID is missing');
+//   for (let i = isUpdateTransaction ? 1 : 0; i < chunks.length; i++) {
+//     if (!transaction.transactionId) throw new Error('Transaction ID is missing');
+//     if (!transaction.transactionId.accountId)
+//       throw new Error('Account ID in Transaction ID is missing');
 
-    const transactionId = createTransactionId(
-      transaction.transactionId.accountId,
-      transaction.transactionId.validStart?.plusNanos(i * chunkInterval.value * 1000000000) ||
-        new Date(),
-    );
+//     const transactionId = createTransactionId(
+//       transaction.transactionId.accountId,
+//       transaction.transactionId.validStart?.plusNanos(i * chunkInterval.value * 1000000000) ||
+//         new Date(),
+//     );
 
-    const appendTransaction = new FileAppendTransaction()
-      .setTransactionId(transactionId)
-      .setTransactionValidDuration(180)
-      .setMaxTransactionFee(transaction.maxTransactionFee || new Hbar(2))
-      .setFileId(transaction.fileId!)
-      .setContents(chunks[i])
-      .setMaxChunks(1)
-      .setChunkSize(chunkSize.value);
-
-    transactions.push(
-      await signTransaction(
-        appendTransaction.toBytes(),
-        localPublicKeysReq.value,
-        user.personal.id,
-        userPassword.value,
-      ),
-    );
+//     const appendTransaction = new FileAppendTransaction()
+//       .setTransactionId(transactionId)
+//       .setTransactionValidDuration(180)
+//       .setMaxTransactionFee(transaction.maxTransactionFee || new Hbar(2))
+//       .setFileId(transaction.fileId!)
+//       .setContents(chunks[i])
+//       .setMaxChunks(1)
+//       .setChunkSize(chunkSize.value);
+
+//     transactions.push(
+//       await signTransaction(
+//         appendTransaction.toBytes(),
+//         localPublicKeysReq.value,
+//         user.personal.id,
+//         userPassword.value,
+//       ),
+//     );
 
-    processedChunks.value++;
-  }
+//     processedChunks.value++;
+//   }
 
-  isChunkingModalShown.value = false;
+//   isChunkingModalShown.value = false;
 
-  return transactions;
-}
+//   return transactions;
+// }
 
-async function sendSignedFileTransactionToOrganization(transactionBytes?: Uint8Array) {
-  console.log(transactionBytes);
-  console.log('Send to back end signed along with required', externalPublicKeysReq.value);
-}
+// async function sendSignedFileTransactionToOrganization(transactionBytes?: Uint8Array) {
+//   console.log(transactionBytes);
+//   console.log('Send to back end signed along with required', externalPublicKeysReq.value);
+// }
 
 // async function sendSignedTransactionToOrganization() {
 //   isConfirmShown.value = false;
@@ -804,10 +795,10 @@ async function sendSignedFileTransactionToOrganization(transactionBytes?: Uint8A
 //   toast.success('Transaction signed successfully');
 // }
 
-async function sendSignedChunksToOrganization(transactions: Uint8Array[]) {
-  console.log(transactions);
-  console.log('Send to back end signed along with required', externalPublicKeysReq.value);
-}
+// async function sendSignedChunksToOrganization(transactions: Uint8Array[]) {
+//   console.log(transactions);
+//   console.log('Send to back end signed along with required', externalPublicKeysReq.value);
+// }
 
 function validateTransaction(transaction: FileUpdateTransaction | FileAppendTransaction) {
   if (!transaction.transactionId) throw new Error('Transaction ID is missing');
diff --git a/front-end/src/renderer/components/Transaction/TransactionProcessor.vue b/front-end/src/renderer/components/Transaction/TransactionProcessor.vue
index e1fc17c21..06a9e498c 100644
--- a/front-end/src/renderer/components/Transaction/TransactionProcessor.vue
+++ b/front-end/src/renderer/components/Transaction/TransactionProcessor.vue
@@ -313,8 +313,6 @@ async function sendSignedTransactionToOrganization() {
   console.log(await uint8ArrayToHex(props.transactionBytes));
   console.log(signatureHex);
 
-  
-
   /* Submit the transaction to the back end */
   const { id, body } = await submitTransaction(
     user.selectedOrganization.serverUrl,
diff --git a/front-end/src/renderer/pages/CreateTransaction/components/File/CreateFile.vue b/front-end/src/renderer/pages/CreateTransaction/components/File/CreateFile.vue
index 927674e79..08b331916 100644
--- a/front-end/src/renderer/pages/CreateTransaction/components/File/CreateFile.vue
+++ b/front-end/src/renderer/pages/CreateTransaction/components/File/CreateFile.vue
@@ -17,7 +17,7 @@ import { Prisma } from '@prisma/client';
 
 import useUserStore from '@renderer/stores/storeUser';
 import useNetworkStore from '@renderer/stores/storeNetwork';
-import useTransactionGroupStore, { GroupItem } from '@renderer/stores/storeTransactionGroup';
+import useTransactionGroupStore from '@renderer/stores/storeTransactionGroup';
 
 import { useToast } from 'vue-toast-notification';
 import { useRoute, useRouter } from 'vue-router';
@@ -49,7 +49,6 @@ import TransactionIdControls from '@renderer/components/Transaction/TransactionI
 import TransactionHeaderControls from '@renderer/components/Transaction/TransactionHeaderControls.vue';
 import UsersGroup from '@renderer/components/Organization/UsersGroup.vue';
 import ApproversList from '@renderer/components/Approvers/ApproversList.vue';
-import { TransactionDraft } from '@prisma/client';
 
 /* Stores */
 const user = useUserStore();
diff --git a/front-end/src/renderer/pages/CreateTransaction/components/Transfer/TransferHbar.vue b/front-end/src/renderer/pages/CreateTransaction/components/Transfer/TransferHbar.vue
index aa2c6da84..1f38d4065 100644
--- a/front-end/src/renderer/pages/CreateTransaction/components/Transfer/TransferHbar.vue
+++ b/front-end/src/renderer/pages/CreateTransaction/components/Transfer/TransferHbar.vue
@@ -16,7 +16,7 @@ import { useRoute, useRouter } from 'vue-router';
 import useAccountId from '@renderer/composables/useAccountId';
 
 import { createTransactionId } from '@renderer/services/transactionService';
-import { getDraft, updateDraft } from '@renderer/services/transactionDraftsService';
+import { getDraft } from '@renderer/services/transactionDraftsService';
 import { getAccountInfo } from '@renderer/services/mirrorNodeDataService';
 import { getAll } from '@renderer/services/accountsService';
 
@@ -54,16 +54,16 @@ const payerData = useAccountId();
 const transactionProcessor = ref<InstanceType<typeof TransactionProcessor> | null>(null);
 
 const transaction = ref<Transaction | null>(null);
-const savedDraft = ref<{
-  id: string;
-  created_at: Date;
-  updated_at: Date;
-  user_id: string;
-  type: string;
-  transactionBytes: string;
-  isTemplate: boolean | null;
-  details: string | null;
-}>();
+// const savedDraft = ref<{
+//   id: string;
+//   created_at: Date;
+//   updated_at: Date;
+//   user_id: string;
+//   type: string;
+//   transactionBytes: string;
+//   isTemplate: boolean | null;
+//   details: string | null;
+// }>();
 const validStart = ref(new Date());
 const maxTransactionFee = ref<Hbar>(new Hbar(2));
 const transactionMemo = ref('');
@@ -151,12 +151,6 @@ const handleCreate = async e => {
   }
 };
 
-const handleDraftAdded = async (id: string) => {
-  if (savedDraft.value?.isTemplate) return;
-
-  await updateDraft(id, { details: JSON.stringify({ transfers: transfers.value }) });
-};
-
 const handleLoadFromDraft = async () => {
   if (!router.currentRoute.value.query.draftId && !route.query.groupIndex) return;
   let draftTransactionBytes: string | null = null;
diff --git a/front-end/src/renderer/pages/CreateTransactionGroup/CreateTransactionGroup.vue b/front-end/src/renderer/pages/CreateTransactionGroup/CreateTransactionGroup.vue
index 7b254a04d..7e4009582 100644
--- a/front-end/src/renderer/pages/CreateTransactionGroup/CreateTransactionGroup.vue
+++ b/front-end/src/renderer/pages/CreateTransactionGroup/CreateTransactionGroup.vue
@@ -9,12 +9,8 @@ import useTransactionGroupStore from '@renderer/stores/storeTransactionGroup';
 import { useRouter, useRoute } from 'vue-router';
 import useUserStore from '@renderer/stores/storeUser';
 import { isUserLoggedIn } from '@renderer/utils/userStoreHelpers';
-import {
-  getEntityIdFromTransactionReceipt,
-  isAccountId,
-  getPropagationButtonLabel,
-} from '@renderer/utils';
-import { Key, KeyList, PublicKey, Transaction } from '@hashgraph/sdk';
+import { getEntityIdFromTransactionReceipt, getPropagationButtonLabel } from '@renderer/utils';
+import { KeyList, PublicKey } from '@hashgraph/sdk';
 import { useToast } from 'vue-toast-notification';
 
 /* Stores */
diff --git a/front-end/src/renderer/pages/TransactionGroupDetails/TransactionGroupDetails.vue b/front-end/src/renderer/pages/TransactionGroupDetails/TransactionGroupDetails.vue
index 3400db1b6..27d81a4ce 100644
--- a/front-end/src/renderer/pages/TransactionGroupDetails/TransactionGroupDetails.vue
+++ b/front-end/src/renderer/pages/TransactionGroupDetails/TransactionGroupDetails.vue
@@ -1,15 +1,14 @@
 <script setup lang="ts">
 import { computed, inject, onMounted, ref } from 'vue';
 import AppButton from '@renderer/components/ui/AppButton.vue';
-import useTransactionGroupStore from '@renderer/stores/storeTransactionGroup';
-import { useRouter, useRoute } from 'vue-router';
+import { useRouter } from 'vue-router';
 import useUserStore from '@renderer/stores/storeUser';
 import {
   isLoggedInOrganization,
   isLoggedInWithPassword,
   isUserLoggedIn,
 } from '@renderer/utils/userStoreHelpers';
-import { KeyList, PublicKey, Transaction } from '@hashgraph/sdk';
+import { Transaction } from '@hashgraph/sdk';
 import { useToast } from 'vue-toast-notification';
 import useDisposableWs from '@renderer/composables/useDisposableWs';
 import useNetwork from '@renderer/stores/storeNetwork';
@@ -30,13 +29,11 @@ import AppModal from '@renderer/components/ui/AppModal.vue';
 import AppCustomIcon from '@renderer/components/ui/AppCustomIcon.vue';
 
 /* Stores */
-const transactionGroup = useTransactionGroupStore();
 const user = useUserStore();
 const network = useNetwork();
 
 /* Composables */
 const router = useRouter();
-const route = useRoute();
 const toast = useToast();
 const ws = useDisposableWs();
 
@@ -54,11 +51,7 @@ const userPasswordModalRef = inject<USER_PASSWORD_MODAL_TYPE>(USER_PASSWORD_MODA
 async function handleFetchGroup(id: string | number) {
   if (isLoggedInOrganization(user.selectedOrganization) && !isNaN(Number(id))) {
     try {
-      group.value = await getApiGroupById(
-        user.selectedOrganization.serverUrl,
-        network.network,
-        Number(id),
-      );
+      group.value = await getApiGroupById(user.selectedOrganization.serverUrl, Number(id));
       if (group.value?.groupItems != undefined) {
         for (const item of group.value.groupItems) {
           shouldApprove.value =
diff --git a/front-end/src/renderer/pages/Transactions/components/InProgress.vue b/front-end/src/renderer/pages/Transactions/components/InProgress.vue
index 85b614102..7ca8aff27 100644
--- a/front-end/src/renderer/pages/Transactions/components/InProgress.vue
+++ b/front-end/src/renderer/pages/Transactions/components/InProgress.vue
@@ -122,7 +122,7 @@ async function fetchTransactions() {
       }
     }
 
-    groups.value = await getApiGroups(user.selectedOrganization.serverUrl, network.network);
+    groups.value = await getApiGroups(user.selectedOrganization.serverUrl);
   } finally {
     isLoading.value = false;
   }
diff --git a/front-end/src/renderer/pages/Transactions/components/ReadyForReview.vue b/front-end/src/renderer/pages/Transactions/components/ReadyForReview.vue
index 6dd287a70..d8a84cba1 100644
--- a/front-end/src/renderer/pages/Transactions/components/ReadyForReview.vue
+++ b/front-end/src/renderer/pages/Transactions/components/ReadyForReview.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, inject, onBeforeMount, reactive, ref, watch } from 'vue';
+import { computed, onBeforeMount, reactive, ref, watch } from 'vue';
 
 import { Transaction } from '@hashgraph/sdk';
 
@@ -11,11 +11,7 @@ import useNetworkStore from '@renderer/stores/storeNetwork';
 import { useRouter } from 'vue-router';
 import useDisposableWs from '@renderer/composables/useDisposableWs';
 
-import {
-  getApiGroups,
-  getTransactionsToApprove,
-  sendApproverChoice,
-} from '@renderer/services/organization';
+import { getApiGroups, getTransactionsToApprove } from '@renderer/services/organization';
 import { hexToUint8ArrayBatch } from '@renderer/services/electronUtilsService';
 
 import {
@@ -23,20 +19,12 @@ import {
   getTransactionId,
   getTransactionType,
 } from '@renderer/utils/sdk/transactions';
-import {
-  isLoggedInOrganization,
-  isLoggedInWithPassword,
-  isUserLoggedIn,
-} from '@renderer/utils/userStoreHelpers';
+import { isLoggedInOrganization } from '@renderer/utils/userStoreHelpers';
 
 import AppButton from '@renderer/components/ui/AppButton.vue';
 import AppLoader from '@renderer/components/ui/AppLoader.vue';
 import AppPager from '@renderer/components/ui/AppPager.vue';
 import EmptyTransactions from '@renderer/components/EmptyTransactions.vue';
-import { useToast } from 'vue-toast-notification';
-import { USER_PASSWORD_MODAL_KEY, USER_PASSWORD_MODAL_TYPE } from '@renderer/providers';
-import { decryptPrivateKey } from '@renderer/services/keyPairService';
-import { getPrivateKey, getTransactionBodySignatureWithoutNodeAccountId } from '@renderer/utils';
 
 /* Stores */
 const user = useUserStore();
@@ -45,7 +33,6 @@ const network = useNetworkStore();
 /* Composables */
 const router = useRouter();
 const ws = useDisposableWs();
-const toast = useToast();
 
 /* State */
 const transactions = ref<
@@ -62,7 +49,6 @@ const totalItems = ref(0);
 const currentPage = ref(1);
 const pageSize = ref(10);
 const isLoading = ref(true);
-const tx = ref();
 
 const sort = reactive<{
   field: keyof ITransaction;
@@ -72,9 +58,6 @@ const sort = reactive<{
   direction: 'desc',
 });
 
-/* Injected */
-const userPasswordModalRef = inject<USER_PASSWORD_MODAL_TYPE>(USER_PASSWORD_MODAL_KEY);
-
 /* Computed */
 const generatedClass = computed(() => {
   return sort.direction === 'desc' ? 'bi-arrow-down-short' : 'bi-arrow-up-short';
@@ -120,47 +103,6 @@ const handleDetails = async (id: number) => {
 //   }
 // };
 
-const handleApproveSingle = async () => {
-  const callback = async () => {
-    if (!isLoggedInOrganization(user.selectedOrganization) || !isUserLoggedIn(user.personal)) {
-      throw new Error('User is not logged in organization');
-    }
-
-    if (!isLoggedInWithPassword(user.personal)) {
-      if (!userPasswordModalRef) throw new Error('User password modal ref is not provided');
-      userPasswordModalRef.value?.open(
-        'Enter your application password',
-        'Enter your application password to decrypt your private key',
-        callback,
-      );
-      return;
-    }
-
-    const publicKey = user.selectedOrganization.userKeys[0].publicKey;
-    const privateKeyRaw = await decryptPrivateKey(
-      user.personal.id,
-      user.personal.password,
-      publicKey,
-    );
-    const privateKey = getPrivateKey(publicKey, privateKeyRaw);
-
-    const signature = await getTransactionBodySignatureWithoutNodeAccountId(
-      privateKey,
-      tx.value.transaction,
-    );
-
-    await sendApproverChoice(
-      user.selectedOrganization.serverUrl,
-      tx.value.transactionRaw.id,
-      user.selectedOrganization.userKeys[0].id,
-      signature,
-      true,
-    );
-  };
-
-  await callback();
-};
-
 const handleSort = async (field: keyof ITransaction, direction: 'asc' | 'desc') => {
   sort.field = field;
   sort.direction = direction;
@@ -204,7 +146,7 @@ async function fetchTransactions() {
       }
     }
 
-    groups.value = await getApiGroups(user.selectedOrganization.serverUrl, network.network);
+    groups.value = await getApiGroups(user.selectedOrganization.serverUrl);
   } finally {
     isLoading.value = false;
   }
@@ -308,8 +250,8 @@ watch([currentPage, pageSize, () => user.selectedOrganization], async () => {
                     }}
                   </td>
                   <td class="text-center">
-                    <AppButton 
-                      @click="handleDetails(group[0])" 
+                    <AppButton
+                      @click="handleDetails(group[0])"
                       color="secondary"
                       class="min-w-unset"
                       >Details</AppButton
diff --git a/front-end/src/renderer/pages/Transactions/components/ReadyToSign.vue b/front-end/src/renderer/pages/Transactions/components/ReadyToSign.vue
index b02653634..9077dd415 100644
--- a/front-end/src/renderer/pages/Transactions/components/ReadyToSign.vue
+++ b/front-end/src/renderer/pages/Transactions/components/ReadyToSign.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, inject, onBeforeMount, reactive, ref, watch } from 'vue';
+import { computed, onBeforeMount, reactive, ref, watch } from 'vue';
 
 import { Transaction } from '@hashgraph/sdk';
 
@@ -11,32 +11,20 @@ import useNetworkStore from '@renderer/stores/storeNetwork';
 import { useRouter } from 'vue-router';
 import useDisposableWs from '@renderer/composables/useDisposableWs';
 
-import {
-  fullUploadSignatures,
-  getApiGroups,
-  getTransactionsToSign,
-} from '@renderer/services/organization';
+import { getApiGroups, getTransactionsToSign } from '@renderer/services/organization';
 import { hexToUint8ArrayBatch } from '@renderer/services/electronUtilsService';
 
-import { USER_PASSWORD_MODAL_KEY, USER_PASSWORD_MODAL_TYPE } from '@renderer/providers';
-
 import {
   getTransactionDateExtended,
   getTransactionId,
   getTransactionType,
 } from '@renderer/utils/sdk/transactions';
-import {
-  isLoggedInOrganization,
-  isLoggedInWithPassword,
-  isUserLoggedIn,
-} from '@renderer/utils/userStoreHelpers';
+import { isLoggedInOrganization } from '@renderer/utils/userStoreHelpers';
 
 import AppButton from '@renderer/components/ui/AppButton.vue';
 import AppLoader from '@renderer/components/ui/AppLoader.vue';
 import AppPager from '@renderer/components/ui/AppPager.vue';
 import EmptyTransactions from '@renderer/components/EmptyTransactions.vue';
-import { publicRequiredToSign } from '@renderer/utils/transactionSignatureModels';
-import { useToast } from 'vue-toast-notification';
 
 /* Stores */
 const user = useUserStore();
@@ -45,7 +33,6 @@ const network = useNetworkStore();
 /* Composables */
 const router = useRouter();
 const ws = useDisposableWs();
-const toast = useToast();
 
 /* State */
 const transactions = ref<
@@ -64,7 +51,6 @@ const totalItems = ref(0);
 const currentPage = ref(1);
 const pageSize = ref(10);
 const isLoading = ref(true);
-const tx = ref();
 
 const sort = reactive<{
   field: keyof ITransaction;
@@ -74,9 +60,6 @@ const sort = reactive<{
   direction: 'desc',
 });
 
-/* Injected */
-const userPasswordModalRef = inject<USER_PASSWORD_MODAL_TYPE>(USER_PASSWORD_MODAL_KEY);
-
 /* Computed */
 const generatedClass = computed(() => {
   return sort.direction === 'desc' ? 'bi-arrow-down-short' : 'bi-arrow-up-short';
@@ -127,36 +110,6 @@ const handleDetails = async (id: number) => {
 //   }
 // };
 
-const handleSignSingle = async () => {
-  if (!isLoggedInOrganization(user.selectedOrganization) || !isUserLoggedIn(user.personal)) {
-    throw new Error('User is not logged in organization');
-  }
-
-  if (!isLoggedInWithPassword(user.personal)) {
-    if (!userPasswordModalRef) throw new Error('User password modal ref is not provided');
-    userPasswordModalRef.value?.open(
-      'Enter your application password',
-      'Enter your application password to decrypt your private key',
-      handleSignSingle,
-    );
-    return;
-  }
-
-  const publicKeysRequired = await publicRequiredToSign(
-    tx.value.transaction,
-    user.selectedOrganization.userKeys,
-    network.mirrorNodeBaseURL,
-  );
-
-  await fullUploadSignatures(
-    user.personal,
-    user.selectedOrganization,
-    publicKeysRequired,
-    tx.value.transaction,
-    tx.value.transactionRaw.id,
-  );
-};
-
 const handleSort = async (field: keyof ITransaction, direction: 'asc' | 'desc') => {
   sort.field = field;
   sort.direction = direction;
@@ -206,7 +159,7 @@ async function fetchTransactions() {
       }
     }
 
-    groups.value = await getApiGroups(user.selectedOrganization.serverUrl, network.network);
+    groups.value = await getApiGroups(user.selectedOrganization.serverUrl);
   } finally {
     isLoading.value = false;
   }
diff --git a/front-end/src/renderer/services/organization/index.ts b/front-end/src/renderer/services/organization/index.ts
index c2685c7bb..84918be9b 100644
--- a/front-end/src/renderer/services/organization/index.ts
+++ b/front-end/src/renderer/services/organization/index.ts
@@ -3,4 +3,4 @@ export * from './user';
 export * from './userKeys';
 export * from './health';
 export * from './transaction';
-export * from './transactionGroup';
\ No newline at end of file
+export * from './transactionGroup';
diff --git a/front-end/src/renderer/services/organization/transactionGroup.ts b/front-end/src/renderer/services/organization/transactionGroup.ts
index a8de7e6a6..27b045db0 100644
--- a/front-end/src/renderer/services/organization/transactionGroup.ts
+++ b/front-end/src/renderer/services/organization/transactionGroup.ts
@@ -1,7 +1,5 @@
-import { GroupItem } from './../../stores/storeTransactionGroup';
 import { Network } from '@main/shared/enums';
-import axios, { AxiosError } from 'axios';
-import { throwIfNoResponse } from '.';
+import axios from 'axios';
 import { ITransaction } from '@main/shared/interfaces';
 import { commonRequestHandler } from '@renderer/utils';
 
@@ -55,7 +53,7 @@ export const submitTransactionGroup = async (
 };
 
 /* Get transaction groups */
-export const getApiGroups = async (serverUrl: string, network: Network) => {
+export const getApiGroups = async (serverUrl: string) => {
   return commonRequestHandler(async () => {
     const { data } = await axios.get(`${serverUrl}/transaction-groups/`, {
       withCredentials: true,
@@ -66,7 +64,7 @@ export const getApiGroups = async (serverUrl: string, network: Network) => {
 };
 
 /* Get transaction groups */
-export const getApiGroupById = async (serverUrl: string, network: Network, id: number) => {
+export const getApiGroupById = async (serverUrl: string, id: number) => {
   return commonRequestHandler(async () => {
     const { data } = await axios.get(`${serverUrl}/transaction-groups/${id}`, {
       withCredentials: true,
diff --git a/front-end/src/renderer/stores/storeTransactionGroup.ts b/front-end/src/renderer/stores/storeTransactionGroup.ts
index 952b07b76..5ab365d47 100644
--- a/front-end/src/renderer/stores/storeTransactionGroup.ts
+++ b/front-end/src/renderer/stores/storeTransactionGroup.ts
@@ -3,13 +3,11 @@ import { TransactionApproverDto } from '@main/shared/interfaces/organization/app
 import { Prisma } from '@prisma/client';
 import { getDrafts } from '@renderer/services/transactionDraftsService';
 import {
-  addGroup,
   addGroupWithDrafts,
-  deleteGroup,
   getGroup,
   getGroupItems,
 } from '@renderer/services/transactionGroupsService';
-import { getTransactionFromBytes, getTransactionPayerId } from '@renderer/utils/transactions';
+import { getTransactionFromBytes } from '@renderer/utils/transactions';
 import { defineStore } from 'pinia';
 import { ref } from 'vue';
 
diff --git a/front-end/src/renderer/utils/userStoreHelpers.ts b/front-end/src/renderer/utils/userStoreHelpers.ts
index 173480531..146038acb 100644
--- a/front-end/src/renderer/utils/userStoreHelpers.ts
+++ b/front-end/src/renderer/utils/userStoreHelpers.ts
@@ -390,11 +390,12 @@ export const deleteOrganizationConnection = async (
   await deleteOrganization(organizationId);
 };
 
-const navigateToPreviousRoute = (router: Router) => {
-  const currentRoute = router.currentRoute.value;
-  if (router.previousPath) {
-    currentRoute.path !== router.previousPath && router.push(router.previousPath);
-  } else {
-    currentRoute.name !== 'transactions' && router.push({ name: 'transactions' });
-  }
-};
+// This function may no longer be needed
+// const navigateToPreviousRoute = (router: Router) => {
+//   const currentRoute = router.currentRoute.value;
+//   if (router.previousPath) {
+//     currentRoute.path !== router.previousPath && router.push(router.previousPath);
+//   } else {
+//     currentRoute.name !== 'transactions' && router.push({ name: 'transactions' });
+//   }
+// };