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

Fix: Button with icon bug #4194

Merged
merged 1 commit into from
Jan 29, 2025
Merged

Fix: Button with icon bug #4194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions src/components/frame/v5/pages/FundsPage/partials/FundsTable/FundsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { IncomingFundsLoadingContextProvider } from '~frame/v5/pages/FundsPage/c
import { useMobile } from '~hooks';
import useColonyFundsClaims from '~hooks/useColonyFundsClaims.ts';
import { formatText } from '~utils/intl.ts';
import { formatMessage } from '~utils/yup/tests/helpers.ts';
import EmptyContent from '~v5/common/EmptyContent/index.ts';
import { Table } from '~v5/common/Table/Table.tsx';
import TableHeader from '~v5/common/TableHeader/TableHeader.tsx';
Expand Down Expand Up @@ -78,6 +79,7 @@ const FundsTable: FC = () => {
unclaimedClaims={allUnclaimedClaims}
isButtonDisabled={!searchedTokens.length}
shouldShowButton={unclaimedClaims.length > 0}
buttonText={formatMessage({ id: 'allFilters' })}
/>
</div>
</TableHeader>
Expand Down
2 changes: 1 addition & 1 deletion src/components/v5/common/ActionSidebar/partials/SaveDraftButton/SaveDraftButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const SaveDraftButton: FC = () => {
isFullSize={isMobile}
disabled={formState.isValidating || isDraftSaved || hasNoDecisionMethods}
>
{!isDraftSaved && <FileDashed size={18} className="mr-2" />}
{!isDraftSaved && <FileDashed size={18} />}
{formatText({
id: isDraftSaved ? 'button.draftSaved' : 'button.saveDraft',
})}
Expand Down
4 changes: 2 additions & 2 deletions src/components/v5/shared/Filter/FilterButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ const FilterButton: FC<FilterButtonProps> = ({
mode="tertiary"
size={size}
>
<FunnelSimple size={18} className="mr-2 flex-shrink-0" />
<FunnelSimple size={18} className="flex-shrink-0" />
{customLabel || formatMessage({ id: 'filter' })}
{!!numberSelectedFilters && (
<span className="ml-2 inline-flex h-[.8125rem] min-w-[.75rem] items-center rounded-sm bg-blue-100 px-1 py-0.5 text-[.5rem] font-bold leading-none text-blue-400">
<span className="inline-flex h-[.8125rem] min-w-[.75rem] items-center rounded-sm bg-blue-100 px-1 py-0.5 text-[.5rem] font-bold leading-none text-blue-400">
{numberSelectedFilters}
</span>
)}
Expand Down
Loading