fix: 🐛 Bugs fixing

archethic-foundation · Oct 8, 2024 · 49b5a4b · 49b5a4b
1 parent 8ccee56
commit 49b5a4b
Show file tree

Hide file tree

Showing 17 changed files with 307 additions and 276 deletions.
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
@@ -712,5 +712,6 @@
     "earnHeaderStartEarningBtn": "Start earning",
     "earnHeaderAddLiquidityTxt": "To get LP token you have to provide liquidity here :",
     "liquidityAddDesc": "Add liquidity to the pool and receive LP Tokens representing your share",
-    "keychainAddressCopied": "Keychain address copied"
+    "keychainAddressCopied": "Keychain address copied",
+    "farmLockTokensSummaryMoreInfo": "More info"
 }
diff --git a/lib/l10n/intl_fr.arb b/lib/l10n/intl_fr.arb
@@ -692,5 +692,6 @@
     "keychainAddressCopied": "Adresse de la keychain copiée",
     "withdrawFarmLockDone": "Retrait complété avec succès",
     "claimFarmLockDone": "Réclamation complétée avec succès",
-    "levelUpFarmLockDone": "Montée de niveau complétée avec succès"
+    "levelUpFarmLockDone": "Montée de niveau complétée avec succès",
+    "farmLockTokensSummaryMoreInfo": "Plus d'infos"
 }
diff --git a/lib/ui/views/aeswap_earn/bloc/provider.dart b/lib/ui/views/aeswap_earn/bloc/provider.dart
@@ -49,9 +49,9 @@ FarmLockFormBalances farmLockFormBalances(
 }
 
 @riverpod
-FarmLockFormSummary farmLockFormSummary(
+Future<FarmLockFormSummary> farmLockFormSummary(
   FarmLockFormSummaryRef ref,
-) {
+) async {
   final farmLock = ref.watch(farmLockFormFarmLockProvider).value;
 
   if (farmLock == null) return const FarmLockFormSummary();
@@ -66,26 +66,28 @@ FarmLockFormSummary farmLockFormSummary(
     rewardsEarned = rewardsEarned + userInfos.rewardAmount;
   });
 
-  farmedTokensCapitalInFiat = ref
-          .watch(
-            DexTokensProviders.estimateLPTokenInFiat(
-              farmLock.lpTokenPair!.token1.address,
-              farmLock.lpTokenPair!.token2.address,
-              capitalInvested,
-              farmLock.poolAddress,
-            ),
-          )
-          .value ??
-      0;
-
-  price = ref
-          .watch(
-            DexTokensProviders.estimateTokenInFiat(
-              farmLock.rewardToken!.address,
-            ),
-          )
-          .value ??
-      0;
+  final farmedTokensCapitalInFiatFuture = ref.watch(
+    DexTokensProviders.estimateLPTokenInFiat(
+      farmLock.lpTokenPair!.token1.address,
+      farmLock.lpTokenPair!.token2.address,
+      capitalInvested,
+      farmLock.poolAddress,
+    ).future,
+  );
+
+  final priceFuture = ref.watch(
+    DexTokensProviders.estimateTokenInFiat(
+      farmLock.rewardToken!.address,
+    ).future,
+  );
+
+  final results = await Future.wait([
+    farmedTokensCapitalInFiatFuture,
+    priceFuture,
+  ]);
+
+  farmedTokensCapitalInFiat = results[0];
+  price = results[1];
 
   return FarmLockFormSummary(
     farmedTokensCapital: capitalInvested,

diff --git a/lib/ui/views/aeswap_earn/bloc/provider.g.dart b/lib/ui/views/aeswap_earn/bloc/provider.g.dart
diff --git a/lib/ui/views/aeswap_earn/layouts/components/earn_farm_lock_list_locks.dart b/lib/ui/views/aeswap_earn/layouts/components/earn_farm_lock_list_locks.dart