Skip to content

Commit 344c3ce

Browse files
committed
fix: show error toast if setupLdk fails
1 parent 599351f commit 344c3ce

File tree

5 files changed

+37
-7
lines changed

5 files changed

+37
-7
lines changed

src/screens/Settings/DevSettings/LdkDebug.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,14 @@ const LdkDebug = (): ReactElement => {
7676

7777
const onRestartLdk = async (): Promise<void> => {
7878
setRestartingLdk(true);
79-
await setupLdk({ selectedWallet, selectedNetwork });
79+
const res = await setupLdk({ selectedWallet, selectedNetwork });
80+
if (res.isErr()) {
81+
showToast({
82+
type: 'error',
83+
title: t('wallet:ldk_start_error_title'),
84+
description: res.error.message,
85+
});
86+
}
8087
setRestartingLdk(false);
8188
};
8289

src/screens/Settings/RGSServer/index.tsx

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,23 @@ const RGSServer = ({
7474
const connectToRGSServer = async (): Promise<void> => {
7575
setLoading(true);
7676
dispatch(updateSettings({ rapidGossipSyncUrl: rgsUrl }));
77-
await setupLdk({
77+
const res = await setupLdk({
7878
selectedWallet,
7979
selectedNetwork,
8080
});
81-
showToast({
82-
type: 'success',
83-
title: t('rgs.update_success_title'),
84-
description: t('rgs.update_success_description'),
85-
});
81+
if (res.isOk()) {
82+
showToast({
83+
type: 'success',
84+
title: t('rgs.update_success_title'),
85+
description: t('rgs.update_success_description'),
86+
});
87+
} else {
88+
showToast({
89+
type: 'error',
90+
title: t('wallet:ldk_start_error_title'),
91+
description: res.error.message,
92+
});
93+
}
8694
setLoading(false);
8795
};
8896

src/utils/i18n/locales/en/wallet.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -681,6 +681,9 @@
681681
"ldk_sync_error_title": {
682682
"string": "Lightning Sync Error"
683683
},
684+
"ldk_start_error_title": {
685+
"string": "Lightning Startup Error"
686+
},
684687
"receive_insufficient_title": {
685688
"string": "Insufficient receiving balance."
686689
},

src/utils/lightning/index.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -781,6 +781,11 @@ export const refreshLdk = async ({
781781
shouldPreemptivelyStopLdk: false,
782782
});
783783
if (setupResponse.isErr()) {
784+
showToast({
785+
type: 'error',
786+
title: i18n.t('wallet:ldk_start_error_title'),
787+
description: setupResponse.error.message,
788+
});
784789
return handleRefreshError(setupResponse.error.message);
785790
}
786791
keepLdkSynced({ selectedNetwork }).then();

src/utils/startup/index.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import { TWalletName } from '../../store/types/wallet';
2626
import { runChecks } from '../wallet/checks';
2727
import { setupLedger, syncLedger } from '../ledger';
2828
import i18n from '../i18n';
29+
import { showToast } from '../notifications';
2930

3031
/**
3132
* Creates a new wallet from scratch
@@ -153,6 +154,12 @@ export const startWalletServices = async ({
153154
});
154155
if (setupResponse.isOk()) {
155156
keepLdkSynced({ selectedNetwork }).then();
157+
} else {
158+
showToast({
159+
type: 'error',
160+
title: i18n.t('wallet:ldk_start_error_title'),
161+
description: setupResponse.error.message,
162+
});
156163
}
157164
}
158165

0 commit comments

Comments
 (0)