refactor: shifts the loader to the button, follow button only toggles…

… it on/off
artsy · Sep 16, 2024 · 1929b17 · 1929b17
1 parent 55d2d6a
commit 1929b17
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/elements/Button/FollowButton.tsx b/src/elements/Button/FollowButton.tsx
@@ -1,7 +1,6 @@
 import { CheckIcon } from "../../svgs/CheckIcon"
 import { formatLargeNumber } from "../../utils/formatLargeNumber"
 import { Button, ButtonProps } from "../Button"
-import { Spinner } from "../Spinner"
 import { Text } from "../Text"
 
 type FollowButtonProps = Omit<
@@ -20,6 +19,7 @@ export const FollowButton = ({
   loading,
   ...restProps
 }: FollowButtonProps) => {
+  const label = isFollowed ? "Following" : "Follow"
   return (
     <Button
       variant={isFollowed ? "outline" : "outlineGray"}
@@ -29,11 +29,11 @@ export const FollowButton = ({
       loading={loading}
       {...restProps}
     >
-      {loading ? (
-        <Spinner size="small" />
+      {!!loading ? (
+        `${label} ${followCount && followCount > 1 ? formatLargeNumber(followCount, 1) : ""}`
       ) : (
         <>
-          <Text variant="xs">{isFollowed ? "Following" : "Follow"}</Text>
+          <Text variant="xs">{label}</Text>
           {!!followCount && followCount > 1 && (
             <Text variant="xs" color="black60">
               {" " + formatLargeNumber(followCount, 1)}