Merge pull request #4194 from JoinColony/fix/3351-button-with-icon-bug

Fix: Button with icon bug
JoinColony · Jan 29, 2025 · eaa3f01 · eaa3f01
2 parents e668e13 + a2f74e4
commit eaa3f01
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/components/frame/v5/pages/FundsPage/partials/FundsTable/FundsTable.tsx b/src/components/frame/v5/pages/FundsPage/partials/FundsTable/FundsTable.tsx
@@ -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';
@@ -78,6 +79,7 @@ const FundsTable: FC = () => {
             unclaimedClaims={allUnclaimedClaims}
             isButtonDisabled={!searchedTokens.length}
             shouldShowButton={unclaimedClaims.length > 0}
+            buttonText={formatMessage({ id: 'allFilters' })}
           />
         </div>
       </TableHeader>

diff --git a/src/components/v5/common/ActionSidebar/partials/SaveDraftButton/SaveDraftButton.tsx b/src/components/v5/common/ActionSidebar/partials/SaveDraftButton/SaveDraftButton.tsx
@@ -78,7 +78,7 @@ const SaveDraftButton: FC = () => {
       isFullSize={isMobile}
       disabled={isDisabled}
     >
-      {!isDraftSaved && <FileDashed size={18} className="mr-2" />}
+      {!isDraftSaved && <FileDashed size={18} />}
       {formatText({
         id: isDraftSaved ? 'button.draftSaved' : 'button.saveDraft',
       })}

diff --git a/src/components/v5/shared/Filter/FilterButton.tsx b/src/components/v5/shared/Filter/FilterButton.tsx
@@ -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>
       )}