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) ); }); 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 }); }