From 48d701e1eaed0294dcb69e51d142cfd8dede5f09 Mon Sep 17 00:00:00 2001
From: Evan Kaloudis <zeusln@tutanota.com>
Date: Fri, 25 Oct 2024 15:38:15 -0400
Subject: [PATCH 1/3] Channel: Fee Breakdown: hide inbound fees when undefined

---
 components/FeeBreakdown.tsx | 62 ++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/components/FeeBreakdown.tsx b/components/FeeBreakdown.tsx
index b97ecf7f7..772250fa5 100644
--- a/components/FeeBreakdown.tsx
+++ b/components/FeeBreakdown.tsx
@@ -149,37 +149,37 @@ export default class FeeBreakdown extends React.Component<
                         />
                         {BackendUtils.supportInboundFees() && (
                             <>
-                                <KeyValue
-                                    keyValue={localeString(
-                                        'views.Channel.inboundBaseFee'
-                                    )}
-                                    value={
-                                        <Amount
-                                            sats={
-                                                localPolicy.inbound_fee_base_msat
-                                                    ? Number(
-                                                          localPolicy.inbound_fee_base_msat
-                                                      ) / 1000
-                                                    : undefined
-                                            }
-                                            toggleable
-                                            sensitive
-                                        />
-                                    }
-                                />
-                                <KeyValue
-                                    keyValue={localeString(
-                                        'views.Channel.inboundFeeRate'
-                                    )}
-                                    value={`${
-                                        localPolicy.inbound_fee_rate_milli_msat
-                                            ? Number(
-                                                  localPolicy.inbound_fee_rate_milli_msat
-                                              ) / 10000
-                                            : undefined
-                                    }%`}
-                                    sensitive
-                                />
+                                {!!localPolicy.inbound_fee_base_msat && (
+                                    <KeyValue
+                                        keyValue={localeString(
+                                            'views.Channel.inboundBaseFee'
+                                        )}
+                                        value={
+                                            <Amount
+                                                sats={
+                                                    Number(
+                                                        localPolicy.inbound_fee_base_msat
+                                                    ) / 1000
+                                                }
+                                                toggleable
+                                                sensitive
+                                            />
+                                        }
+                                    />
+                                )}
+                                {!!localPolicy.inbound_fee_rate_milli_msat && (
+                                    <KeyValue
+                                        keyValue={localeString(
+                                            'views.Channel.inboundFeeRate'
+                                        )}
+                                        value={`${
+                                            Number(
+                                                localPolicy.inbound_fee_rate_milli_msat
+                                            ) / 10000
+                                        }%`}
+                                        sensitive
+                                    />
+                                )}
                             </>
                         )}
                     </React.Fragment>

From 05dbee0f31a2113b480c58a38f34ba1ba0da007e Mon Sep 17 00:00:00 2001
From: Evan Kaloudis <zeusln@tutanota.com>
Date: Fri, 25 Oct 2024 15:44:14 -0400
Subject: [PATCH 2/3] Channel: Fee Breakdown: add Remote Inbound fees

---
 components/FeeBreakdown.tsx | 35 +++++++++++++++++++++++++++++++++--
 locales/en.json             |  6 ++++--
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/components/FeeBreakdown.tsx b/components/FeeBreakdown.tsx
index 772250fa5..243786836 100644
--- a/components/FeeBreakdown.tsx
+++ b/components/FeeBreakdown.tsx
@@ -152,7 +152,7 @@ export default class FeeBreakdown extends React.Component<
                                 {!!localPolicy.inbound_fee_base_msat && (
                                     <KeyValue
                                         keyValue={localeString(
-                                            'views.Channel.inboundBaseFee'
+                                            'views.Channel.localInboundBaseFee'
                                         )}
                                         value={
                                             <Amount
@@ -170,7 +170,7 @@ export default class FeeBreakdown extends React.Component<
                                 {!!localPolicy.inbound_fee_rate_milli_msat && (
                                     <KeyValue
                                         keyValue={localeString(
-                                            'views.Channel.inboundFeeRate'
+                                            'views.Channel.localInboundFeeRate'
                                         )}
                                         value={`${
                                             Number(
@@ -180,6 +180,37 @@ export default class FeeBreakdown extends React.Component<
                                         sensitive
                                     />
                                 )}
+                                {!!remotePolicy.inbound_fee_base_msat && (
+                                    <KeyValue
+                                        keyValue={localeString(
+                                            'views.Channel.remoteInboundBaseFee'
+                                        )}
+                                        value={
+                                            <Amount
+                                                sats={
+                                                    Number(
+                                                        remotePolicy.inbound_fee_base_msat
+                                                    ) / 1000
+                                                }
+                                                toggleable
+                                                sensitive
+                                            />
+                                        }
+                                    />
+                                )}
+                                {!!remotePolicy.inbound_fee_rate_milli_msat && (
+                                    <KeyValue
+                                        keyValue={localeString(
+                                            'views.Channel.remoteInboundFeeRate'
+                                        )}
+                                        value={`${
+                                            Number(
+                                                remotePolicy.inbound_fee_rate_milli_msat
+                                            ) / 10000
+                                        }%`}
+                                        sensitive
+                                    />
+                                )}
                             </>
                         )}
                     </React.Fragment>
diff --git a/locales/en.json b/locales/en.json
index 41067b6bf..7c3618172 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -359,8 +359,10 @@
     "views.Channel.remoteFeeRate": "Remote Fee Rate",
     "views.Channel.remoteBaseFee": "Remote Base Fee",
     "views.Channel.inbound": "Inbound",
-    "views.Channel.inboundBaseFee": "Inbound Base Fee",
-    "views.Channel.inboundFeeRate": "Inbound Fee Rate",
+    "views.Channel.localInboundBaseFee": "Local Inbound Base Fee",
+    "views.Channel.localInboundFeeRate": "Local Inbound Fee Rate",
+    "views.Channel.remoteInboundBaseFee": "Remote Inbound Base Fee",
+    "views.Channel.remoteInboundFeeRate": "Remote Inbound Fee Rate",
     "views.Channel.feeRate": "Fee Rate",
     "views.Channel.channelPayments": "Channel Payments",
     "views.Channel.localMin": "Local Min",

From 1b62419934d01b9afefc6ec0933637acf182a856 Mon Sep 17 00:00:00 2001
From: Evan Kaloudis <zeusln@tutanota.com>
Date: Fri, 25 Oct 2024 16:00:13 -0400
Subject: [PATCH 3/3] SetFeesForm: update Inbound fee labels

---
 components/SetFeesForm.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/SetFeesForm.tsx b/components/SetFeesForm.tsx
index 7c2d32e06..07e264998 100644
--- a/components/SetFeesForm.tsx
+++ b/components/SetFeesForm.tsx
@@ -182,9 +182,9 @@ export default class SetFeesForm extends React.Component<
                             }}
                         >
                             {`${localeString(
-                                'components.SetFeesForm.baseFee'
-                            )} ${localeString(
                                 'views.Channel.inbound'
+                            )} ${localeString(
+                                'components.SetFeesForm.baseFee'
                             )} (${localeString('general.sats')})`}
                         </Text>
                         <TextInput
@@ -207,9 +207,9 @@ export default class SetFeesForm extends React.Component<
                             }}
                         >
                             {`${localeString(
-                                'components.SetFeesForm.feeRate'
-                            )} ${localeString(
                                 'views.Channel.inbound'
+                            )} ${localeString(
+                                'components.SetFeesForm.feeRate'
                             )} (${localeString('general.percentage')})`}
                         </Text>
                         <TextInput