Refactor button component in CollatorJoin and CollatorManagement

darwinia-network · Sep 12, 2024 · e52be45 · e52be45
1 parent 039f180
commit e52be45
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 20 deletions.
diff --git a/src/components/collator/join.tsx b/src/components/collator/join.tsx
@@ -224,13 +224,7 @@ const CollatorJoin = ({ hasSessionKey, sessionKey, hasPool, refetch }: CollatorJ
             showArrow
           >
             <div>
-              <Button
-                color="primary"
-                className="h-[2.125rem] w-full"
-                isDisabled={!hasSessionKey || !commissionValue || commission < 0n}
-                onClick={handleSetCommission}
-                isLoading={isSetCommissionLoading || isLockPeriodLoading}
-              >
+              <Button color="primary" className="h-[2.125rem] w-full" isDisabled>
                 {hasPool ? 'Collate' : 'Create Nomination Pool & Collate'}
               </Button>
             </div>

diff --git a/src/components/collator/manage.tsx b/src/components/collator/manage.tsx
@@ -236,18 +236,7 @@ const CollatorManagement = ({
             showArrow
           >
             <div>
-              <Button
-                color="primary"
-                className="h-[2.125rem] w-full"
-                isDisabled
-                isLoading={
-                  isPendingUpdateCommission ||
-                  isLockPeriodLoading ||
-                  isLoadingCollatorByAddress ||
-                  isLoadingPrev ||
-                  isRefetchingPrev
-                }
-              >
+              <Button color="primary" className="h-[2.125rem] w-full" isDisabled>
                 Update Commission
               </Button>
             </div>
@@ -263,7 +252,8 @@ const CollatorManagement = ({
               isLockPeriodLoading ||
               isLoadingUpdateCommission ||
               isLoadingPrev ||
-              isRefetchingPrev
+              isRefetchingPrev ||
+              isLoadingCollatorByAddress
             }
           >
             Update Commission