Merge pull request #1347 from kaloudis/forwarding-history-fix

Routing: Forwarding history fixes
ZeusLN · Mar 3, 2023 · aab4a6e · aab4a6e
2 parents 9b1aac3 + f9c8d5c
commit aab4a6e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/stores/FeeStore.ts b/stores/FeeStore.ts
@@ -14,6 +14,7 @@ export default class FeeStore {
     @observable public dataFrame: any = {};
     @observable public recommendedFees: any = {};
     @observable public loading = false;
+    @observable public loadingFees = false;
     @observable public error = false;
     @observable public setFeesError = false;
     @observable public setFeesErrorMsg: string;
@@ -64,12 +65,12 @@ export default class FeeStore {
 
     resetFees = () => {
         this.fees = {};
-        this.loading = false;
+        this.loadingFees = false;
     };
 
     @action
     public getFees = () => {
-        this.loading = true;
+        this.loadingFees = true;
         BackendUtils.getFees()
             .then((data: any) => {
                 if (data.channel_fees) {
@@ -87,7 +88,7 @@ export default class FeeStore {
                 // Deprecated in LND
                 // Used in c-lightning-REST
                 this.totalEarned = data.total_fee_sum || 0;
-                this.loading = false;
+                this.loadingFees = false;
             })
             .catch((err: any) => {
                 console.log('error getting fee report', err);

diff --git a/views/Routing/Routing.tsx b/views/Routing/Routing.tsx
@@ -50,7 +50,7 @@ export default class Routing extends React.PureComponent<
         const { FeeStore } = this.props;
         FeeStore.getFees();
         if (BackendUtils.isLNDBased()) {
-            FeeStore.getForwardingHistory();
+            FeeStore.getForwardingHistory(HOURS[0]);
         }
     }
 
@@ -85,10 +85,11 @@ export default class Routing extends React.PureComponent<
             earnedDuringTimeframe,
             forwardingEvents,
             forwardingHistoryError,
-            getForwardingHistory,
-            loading
+            getForwardingHistory
         } = FeeStore;
 
+        const loading = FeeStore.loading || FeeStore.loadingFees;
+
         const headerString =
             forwardingEvents.length > 0
                 ? `${localeString('general.routing')} (${

diff --git a/views/Wallet/Wallet.tsx b/views/Wallet/Wallet.tsx
@@ -30,7 +30,6 @@ import { themeColor } from './../../utils/ThemeUtils';
 
 import BalanceStore from './../../stores/BalanceStore';
 import ChannelsStore from './../../stores/ChannelsStore';
-import FeeStore from './../../stores/FeeStore';
 
 import FiatStore from './../../stores/FiatStore';
 import NodeInfoStore from './../../stores/NodeInfoStore';
@@ -56,7 +55,6 @@ interface WalletProps {
     navigation: any;
     BalanceStore: BalanceStore;
     ChannelsStore: ChannelsStore;
-    FeeStore: FeeStore;
     NodeInfoStore: NodeInfoStore;
     SettingsStore: SettingsStore;
     UnitsStore: UnitsStore;
@@ -74,7 +72,6 @@ interface WalletState {
     'BalanceStore',
     'ChannelsStore',
     'NodeInfoStore',
-    'FeeStore',
     'SettingsStore',
     'UnitsStore',
     'FiatStore',
@@ -216,7 +213,6 @@ export default class Wallet extends React.Component<WalletProps, WalletState> {
             NodeInfoStore,
             BalanceStore,
             ChannelsStore,
-            FeeStore,
             UTXOsStore,
             SettingsStore,
             PosStore,
@@ -258,9 +254,6 @@ export default class Wallet extends React.Component<WalletProps, WalletState> {
                 await BalanceStore.getCombinedBalance();
                 if (BackendUtils.supportsChannelManagement())
                     ChannelsStore.getChannels();
-                if (BackendUtils.supportsRouting()) FeeStore.getFees();
-                if (BackendUtils.supportsRouting())
-                    FeeStore.getForwardingHistory();
             }
         } else {
             NodeInfoStore.getNodeInfo();
@@ -270,11 +263,6 @@ export default class Wallet extends React.Component<WalletProps, WalletState> {
 
             await BalanceStore.getCombinedBalance();
             ChannelsStore.getChannels();
-            FeeStore.getFees();
-        }
-
-        if (implementation === 'lnd') {
-            FeeStore.getForwardingHistory();
         }
 
         if (connecting) {