fix: remove redundant tooltip in activity refresh button (#328)

ArdentHQ · Oct 31, 2023 · 30edb30 · 30edb30
1 parent 4f40ce6
commit 30edb30
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/resources/js/Pages/Collections/Components/CollectionNavigation/CollectionNavigation.tsx b/resources/js/Pages/Collections/Components/CollectionNavigation/CollectionNavigation.tsx
@@ -122,7 +122,7 @@ export const CollectionNavigation = ({
             return t("pages.collections.activities.loading_activities_collection");
         }
 
-        return t("common.refresh");
+        return null;
     };
 
     return (
@@ -145,7 +145,10 @@ export const CollectionNavigation = ({
                     </div>
 
                     {selectedTab === "activity" && (
-                        <Tooltip content={updateDisabledReason()}>
+                        <Tooltip
+                            content={updateDisabledReason()}
+                            disabled={!isTruthy(updateDisabledReason())}
+                        >
                             <div className="py-1">
                                 <Button
                                     icon="Refresh"
@@ -165,6 +168,7 @@ export const CollectionNavigation = ({
             {selectedTab === "activity" && (
                 <Tooltip
                     content={updateDisabledReason()}
+                    disabled={!isTruthy(updateDisabledReason())}
                     touch
                 >
                     <div className="mt-6">

diff --git a/resources/js/Pages/Collections/View.tsx b/resources/js/Pages/Collections/View.tsx
@@ -244,7 +244,7 @@ const CollectionsView = ({
             return <EmptyBlock>{t("pages.collections.activities.ignores_activities")}</EmptyBlock>;
         }
 
-        if (isTruthy(isLoadingActivity)) {
+        if (isTruthy(isLoadingActivity) && activities?.paginated.data.length === 0) {
             return <EmptyBlock>{t("pages.collections.activities.loading_activities_collection")}</EmptyBlock>;
         }