Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: change user overview info #3332

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+46 −7
Open

fix: change user overview info #3332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/components/v5/common/ActionSidebar/partials/Motions/steps/FinalizeStep/FinalizeStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ const FinalizeStep: FC<FinalizeStepProps> = ({
handleClaimSuccess,
claimPayload,
canClaimStakes,
userStake,
userVote,
} = useClaimConfig(actionData, startPollingAction, refetchAction);

const isMotionFinalized = actionData.motionData.isFinalized;
Expand Down Expand Up @@ -142,9 +144,10 @@ const FinalizeStep: FC<FinalizeStepProps> = ({
iconSize={16}
>
{formatText({
id: isMotionFailedNotFinalizable
? 'motion.finalizeStep.failed.statusText'
: 'motion.finalizeStep.statusText',
id:
isMotionFailedNotFinalizable || (!userStake && userVote)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure I'm following this. Why do we want to show failed status text if user did not stake but has voted?

? 'motion.finalizeStep.failed.statusText'
: 'motion.finalizeStep.statusText',
})}
</StatusText>
}
Expand Down
33 changes: 33 additions & 0 deletions src/components/v5/common/ActionSidebar/partials/Motions/steps/FinalizeStep/hooks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Extension, Id } from '@colony/colony-js';
import { format } from 'date-fns';
import { BigNumber } from 'ethers';
import React, { useEffect, useMemo, useState } from 'react';

Expand Down Expand Up @@ -95,6 +96,8 @@ export const useClaimConfig = (
voterRewards,
databaseMotionId,
remainingStakes,
motionStateHistory,
voterRecord,
},
transactionHash,
} = actionData;
Expand All @@ -116,6 +119,7 @@ export const useClaimConfig = (
actionData.motionData.motionStateHistory.hasFailedNotFinalizable;

const userStake = usersStakes.find(({ address }) => address === userAddress);
const userVote = voterRecord.some((item) => item.address === userAddress);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how about hasUserVoted to indicate it's a boolean and not the vote value?

const stakerReward = stakerRewards.find(
({ address }) => address === userAddress,
);
Expand Down Expand Up @@ -261,6 +265,33 @@ export const useClaimConfig = (
</div>
),
},
{
key: WinningsItems.Completed,
label: formatText({ id: 'motion.finalizeStep.completed' }),
value: (
<div>
<Numeral
value={
motionStateHistory?.endedAt
? formatText(
{ id: 'motion.finalizeStep.completedAt' },
{
date: format(
new Date(motionStateHistory.endedAt),
'dd MMM yyyy',
),
hour: format(
new Date(motionStateHistory.endedAt),
'h:mma',
).toLowerCase(),
},
)
: ''
}
/>
</div>
),
},
];
};

Expand All @@ -274,5 +305,7 @@ export const useClaimConfig = (
handleClaimSuccess,
claimPayload,
canClaimStakes,
userStake,
userVote,
};
};
1 change: 1 addition & 0 deletions src/components/v5/common/ActionSidebar/partials/Motions/steps/FinalizeStep/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ export enum WinningsItems {
Staked = 'staked',
Winnings = 'winnings',
Total = 'total',
Completed = 'completed',
}
10 changes: 6 additions & 4 deletions src/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1428,14 +1428,16 @@
"motion.staking.accordion.title.show": "Show staking information",
"motion.staking.accordion.title.hide": "Hide staking information",
"motion.finalize.label": "Finalize",
"motion.finalizeStep.statusText": "Finalize to execute the agreed transactions and return stakes.",
"motion.finalizeStep.statusText": "Action has passed and is now complete.",
"motion.finalizeStep.claimable.statusText": "Action has passed and has been executed.",
"motion.finalizeStep.title": "Your overview",
"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.staked": "Staked",
"motion.finalizeStep.winnings": "Reward",
"motion.finalizeStep.staked": "Your stake",
"motion.finalizeStep.winnings": "Your reward",
"motion.finalizeStep.total": "Total",
"motion.finalizeStep.completed": "Completed",
"motion.finalizeStep.completedAt": "{date} at {hour}",
"motion.finalizeStep.submit": "Finalize",
"motion.finalizeStep.returnStakes": "Return stakes",
"motion.finalizeStep.transactions.remaining": "{transactions} transactions remaining",
Expand Down
Loading