Skip to content

Commit

Permalink
Merge branch 'main' into qr-modal
Browse files Browse the repository at this point in the history
  • Loading branch information
secondl1ght authored Sep 6, 2024
2 parents 41f1f1d + ee623d6 commit 266f59e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/views/dashboard/RecentContacts.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export const RecentContacts: FC<{ id: string }> = ({ id }) => {

<div className="hide-scroll flex w-full max-w-[calc(100vw-32px)] space-x-4 overflow-x-auto">
{loading ? (
Array.from({ length: 3 }).map((_, i) => (
Array.from({ length: 5 }).map((_, i) => (
<div key={i} className="space-y-2">
<div className="mx-auto h-14 w-14 animate-pulse rounded-full bg-primary" />
<p className="h-5 w-24 animate-pulse rounded-full bg-slate-600 dark:bg-neutral-400" />
Expand Down
8 changes: 6 additions & 2 deletions src/views/wallet/WalletInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -284,9 +284,13 @@ export const WalletInfo: FC<{
/>

<div className="mb-3 flex w-full justify-between space-x-2">
<p className="z-10 font-semibold text-slate-600 dark:text-neutral-400 lg:text-xl">
<button
onClick={() => setView('assets')}
disabled={refreshLoading}
className="z-10 h-fit font-semibold text-primary transition-colors hover:text-primary-hover"
>
{data?.wallets.find_one.name}
</p>
</button>

<div className="flex space-x-2">
<IconButton
Expand Down

0 comments on commit 266f59e

Please sign in to comment.