tsc: fix stores

ZeusLN · Oct 3, 2024 · bae14c1 · bae14c1
1 parent 6dd2a9b
commit bae14c1
Show file tree

Hide file tree

Showing 11 changed files with 1,840 additions and 18 deletions.
diff --git a/models/OpenChannelRequest.ts b/models/OpenChannelRequest.ts
@@ -20,7 +20,7 @@ export default class OpenChannelRequest extends BaseModel {
     public private?: boolean;
     public min_htlc_msat?: string;
     public local_funding_amount: string;
-    public host: string;
+    public host?: string;
     public id?: string;
     public satoshis?: string;
     public utxos?: string[];

diff --git a/stores/ActivityStore.ts b/stores/ActivityStore.ts
@@ -212,7 +212,7 @@ export default class ActivityStore {
     }
 
     @action
-    public setFilters = async (filters: Filter, locale: string | undefined) => {
+    public setFilters = async (filters: Filter, locale?: string) => {
         this.loading = true;
         this.filters = filters;
         this.filteredActivity = ActivityFilterUtils.filterActivities(

diff --git a/stores/AlertStore.ts b/stores/AlertStore.ts
@@ -1,4 +1,5 @@
 import { action, reaction, observable } from 'mobx';
+// @ts-ignore:next-line
 import Ping from 'react-native-ping';
 
 import SettingsStore from './SettingsStore';

diff --git a/stores/BalanceStore.ts b/stores/BalanceStore.ts
@@ -25,8 +25,8 @@ export default class BalanceStore {
             () => this.settingsStore.settings,
             () => {
                 if (this.settingsStore.hasCredentials()) {
-                    this.getBlockchainBalance();
-                    this.getLightningBalance();
+                    this.getBlockchainBalance(false, false);
+                    this.getLightningBalance(false);
                 }
             }
         );
@@ -147,8 +147,8 @@ export default class BalanceStore {
     @action
     public getCombinedBalance = async (reset: boolean = false) => {
         if (reset) this.reset();
-        const lightning = await this.getLightningBalance();
-        const onChain = await this.getBlockchainBalance();
+        const lightning = await this.getLightningBalance(false);
+        const onChain = await this.getBlockchainBalance(false, false);
 
         // LN
         this.pendingOpenBalance =

diff --git a/stores/ChannelBackupStore.ts b/stores/ChannelBackupStore.ts
@@ -325,7 +325,8 @@ export default class ChannelBackupStore {
         if (time) {
             const ONE_HOUR = 60 * 60 * 1000; /* ms */
             const THREE_DAYS = 36 * ONE_HOUR;
-            const olderThanThreeDays = new Date() - new Date(time) > THREE_DAYS;
+            const olderThanThreeDays =
+                Number(new Date()) - Number(new Date(time)) > THREE_DAYS;
             if (olderThanThreeDays) this.backupChannels();
         }
         if (!time && !status) this.backupChannels();

diff --git a/stores/ChannelsStore.ts b/stores/ChannelsStore.ts
@@ -23,12 +23,12 @@ interface ChannelInfoIndex {
 
 interface PendingHTLC {
     incoming: boolean;
-    amount: number;
+    amount: number | string;
     hash_lock: string;
     expiration_height: number;
-    htlc_index: number;
-    forwarding_channel: number;
-    forwarding_htlc_index: number;
+    htlc_index?: number;
+    forwarding_channel?: number;
+    forwarding_htlc_index?: number;
 }
 
 export enum ChannelsType {
@@ -303,8 +303,8 @@ export default class ChannelsStore {
     enrichChannels = async (
         channels: Array<Channel>,
         setPendingHtlcs?: boolean
-    ) => {
-        if (channels.length === 0) return;
+    ): Promise<Channel[]> => {
+        if (channels.length === 0) return [];
 
         const channelsWithMissingAliases = channels?.filter(
             (c) => c.channelId != null && this.aliasesById[c.channelId] == null
@@ -498,7 +498,7 @@ export default class ChannelsStore {
         ) {
             // c-lightning, eclair
             urlParams = [channelId, forceClose];
-        } else {
+        } else if (channelPoint) {
             // lnd
             const { funding_txid_str, output_index } = channelPoint;
 

diff --git a/stores/LightningAddressStore.ts b/stores/LightningAddressStore.ts
@@ -761,7 +761,7 @@ export default class LightningAddressStore {
                         }
                     ]);
 
-                    events.map((event) => {
+                    events.map((event: any) => {
                         attestationEvents[event.id] = event;
                     });
 
@@ -937,13 +937,15 @@ export default class LightningAddressStore {
                 const title = 'ZEUS Pay payment received!';
                 const body = `Payment of ${value_commas} sats automatically accepted`;
                 if (Platform.OS === 'android') {
+                    // @ts-ignore:next-line
                     Notifications.postLocalNotification({
                         title,
                         body
                     });
                 }
 
                 if (Platform.OS === 'ios') {
+                    // @ts-ignore:next-line
                     Notifications.postLocalNotification({
                         title,
                         body,

diff --git a/stores/LnurlPayStore.ts b/stores/LnurlPayStore.ts
@@ -6,8 +6,11 @@ import { hexToBytes } from '@noble/hashes/utils';
 import hashjs from 'hash.js';
 import {
     nip19,
+    // @ts-ignore:next-line
     finishEvent,
+    // @ts-ignore:next-line
     generatePrivateKey,
+    // @ts-ignore:next-line
     getPublicKey,
     // @ts-ignore:next-line
     relayInit

diff --git a/stores/TransactionsStore.ts b/stores/TransactionsStore.ts
@@ -529,7 +529,9 @@ export default class TransactionsStore {
             this.payment_error =
                 (implementation === 'embedded-lnd'
                     ? errorToUserFriendly(
-                          lnrpc.PaymentFailureReason[result.failure_reason]
+                          new Error(
+                              lnrpc.PaymentFailureReason[result.failure_reason]
+                          )
                       )
                     : errorToUserFriendly(result.failure_reason)) ||
                 errorToUserFriendly(result.payment_error);

diff --git a/stores/UnitsStore.ts b/stores/UnitsStore.ts
@@ -20,7 +20,7 @@ interface ValueDisplayProps {
     plural?: boolean;
     rtl?: boolean;
     space?: boolean;
-    error?: boolean;
+    error?: string;
 }
 
 export default class UnitsStore {
@@ -118,6 +118,8 @@ export default class UnitsStore {
 
                 if (!fiatEntry?.rate) {
                     return {
+                        amount: 'Disabled',
+                        unit: 'fiat',
                         error: 'Rate for selected currency not available'
                     };
                 }
@@ -142,7 +144,11 @@ export default class UnitsStore {
                     space
                 };
             } else {
-                return { error: 'Error fetching fiat rates' };
+                return {
+                    amount: 'Disabled',
+                    unit: 'fiat',
+                    error: 'Error fetching fiat rates'
+                };
             }
         }
     };