Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: add border when no load more button is shown #764

Merged
merged 8 commits into from
Oct 24, 2024
Merged

refactor: add border when no load more button is shown #764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
893331b
refactor: add border when no load more button is shown
patricio0312rev Oct 23, 2024
1a04308
chore: update snapshots
patricio0312rev Oct 23, 2024
404e801
Merge branch 'rc-1.17.0' into refactor/border-bottom-on-no-load-more-…
ItsANameToo Oct 24, 2024
52874ca
Merge branch 'rc-1.17.0' into refactor/border-bottom-on-no-load-more-…
ItsANameToo Oct 24, 2024
aa972ba
wip
ItsANameToo Oct 24, 2024
15452d8
wip
ItsANameToo Oct 24, 2024
3d81b11
Merge branch 'rc-1.17.0' into refactor/border-bottom-on-no-load-more-…
ItsANameToo Oct 24, 2024
26d9ac8
wip
ItsANameToo Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../components/DelegateRegistrationForm/__snapshots__/DelegateRegistrationForm.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ exports[`DelegateRegistrationForm > should render review step 1`] = `
class="flex items-center justify-between space-x-2 sm:justify-start sm:space-x-0"
>
<div
class="no-ligatures flex-shrink-0 text-sm font-semibold leading-[17px] text-theme-secondary-700 dark:text-theme-secondary-500 sm:text-base sm:leading-5 w-auto sm:min-w-28"
class="no-ligatures flex-shrink-0 text-sm font-semibold leading-[17px] text-theme-secondary-700 dark:text-theme-secondary-500 sm:text-base sm:leading-5 w-auto sm:min-w-32"
>
From
</div>
Expand Down
14 changes: 7 additions & 7 deletions src/domains/transaction/components/Transactions/Transactions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import { Contracts, DTO } from "@ardenthq/sdk-profiles";
import React, { memo, useCallback, useEffect, useMemo, useState } from "react";
import { Tab, TabList, Tabs } from "@/app/components/Tabs";
import { Trans, useTranslation } from "react-i18next";

import { Button } from "@/app/components/Button";
import { Dropdown } from "@/app/components/Dropdown";
import { EmptyBlock } from "@/app/components/EmptyBlock";
import { Tab, TabList, Tabs } from "@/app/components/Tabs";
import { FilterTransactions } from "@/domains/transaction/components/FilterTransactions";
import { TransactionDetailModal } from "@/domains/transaction/components/TransactionDetailModal";
import { TransactionTable } from "@/domains/transaction/components/TransactionTable";
import { useProfileTransactions } from "@/domains/transaction/hooks/use-profile-transactions";
import { Dropdown } from "@/app/components/Dropdown";
import { TabId } from "@/app/components/Tabs/useTab";
import { Icon } from "@/app/components/Icon";
import { TabId } from "@/app/components/Tabs/useTab";
import { TableWrapper } from "@/app/components/Table/TableWrapper";
import { TransactionDetailModal } from "@/domains/transaction/components/TransactionDetailModal";
import { TransactionTable } from "@/domains/transaction/components/TransactionTable";
import cn from "classnames";
import { useProfileTransactions } from "@/domains/transaction/hooks/use-profile-transactions";

interface TransactionsProperties {
emptyText?: string;
Expand Down Expand Up @@ -209,7 +209,7 @@ export const Transactions = memo(function Transactions({
)}
</>
) : (
<TableWrapper className={cn("border-none", { "!rounded-b-none": hasMore })}>
<TableWrapper className={cn({ "!rounded-b-none border-none": hasMore })}>
<div className="flex w-full flex-col items-start justify-between gap-3 border-b-0 border-b-theme-secondary-300 pb-4 pt-3 dark:border-b-theme-secondary-800 sm:flex-row md:items-center md:border-b md:px-6 md:py-4">
<span className="text-base font-semibold leading-5 text-theme-secondary-700 dark:text-theme-secondary-500">
{t("COMMON.SHOWING_RESULTS", { count: transactions.length })}
Expand Down
6 changes: 3 additions & 3 deletions src/domains/transaction/components/Transactions/__snapshots__/Transactions.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ exports[`Transactions > should fetch more transactions 1`] = `
</div>
</div>
<div
class="rounded-xl border-transparent pb-2 outline outline-1 outline-transparent md:border-b-[5px] md:border-b-theme-secondary-200 md:outline-theme-secondary-300 dark:md:border-theme-secondary-800 dark:md:outline-theme-secondary-800 border-none !rounded-b-none"
class="rounded-xl border-transparent pb-2 outline outline-1 outline-transparent md:border-b-[5px] md:border-b-theme-secondary-200 md:outline-theme-secondary-300 dark:md:border-theme-secondary-800 dark:md:outline-theme-secondary-800 !rounded-b-none border-none"
data-testid="TableWrapper"
>
<div
Expand Down Expand Up @@ -10360,7 +10360,7 @@ exports[`Transactions > should hide view more button when there are no next page
</div>
</div>
<div
class="rounded-xl border-transparent pb-2 outline outline-1 outline-transparent md:border-b-[5px] md:border-b-theme-secondary-200 md:outline-theme-secondary-300 dark:md:border-theme-secondary-800 dark:md:outline-theme-secondary-800 border-none !rounded-b-none"
class="rounded-xl border-transparent pb-2 outline outline-1 outline-transparent md:border-b-[5px] md:border-b-theme-secondary-200 md:outline-theme-secondary-300 dark:md:border-theme-secondary-800 dark:md:outline-theme-secondary-800 !rounded-b-none border-none"
data-testid="TableWrapper"
>
<div
Expand Down Expand Up @@ -15691,7 +15691,7 @@ exports[`Transactions > should open detail modal on transaction row click 1`] =
</div>
</div>
<div
class="rounded-xl border-transparent pb-2 outline outline-1 outline-transparent md:border-b-[5px] md:border-b-theme-secondary-200 md:outline-theme-secondary-300 dark:md:border-theme-secondary-800 dark:md:outline-theme-secondary-800 border-none !rounded-b-none"
class="rounded-xl border-transparent pb-2 outline outline-1 outline-transparent md:border-b-[5px] md:border-b-theme-secondary-200 md:outline-theme-secondary-300 dark:md:border-theme-secondary-800 dark:md:outline-theme-secondary-800 !rounded-b-none border-none"
data-testid="TableWrapper"
>
<div
Expand Down
Loading