From 072e98c7f4e145a08a0ae6344630e228f7528320 Mon Sep 17 00:00:00 2001 From: Philipp Walter Date: Wed, 26 Mar 2025 09:27:23 +0100 Subject: [PATCH 1/2] fix(restore): skip restore for legacy slashfeed widgets in backup --- src/store/utils/backup.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/store/utils/backup.ts b/src/store/utils/backup.ts index 1413e6c01..48bb3d24f 100644 --- a/src/store/utils/backup.ts +++ b/src/store/utils/backup.ts @@ -359,12 +359,12 @@ const performWidgetsRestore = async (): Promise< const backup = backupRes.value.data; const expectedBackupShape = initialWidgetsState; + // Skip restore if backup contains legacy slashfeed widgets // NOTE: can be removed after all users have updated from 1.0.9 - const hasSlashfeedWidgets = Object.keys(backup.widgets).some((key) => { - return key.includes('slashfeed'); - }); + const hasSlashfeedWidgets = + Object.keys(backup.widgets).some((key) => key.includes('slashfeed')) || + backup.sortOrder.some((key) => key.includes('slashfeed')); - // If the backup has slashfeed widgets, skip the restore. if (hasSlashfeedWidgets) { return ok({ backupExists: false }); } From 16cd780fdd37b9962247755d081dd8693d1b730e Mon Sep 17 00:00:00 2001 From: Philipp Walter Date: Wed, 26 Mar 2025 09:27:49 +0100 Subject: [PATCH 2/2] fix(lightning): add additional closure reasons for claimable balance selector --- src/store/reselect/lightning.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/store/reselect/lightning.ts b/src/store/reselect/lightning.ts index 62b1adaaf..7a41f6a2a 100644 --- a/src/store/reselect/lightning.ts +++ b/src/store/reselect/lightning.ts @@ -166,8 +166,9 @@ export const claimableBalanceSelector = createSelector( return ( channel.closureReason && [ - EChannelClosureReason.HolderForceClosed, EChannelClosureReason.CounterpartyForceClosed, + EChannelClosureReason.ProcessingError, + EChannelClosureReason.HolderForceClosed, ].includes(channel.closureReason) ); });