fix: show error toast if setupLdk fails

synonymdev · Nov 22, 2024 · ea55544 · ea55544
1 parent 6610098
commit ea55544
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 7 deletions.
diff --git a/src/screens/Settings/DevSettings/LdkDebug.tsx b/src/screens/Settings/DevSettings/LdkDebug.tsx
@@ -76,7 +76,14 @@ const LdkDebug = (): ReactElement => {
 
 	const onRestartLdk = async (): Promise<void> => {
 		setRestartingLdk(true);
-		await setupLdk({ selectedWallet, selectedNetwork });
+		const res = await setupLdk({ selectedWallet, selectedNetwork });
+		if (res.isErr()) {
+			showToast({
+				type: 'error',
+				title: t('wallet:ldk_start_error_title'),
+				description: res.error.message,
+			});
+		}
 		setRestartingLdk(false);
 	};
 

diff --git a/src/screens/Settings/RGSServer/index.tsx b/src/screens/Settings/RGSServer/index.tsx
@@ -74,15 +74,23 @@ const RGSServer = ({
 	const connectToRGSServer = async (): Promise<void> => {
 		setLoading(true);
 		dispatch(updateSettings({ rapidGossipSyncUrl: rgsUrl }));
-		await setupLdk({
+		const res = await setupLdk({
 			selectedWallet,
 			selectedNetwork,
 		});
-		showToast({
-			type: 'success',
-			title: t('rgs.update_success_title'),
-			description: t('rgs.update_success_description'),
-		});
+		if (res.isOk()) {
+			showToast({
+				type: 'success',
+				title: t('rgs.update_success_title'),
+				description: t('rgs.update_success_description'),
+			});
+		} else {
+			showToast({
+				type: 'error',
+				title: t('wallet:ldk_start_error_title'),
+				description: res.error.message,
+			});
+		}
 		setLoading(false);
 	};
 

diff --git a/src/utils/i18n/locales/en/wallet.json b/src/utils/i18n/locales/en/wallet.json
@@ -681,6 +681,9 @@
 	"ldk_sync_error_title": {
 		"string": "Lightning Sync Error"
 	},
+	"ldk_start_error_title": {
+		"string": "Lightning Startup Error"
+	},
 	"receive_insufficient_title": {
 		"string": "Insufficient receiving balance."
 	},

diff --git a/src/utils/lightning/index.ts b/src/utils/lightning/index.ts
@@ -781,6 +781,11 @@ export const refreshLdk = async ({
 				shouldPreemptivelyStopLdk: false,
 			});
 			if (setupResponse.isErr()) {
+				showToast({
+					type: 'error',
+					title: i18n.t('wallet:ldk_start_error_title'),
+					description: setupResponse.error.message,
+				});
 				return handleRefreshError(setupResponse.error.message);
 			}
 			keepLdkSynced({ selectedNetwork }).then();

diff --git a/src/utils/startup/index.ts b/src/utils/startup/index.ts
@@ -26,6 +26,7 @@ import { TWalletName } from '../../store/types/wallet';
 import { runChecks } from '../wallet/checks';
 import { setupLedger, syncLedger } from '../ledger';
 import i18n from '../i18n';
+import { showToast } from '../notifications';
 
 /**
  * Creates a new wallet from scratch
@@ -153,6 +154,12 @@ export const startWalletServices = async ({
 			});
 			if (setupResponse.isOk()) {
 				keepLdkSynced({ selectedNetwork }).then();
+			} else {
+				showToast({
+					type: 'error',
+					title: i18n.t('wallet:ldk_start_error_title'),
+					description: setupResponse.error.message,
+				});
 			}
 		}