Merge pull request #1231 from rainlanguage/02/04/25-select-tokens-err…

…or-message-from-rust
rainlanguage · Feb 6, 2025 · 8cdaa81 · 8cdaa81
2 parents e65e965 + 8dafc4f
commit 8cdaa81
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/packages/ui-components/src/__tests__/SelectToken.test.ts b/packages/ui-components/src/__tests__/SelectToken.test.ts
@@ -55,15 +55,15 @@ describe('SelectToken', () => {
 			saveSelectToken: vi.fn().mockRejectedValue(new Error('Invalid address'))
 		} as unknown as DotrainOrderGui;
 
-		const { getByRole, findByText } = render(SelectToken, {
+		const screen = render(SelectToken, {
 			...mockProps,
 			gui: mockGuiWithError
 		});
 
-		const input = getByRole('textbox');
+		const input = screen.getByRole('textbox');
 		await user.type(input, 'invalid');
 		await waitFor(() => {
-			expect(findByText('Invalid token address.')).resolves.toBeInTheDocument();
+			expect(screen.getByTestId('error')).toBeInTheDocument();
 		});
 	});
 

diff --git a/packages/ui-components/src/lib/components/deployment/SelectToken.svelte b/packages/ui-components/src/lib/components/deployment/SelectToken.svelte
@@ -49,8 +49,9 @@
 					await gui.saveSelectToken(tokenKey, currentTarget.value);
 				}
 				await getInfoForSelectedToken();
-			} catch {
-				error = 'Invalid token address.';
+			} catch (e) {
+				const errorMessage = (e as Error).message ? (e as Error).message : 'Invalid token address.';
+				error = errorMessage;
 			}
 		}
 		checking = false;
@@ -73,7 +74,7 @@
 					<span>{tokenInfo.name}</span>
 				</div>
 			{:else if error}
-				<div class="flex h-5 flex-row items-center gap-2">
+				<div class="flex h-5 flex-row items-center gap-2" data-testid="error">
 					<CloseCircleSolid class="h-5 w-5" color="red" />
 					<span>{error}</span>
 				</div>

diff --git a/packages/ui-components/src/lib/components/deployment/TokenInputOrOutput.svelte b/packages/ui-components/src/lib/components/deployment/TokenInputOrOutput.svelte
@@ -15,8 +15,11 @@
 		if (!vault.token?.key) return;
 		try {
 			tokenInfo = await gui.getTokenInfo(vault.token?.key);
-		} catch {
-			error = 'Error getting token info';
+		} catch (e) {
+			const errorMessage = (e as Error).message
+				? (e as Error).message
+				: 'Error getting token info.';
+			error = errorMessage;
 		}
 	};