Revert "[SUPPORT] remove unnecessary check on tx networkInfo (#4020)"

This reverts commit 37c4e84.
LedgerHQ · Jul 17, 2023 · 364cfaf · 364cfaf
1 parent 37c4e84
commit 364cfaf
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/.changeset/thirty-pumas-sleep.md b/.changeset/thirty-pumas-sleep.md
diff --git a/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FeesDrawer/index.tsx b/apps/ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FeesDrawer/index.tsx
@@ -52,7 +52,7 @@ export default function FeesDrawer({
       />
       <DrawerTitle i18nKey="swap2.form.details.label.fees" />
       <Box mt={3} flow={4} mx={3}>
-        {transaction && mainAccount && (
+        {transaction && "networkInfo" in transaction && transaction.networkInfo && mainAccount && (
           <SendAmountFields
             account={mainAccount as Account}
             parentAccount={parentAccount}

diff --git a/.../ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSummary/SectionFees.tsx b/.../ledger-live-desktop/src/renderer/screens/exchange/Swap2/Form/FormSummary/SectionFees.tsx
@@ -78,7 +78,14 @@ const SectionFees = ({
   const family = mainFromAccount?.currency.family;
   const sendAmountSpecific = account && family && getLLDCoinFamily(family)?.sendAmountFields;
   const canEdit =
-    hasRates && showSummaryValue && transaction && account && family && sendAmountSpecific;
+    hasRates &&
+    showSummaryValue &&
+    transaction &&
+    "networkInfo" in transaction &&
+    transaction.networkInfo &&
+    account &&
+    family &&
+    sendAmountSpecific;
   const swapDefaultTrack = useGetSwapTrackingProperties();
   const StrategyIcon = useMemo(
     () =>

diff --git a/apps/ledger-live-mobile/src/components/SendRowsFee.tsx b/apps/ledger-live-mobile/src/components/SendRowsFee.tsx
@@ -2,6 +2,7 @@ import React from "react";
 import type { Account, AccountLike } from "@ledgerhq/types-live";
 import { getMainAccount } from "@ledgerhq/live-common/account/index";
 import type { Transaction, TransactionStatus } from "@ledgerhq/live-common/generated/types";
+import type { Transaction as BitcoinTransaction } from "@ledgerhq/live-common/families/bitcoin/types";
 import { CompositeScreenProps } from "@react-navigation/native";
 
 import perFamily from "../generated/SendRowsFee";
@@ -39,7 +40,8 @@ export default ({
   // eslint-disable-next-line no-prototype-builtins
   if (perFamily.hasOwnProperty(mainAccount.currency.family)) {
     const C = perFamily[mainAccount.currency.family as keyof typeof perFamily];
-    return (
+    // FIXME: looks like a hack, need to find how to handle networkInfo properly
+    return (transaction as BitcoinTransaction)?.networkInfo ? (
       <C
         {...props}
         setTransaction={setTransaction}
@@ -49,7 +51,7 @@ export default ({
         navigation={navigation}
         route={route}
       />
-    );
+    ) : null;
   }
 
   return null;

diff --git a/libs/ledger-live-common/src/families/solana/js-prepareTransaction.ts b/libs/ledger-live-common/src/families/solana/js-prepareTransaction.ts
@@ -110,6 +110,9 @@ const prepareTransaction = async (
     model,
   };
 
+  // LLM requires this field to be truthy to show fees
+  (patch as any).networkInfo = true;
+
   return defaultUpdateTransaction(tx, patch);
 };