From 2a88b32eee6a97c7528c25d5b822e904711d8783 Mon Sep 17 00:00:00 2001
From: Adegoke David <64401859+Blazebrain@users.noreply.github.com>
Date: Mon, 6 May 2024 20:11:18 +0100
Subject: [PATCH] fix: Add another node, handle errors gracefully (#1433)

---
 assets/tron_node_list.yml                |  4 ++++
 cw_tron/lib/tron_client.dart             | 11 ++++++++---
 lib/view_model/send/send_view_model.dart | 20 +++++++++++++++++---
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/assets/tron_node_list.yml b/assets/tron_node_list.yml
index e30f79d53..4c67b920e 100644
--- a/assets/tron_node_list.yml
+++ b/assets/tron_node_list.yml
@@ -1,4 +1,8 @@
 -
   uri: api.trongrid.io
   is_default: true
+  useSSL: true
+-
+  uri: tron-rpc.publicnode.com:443
+  is_default: false
   useSSL: true
\ No newline at end of file
diff --git a/cw_tron/lib/tron_client.dart b/cw_tron/lib/tron_client.dart
index f03a8abce..73812f14c 100644
--- a/cw_tron/lib/tron_client.dart
+++ b/cw_tron/lib/tron_client.dart
@@ -367,7 +367,7 @@ class TronClient {
   ) async {
     // This is introduce to server as a limit in cases where feeLimit is 0
     // The transaction signing will fail if the feeLimit is explicitly 0.
-    int defaultFeeLimit = 100000;
+    int defaultFeeLimit = 269000;
 
     final block = await _provider!.request(TronRequestGetNowBlock());
     // Create the transfer contract
@@ -401,8 +401,9 @@ class TronClient {
     final tronBalanceInt = tronBalance.toInt();
 
     if (feeLimit > tronBalanceInt) {
+      final feeInTrx = TronHelper.fromSun(BigInt.parse(feeLimit.toString()));
       throw Exception(
-        'You don\'t have enough TRX to cover the transaction fee for this transaction. Kindly top up.',
+        'You don\'t have enough TRX to cover the transaction fee for this transaction. Kindly top up.\nTransaction fee: $feeInTrx TRX',
       );
     }
 
@@ -442,6 +443,9 @@ class TronClient {
 
     if (!request.isSuccess) {
       log("Tron TRC20 error: ${request.error} \n ${request.respose}");
+      throw Exception(
+        'An error occured while creating the transfer request. Please try again.',
+      );
     }
 
     final feeLimit = await getFeeLimit(
@@ -454,8 +458,9 @@ class TronClient {
     final tronBalanceInt = tronBalance.toInt();
 
     if (feeLimit > tronBalanceInt) {
+      final feeInTrx = TronHelper.fromSun(BigInt.parse(feeLimit.toString()));
       throw Exception(
-        'You don\'t have enough TRX to cover the transaction fee for this transaction. Kindly top up.',
+        'You don\'t have enough TRX to cover the transaction fee for this transaction. Kindly top up. Transaction fee: $feeInTrx TRX',
       );
     }
 
diff --git a/lib/view_model/send/send_view_model.dart b/lib/view_model/send/send_view_model.dart
index 2a6bf553b..0d53c59cc 100644
--- a/lib/view_model/send/send_view_model.dart
+++ b/lib/view_model/send/send_view_model.dart
@@ -247,7 +247,7 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
       wallet.type != WalletType.banano &&
       wallet.type != WalletType.solana &&
       wallet.type != WalletType.tron;
-      
+
   @observable
   CryptoCurrency selectedCryptoCurrency;
 
@@ -363,7 +363,8 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
     } catch (e) {
       if (e is LedgerException) {
         final errorCode = e.errorCode.toRadixString(16);
-        final fallbackMsg = e.message.isNotEmpty ? e.message : "Unexpected Ledger Error Code: $errorCode";
+        final fallbackMsg =
+            e.message.isNotEmpty ? e.message : "Unexpected Ledger Error Code: $errorCode";
         final errorMsg = ledgerViewModel.interpretErrorCode(errorCode) ?? fallbackMsg;
 
         state = FailureState(errorMsg);
@@ -444,7 +445,10 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
   Object _credentials() {
     final priority = _settingsStore.priority[wallet.type];
 
-    if (priority == null && wallet.type != WalletType.nano && wallet.type != WalletType.banano && wallet.type != WalletType.solana  &&
+    if (priority == null &&
+        wallet.type != WalletType.nano &&
+        wallet.type != WalletType.banano &&
+        wallet.type != WalletType.solana &&
         wallet.type != WalletType.tron) {
       throw Exception('Priority is null for wallet type: ${wallet.type}');
     }
@@ -570,6 +574,16 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
       return errorMessage;
     }
 
+    if (walletType == WalletType.tron) {
+      if (errorMessage.contains('balance is not sufficient')) {
+        return S.current.do_not_have_enough_gas_asset(currency.toString());
+      }
+
+      if (errorMessage.contains('Transaction expired')) {
+        return 'An error occurred while processing the transaction. Kindly retry the transaction';
+      }
+    }
+
     if (walletType == WalletType.bitcoin ||
         walletType == WalletType.litecoin ||
         walletType == WalletType.bitcoinCash) {