fix: change status text for passed and completed action

Author: strzelec

src/components/v5/common/ActionSidebar/partials/Motions/steps/FinalizeStep/FinalizeStep.tsx

@@ -60,8 +60,6 @@ const FinalizeStep: FC<FinalizeStepProps> = ({
     handleClaimSuccess,
     claimPayload,
     canClaimStakes,
-    userStake,
-    hasUserVoted,
   } = useClaimConfig(actionData, startPollingAction, refetchAction);
 
   const isMotionFinalized = actionData.motionData.isFinalized;
@@ -134,10 +132,15 @@ const FinalizeStep: FC<FinalizeStepProps> = ({
    */
   const wrongMotionState = !motionState || motionState === MotionState.Invalid;
 
-  const successStatusText =
-    !userStake && hasUserVoted
-      ? 'motion.finalizeStep.votedAndNotStaked.statusText'
-      : 'motion.finalizeStep.statusText';
+  const canBeExecuted =
+    !isPolling &&
+    !isMotionFailedNotFinalizable &&
+    !isMotionFinalized &&
+    !isMotionAgreement;
+
+  const successStatusText = canBeExecuted
+    ? 'motion.finalizeStep.passedAction'
+    : 'motion.finalizeStep.completedStatusText';
 
   const statusText = isMotionFailedNotFinalizable
     ? 'motion.finalizeStep.failed.statusText'

src/components/v5/common/ActionSidebar/partials/Motions/steps/FinalizeStep/hooks.tsx

@@ -97,7 +97,6 @@ export const useClaimConfig = (
       databaseMotionId,
       remainingStakes,
       motionStateHistory,
-      voterRecord,
     },
     transactionHash,
   } = actionData;
@@ -119,7 +118,7 @@ export const useClaimConfig = (
     actionData.motionData.motionStateHistory.hasFailedNotFinalizable;
 
   const userStake = usersStakes.find(({ address }) => address === userAddress);
-  const hasUserVoted = voterRecord.some((item) => item.address === userAddress);
+
   const stakerReward = stakerRewards.find(
     ({ address }) => address === userAddress,
   );
@@ -305,7 +304,5 @@ export const useClaimConfig = (
     handleClaimSuccess,
     claimPayload,
     canClaimStakes,
-    userStake,
-    hasUserVoted,
   };
 };

src/i18n/en.json

@@ -1428,12 +1428,12 @@
     "motion.staking.accordion.title.show": "Show staking information",
     "motion.staking.accordion.title.hide": "Hide staking information",
     "motion.finalize.label": "Finalize",
-    "motion.finalizeStep.statusText": "Action has passed and is now complete.",
+    "motion.finalizeStep.completedStatusText": "Action has passed and is now complete.",
     "motion.finalizeStep.claimable.statusText": "Action has passed and has been executed.",
     "motion.finalizeStep.title": "Overview",
     "motion.finalizeStep.failedNotAchieving.statusText": "Action failed due to not achieving required stake.",
     "motion.finalizeStep.failed.statusText": "Action failed and cannot be executed.",
-    "motion.finalizeStep.votedAndNotStaked.statusText": "Action has passed and can be executed.",
+    "motion.finalizeStep.passedAction": "Action has passed and can be executed.",
     "motion.finalizeStep.staked": "Your stake",
     "motion.finalizeStep.winnings": "Your reward",
     "motion.finalizeStep.total": "Total",