Resolve merge conflicts

dusk-network · Aug 31, 2024 · 1294a97 · 1294a97
1 parent e5e7481
commit 1294a97
Show file tree

Hide file tree

Showing 5 changed files with 252 additions and 158 deletions.
diff --git a/web-wallet/src/routes/(app)/dashboard/+page.svelte b/web-wallet/src/routes/(app)/dashboard/+page.svelte
@@ -76,7 +76,7 @@
   items={walletStore.getTransactionsHistory()}
   {language}
   limit={dashboardTransactionLimit}
-  isSyncing{syncStatus.isInProgress}
+  isSyncing={syncStatus.isInProgress}
   syncError={syncStatus.error}
 />