Feature/Show pending transactions from appstore until they return from qubic live

lib/components/transaction_details.dart

@@ -203,21 +203,6 @@ class TransactionDetails extends StatelessWidget {
                                   ? l10n.generalLabelYes
                                   : l10n.generalLabelNo),
                           ThemedControls.spacerVerticalSmall(),
-                          getCopyableDetails(
-                              context,
-                              l10n.transactionItemLabelCreatedDate,
-                              item.broadcasted != null
-                                  ? formatter.format(item.created!.toLocal())
-                                  : l10n.generalLabelUnknown),
-                          ThemedControls.spacerVerticalSmall(),
-                          getCopyableDetails(
-                              context,
-                              l10n.transactionItemLabelBroadcastedDate,
-                              item.broadcasted != null
-                                  ? formatter
-                                      .format(item.broadcasted!.toLocal())
-                                  : l10n.generalLabelUnknown),
-                          ThemedControls.spacerVerticalSmall(),
                           getCopyableDetails(
                               context,
                               l10n.transactionItemLabelConfirmedDate,

lib/components/transaction_item.dart

@@ -30,12 +30,7 @@ import 'package:qubic_wallet/extensions/asThousands.dart';
 import 'package:qubic_wallet/l10n/l10n.dart';
 import 'package:qubic_wallet/helpers/target_tick.dart';
 
-enum CardItem {
-  details,
-  resend,
-  explorer,
-  clipboardCopy,
-}
+enum CardItem { details, resend, explorer, clipboardCopy, delete }
 
 class TransactionItem extends StatelessWidget {
   final TransactionVm item;
@@ -134,13 +129,17 @@ class TransactionItem extends StatelessWidget {
           if (menuItem == CardItem.details) {
             showDetails(context);
           }
+          if (menuItem == CardItem.delete) {
+            appStore.removeIgnoredTransactions(item.id);
+          }
         },
         itemBuilder: (BuildContext context) => <PopupMenuEntry<CardItem>>[
               PopupMenuItem<CardItem>(
                 value: CardItem.details,
                 child: Text(l10n.transactionItemButtonViewDetails),
               ),
-              if (appStore.currentTick >= item.targetTick)
+              if (appStore.currentTick >= item.targetTick &&
+                  item.getStatus() != ComputedTransactionStatus.invalid)
                 PopupMenuItem<CardItem>(
                   value: CardItem.explorer,
                   child: Text(l10n.transactionItemButtonViewInExplorer),
@@ -149,10 +148,18 @@ class TransactionItem extends StatelessWidget {
                 value: CardItem.clipboardCopy,
                 child: Text(l10n.transactionItemButtonCopyToClipboard),
               ),
-              if ((item.getStatus() == ComputedTransactionStatus.failure))
+              // sally: commenting this temporary until we improve the resend to support all transfers
+              //if (appStore.currentQubicIDs
+              //      .any((e) => e.publicId == item.sourceId) &&
+              //item.getStatus() != ComputedTransactionStatus.pending)
+              //PopupMenuItem<CardItem>(
+              //value: CardItem.resend,
+              //child: Text(l10n.transactionItemButtonResend),
+              //),
+              if (item.getStatus() == ComputedTransactionStatus.invalid)
                 PopupMenuItem<CardItem>(
-                  value: CardItem.resend,
-                  child: Text(l10n.transactionItemButtonResend),
+                  value: CardItem.delete,
+                  child: Text(l10n.generalButtonDelete),
                 )
             ]);
   }

lib/di.dart

@@ -2,6 +2,7 @@ import 'package:get_it/get_it.dart';
 import 'package:qubic_wallet/helpers/global_snack_bar.dart';
 import 'package:qubic_wallet/resources/apis/archive/qubic_archive_api.dart';
 import 'package:qubic_wallet/resources/apis/live/qubic_live_api.dart';
+import 'package:qubic_wallet/resources/hive_storage.dart';
 import 'package:qubic_wallet/resources/qubic_cmd.dart';
 import 'package:qubic_wallet/resources/qubic_hub.dart';
 import 'package:qubic_wallet/resources/qubic_li.dart';
@@ -27,6 +28,7 @@ void setupDI() {
   getIt.registerSingleton<ExplorerStore>(ExplorerStore());
   getIt.registerSingleton<QubicHubStore>(QubicHubStore());
   getIt.registerSingleton<SecureStorage>(SecureStorage());
+  getIt.registerSingleton<HiveStorage>(HiveStorage());
 
 //Providers
   getIt.registerSingleton<GlobalSnackBar>(GlobalSnackBar());

lib/helpers/sendTransaction.dart

@@ -3,9 +3,10 @@ import 'package:qubic_wallet/di.dart';
 import 'package:qubic_wallet/helpers/platform_helpers.dart';
 import 'package:qubic_wallet/helpers/show_alert_dialog.dart';
 import 'package:qubic_wallet/l10n/l10n.dart';
+import 'package:qubic_wallet/models/transaction_vm.dart';
 import 'package:qubic_wallet/resources/apis/live/qubic_live_api.dart';
 import 'package:qubic_wallet/resources/qubic_cmd.dart';
-import 'package:qubic_wallet/resources/qubic_li.dart';
+import 'package:qubic_wallet/smart_contracts/qx_info.dart';
 import 'package:qubic_wallet/stores/application_store.dart';
 
 void showTamperedWalletAlert(BuildContext context) {
@@ -39,7 +40,18 @@ Future<bool> sendAssetTransferTransactionDialog(
   try {
     transactionKey = await qubicCmd.createAssetTransferTransaction(seed,
         destinationId, assetName, issuer, numberOfAssets, destinationTick);
-    await getIt.get<QubicLiveApi>().submitTransaction(transactionKey);
+    final transactionId =
+        await getIt.get<QubicLiveApi>().submitTransaction(transactionKey);
+    final pendingTransaction = TransactionVm(
+        id: transactionId,
+        sourceId: sourceId,
+        destId: destinationId,
+        amount: QxInfo.transferAssetFee,
+        status: ComputedTransactionStatus.pending.name,
+        targetTick: destinationTick,
+        isPending: true,
+        moneyFlow: true);
+    getIt.get<ApplicationStore>().addPendingTransaction(pendingTransaction);
     return true;
   } catch (e) {
     if (e.toString().startsWith("Exception: CRITICAL:")) {
@@ -80,7 +92,18 @@ Future<bool> sendTransactionDialog(BuildContext context, String sourceId,
 
   //We have the transaction, now let's call the API
   try {
-    await getIt.get<QubicLiveApi>().submitTransaction(transactionKey);
+    final transactionId =
+        await getIt.get<QubicLiveApi>().submitTransaction(transactionKey);
+    final pendingTransaction = TransactionVm(
+        id: transactionId,
+        sourceId: sourceId,
+        destId: destinationId,
+        amount: value,
+        status: ComputedTransactionStatus.pending.name,
+        targetTick: destinationTick,
+        isPending: true,
+        moneyFlow: value > 0);
+    getIt.get<ApplicationStore>().addPendingTransaction(pendingTransaction);
   } catch (e) {
     showAlertDialog(
         context, l10n.sendItemDialogErrorGeneralTitle, e.toString());

lib/helpers/transaction_UI_helpers.dart

@@ -70,8 +70,6 @@ Widget getEmptyTransactionsWidget(
 
 IconData getTransactionStatusIcon(ComputedTransactionStatus status) {
   switch (status) {
-    case ComputedTransactionStatus.confirmed:
-      return Icons.check_circle;
     case ComputedTransactionStatus.failure:
       return Icons.highlight_remove_outlined;
     case ComputedTransactionStatus.invalid:
@@ -85,8 +83,6 @@ IconData getTransactionStatusIcon(ComputedTransactionStatus status) {
 
 Color getTransactionStatusColor(ComputedTransactionStatus status) {
   switch (status) {
-    case ComputedTransactionStatus.confirmed:
-      return Colors.blue;
     case ComputedTransactionStatus.failure:
       return LightThemeColors.error;
     case ComputedTransactionStatus.invalid:
@@ -102,8 +98,6 @@ String getTransactionStatusText(
     ComputedTransactionStatus status, BuildContext context) {
   final l10n = l10nOf(context);
   switch (status) {
-    case ComputedTransactionStatus.confirmed:
-      return l10n.transactionLabelStatusConfirmed;
     case ComputedTransactionStatus.failure:
       return l10n.transactionLabelStatusFailed;
     case ComputedTransactionStatus.invalid:

lib/l10n/app_de.arb

@@ -188,7 +188,7 @@
     "explorerTickResultLabelTickLeader": "Tick-Leader",
     "explorerTickResultLabelNoTransactionsFound": "Keine Transaktionen in diesem Tick",
     "explorerTickResultLabelTransactionsFound": "{count, plural, =1{1 Transaktion im Tick} other{{count} Transaktionen im Tick}}",
-    "explorerTickResultLabelShowingOneTransaction": "{count, plural, =1{Zeigt 1 von 1 Transaktion im Tick} other{Zeigt 1 von {count} Transaktionen im Tick}}}",
+    "explorerTickResultLabelShowingOneTransaction": "{count, plural, =1{Zeigt 1 von 1 Transaktion im Tick} other{Zeigt 1 von {count} Transaktionen im Tick}}",
     "settingsTitle": "Einstellungen",
     "settingsHeaderAccountsAndData": "Konten und Daten",
     "settingsLockWallet": "Wallet sperren",
@@ -398,9 +398,7 @@
     "transactionItemButtonViewDetails": "Details anzeigen",
     "transactionItemButtonResend": "Erneut senden",
     "transactionItemLabelLeadToMoneyFlow": "Führen zu Geldfluss",
-    "transactionItemLabelCreatedDate": "Erstellungsdatum",
-    "transactionItemLabelBroadcastedDate": "Sendedatum",
-    "transactionItemLabelConfirmedDate": "Bestätigungsdatum",
+    "transactionItemLabelConfirmedDate": "Zeitstempel",
     "transactionItemLabelDetails": "Überweisungsdetails",
     "sendItemLabelTargetTick": "Ziel-Tick",
     "sendItemLabelTargetTickAutomatic": "Automatisch: Aktuell + {addingTicks}",
@@ -414,7 +412,7 @@
     "sendItemLabelTargetTickManual": "Manuelles Überschreiben",
     "sendItemLabelDetermineTargetTick": "Ziel-Tick bestimmen",
     "sendItemDialogErrorGeneralTitle": "Fehler beim Generieren der Transaktion.",
-    "sendItemDialogResendTitle": "Fehlgeschlagene Transaktion erneut senden?",
+    "sendItemDialogResendTitle": "Transaktion erneut senden?",
     "sendItemLabelResendTargetTickValue": "{formattedTargetTick} (aktuell {formattedCurrentTick})",
     "@sendItemLabelResendTargetTickValue": {
         "placeholders": {

lib/l10n/app_en.arb

@@ -196,7 +196,7 @@
     "explorerTickResultLabelTickLeader": "Tick Leader",
     "explorerTickResultLabelNoTransactionsFound": "No transactions in this tick",
     "explorerTickResultLabelTransactionsFound": "{count, plural, =1{1 transaction in tick} other{{count} transactions in tick}}",
-    "explorerTickResultLabelShowingOneTransaction": "{count, plural, =1{Showing 1 of 1 transaction in tick} other{Showing 1 of {count} transactions in tick}}}",
+    "explorerTickResultLabelShowingOneTransaction": "{count, plural, =1{Showing 1 of 1 transaction in tick} other{Showing 1 of {count} transactions in tick}}",
     "settingsTitle": "Settings",
     "settingsHeaderAccountsAndData": "Accounts and Data",
     "settingsLockWallet": "Lock Wallet",
@@ -408,9 +408,7 @@
     "transactionItemButtonViewDetails": "View Details",
     "transactionItemButtonResend": "Resend",
     "transactionItemLabelLeadToMoneyFlow": "Lead to Money Flow",
-    "transactionItemLabelCreatedDate": "Created Date",
-    "transactionItemLabelBroadcastedDate": "Broadcasted Date",
-    "transactionItemLabelConfirmedDate": "Confirmed Date",
+    "transactionItemLabelConfirmedDate": "Timestamp",
     "transactionItemLabelDetails": "Transfer Details",
     "sendItemLabelTargetTick": "Target Tick",
     "sendItemLabelTargetTickAutomatic": "Automatically: Current + {addingTicks}",
@@ -424,7 +422,7 @@
     "sendItemLabelTargetTickManual": "Manual Override",
     "sendItemLabelDetermineTargetTick": "Determine Target Tick",
     "sendItemDialogErrorGeneralTitle": "Error while generating transaction",
-    "sendItemDialogResendTitle": "Resend failed transaction?",
+    "sendItemDialogResendTitle": "Resend transaction?",
     "sendItemLabelResendTargetTickValue": "{formattedTargetTick} (current {formattedCurrentTick})",
     "@sendItemLabelResendTargetTickValue": {
         "placeholders": {

lib/l10n/app_es.arb

@@ -397,9 +397,7 @@
     "transactionItemButtonViewDetails": "Ver Detalles",
     "transactionItemButtonResend": "Reenviar",
     "transactionItemLabelLeadToMoneyFlow": "Conduce a un Flujo de Dinero",
-    "transactionItemLabelCreatedDate": "Fecha de Creación",
-    "transactionItemLabelBroadcastedDate": "Fecha de Transmisión",
-    "transactionItemLabelConfirmedDate": "Fecha de Confirmación",
+    "transactionItemLabelConfirmedDate": "Fecha y hora",
     "transactionItemLabelDetails": "Detalles de la Transferencia",
     "sendItemLabelTargetTick": "Tick de Ejecución",
     "sendItemLabelTargetTickAutomatic": "Automáticamente: Actual + {addingTicks}",
@@ -413,7 +411,7 @@
     "sendItemLabelTargetTickManual": "Sobreescribir manualmente",
     "sendItemLabelDetermineTargetTick": "Determinar el Target de Ejecución",
     "sendItemDialogErrorGeneralTitle": "Error al generar la transacción",
-    "sendItemDialogResendTitle": "¿Deseas reenviar la transacción fallida?",
+    "sendItemDialogResendTitle": "¿Deseas reenviar la transacción?",
     "sendItemLabelResendTargetTickValue": "{formattedTargetTick} (actual {formattedCurrentTick})",
     "@sendItemLabelResendTargetTickValue": {
         "placeholders": {

lib/l10n/app_fr.arb

@@ -398,9 +398,7 @@
     "transactionItemButtonViewDetails": "Voir les Détails",
     "transactionItemButtonResend": "Renvoyer",
     "transactionItemLabelLeadToMoneyFlow": "Conduit à un Flux Monétaire",
-    "transactionItemLabelCreatedDate": "Date de Création",
-    "transactionItemLabelBroadcastedDate": "Date de Diffusion",
-    "transactionItemLabelConfirmedDate": "Date de Confirmation",
+    "transactionItemLabelConfirmedDate": "Horodatage",
     "transactionItemLabelDetails": "Détails du Transfert",
     "sendItemLabelTargetTick": "Tick Cible",
     "sendItemLabelTargetTickAutomatic": "Automatiquement: Actuel + {addingTicks}",
@@ -414,7 +412,7 @@
     "sendItemLabelTargetTickManual": "Remplacement Manuel",
     "sendItemLabelDetermineTargetTick": "Déterminer le Tick Cible",
     "sendItemDialogErrorGeneralTitle": "Erreur lors de la génération de la transaction",
-    "sendItemDialogResendTitle": "Renvoyer la transaction échouée?",
+    "sendItemDialogResendTitle": "Renvoyer la transaction?",
     "sendItemLabelResendTargetTickValue": "{formattedTargetTick} (actuel {formattedCurrentTick})",
     "@sendItemLabelResendTargetTickValue": {
         "placeholders": {

lib/l10n/app_ru.arb

@@ -397,9 +397,7 @@
     "transactionItemButtonViewDetails": "Детали",
     "transactionItemButtonResend": "Переслать",
     "transactionItemLabelLeadToMoneyFlow": "Lead to Money Flow",
-    "transactionItemLabelCreatedDate": "Создать дату",
-    "transactionItemLabelBroadcastedDate": "Дата выхода",
-    "transactionItemLabelConfirmedDate": "Дата подтверждения",
+    "transactionItemLabelConfirmedDate": "Метка времени",
     "transactionItemLabelDetails": "Детали транзакции",
     "sendItemLabelTargetTick": "На каком тике",
     "sendItemLabelTargetTickAutomatic": "Автоматически: этот тик + {addingTicks}",
@@ -413,7 +411,7 @@
     "sendItemLabelTargetTickManual": "Ручное управление",
     "sendItemLabelDetermineTargetTick": "Определите целевой тик",
     "sendItemDialogErrorGeneralTitle": "Ошибка при генерации транзакции",
-    "sendItemDialogResendTitle": "Повторно отправить неудачную транзакцию?",
+    "sendItemDialogResendTitle": "Повторно отправить транзакцию?",
     "sendItemLabelResendTargetTickValue": "{formattedTargetTick} (current {formattedCurrentTick})",
     "@sendItemLabelResendTargetTickValue": {
         "placeholders": {

lib/l10n/app_tr.arb

@@ -397,9 +397,7 @@
     "transactionItemButtonViewDetails": "Detayları Göster",
     "transactionItemButtonResend": "Yeniden Gönder",
     "transactionItemLabelLeadToMoneyFlow": "Para Akışını Yönlendir",
-    "transactionItemLabelCreatedDate": "Oluşturulma Tarihi",
-    "transactionItemLabelBroadcastedDate": "Yayınlanma Tarihi",
-    "transactionItemLabelConfirmedDate": "Onaylanma Tarihi",
+    "transactionItemLabelConfirmedDate": "Zaman damgası",
     "transactionItemLabelDetails": "Transfer Detayları",
     "sendItemLabelTargetTick": "Hedef Tick",
     "sendItemLabelTargetTickAutomatic": "Otomatik olarak: Mevcut + {addingTicks}",
@@ -413,7 +411,7 @@
     "sendItemLabelTargetTickManual": "Manuel Geçersiz Kılma",
     "sendItemLabelDetermineTargetTick": "Hedef Tick'i Belirle",
     "sendItemDialogErrorGeneralTitle": "Transfer oluşturulurken bir hata oluştu",
-    "sendItemDialogResendTitle": "Başarısız olan işlem yeniden gönderilsin mi?",
+    "sendItemDialogResendTitle": "Işlem yeniden gönderilsin mi?",
     "sendItemLabelResendTargetTickValue": "{formattedTargetTick} (current {formattedCurrentTick})",
     "@sendItemLabelResendTargetTickValue": {
         "placeholders": {

lib/l10n/app_zh.arb

@@ -398,9 +398,7 @@
     "transactionItemButtonViewDetails": "查看详情",
     "transactionItemButtonResend": "重新发送",
     "transactionItemLabelLeadToMoneyFlow": "Lead to Money Flow",
-    "transactionItemLabelCreatedDate": "创建日期",
-    "transactionItemLabelBroadcastedDate": "广播日期",
-    "transactionItemLabelConfirmedDate": "确认日期",
+    "transactionItemLabelConfirmedDate": "时间戳",
     "transactionItemLabelDetails": "转账详情",
     "sendItemLabelTargetTick": "目标刻度",
     "sendItemLabelTargetTickAutomatic": "自动：当前刻度 + {addingTicks}",
@@ -414,7 +412,7 @@
     "sendItemLabelTargetTickManual": "手动调整",
     "sendItemLabelDetermineTargetTick": "确定目标刻度",
     "sendItemDialogErrorGeneralTitle": "生成交易时出现错误",
-    "sendItemDialogResendTitle": "重新发送失败的交易？",
+    "sendItemDialogResendTitle": "重新发送交易？",
     "sendItemLabelResendTargetTickValue": "{formattedTargetTick} (当前 {formattedCurrentTick})",
     "@sendItemLabelResendTargetTickValue": {
         "placeholders": {