fix: change user overview info by adam-strzelec · Pull Request #3332 · JoinColony/colonyCDapp

adam-strzelec · 2024-10-15T09:27:59Z

Description

Change appearance of action overview card info

Testing

Create action with reputation
Finalize action

Diffs

New stuff ✨

Display date of complete action

Changes 🏗

Change text inside cards

Resolves #31415

CLAassistant · 2024-10-15T09:28:05Z

All committers have signed the CLA.

rdig

All good here, tested both with voting and without (just staking)

Also, a "action with reputation" is called a motion

jakubcolony

Thanks for your PR @adam-strzelec 👍

Unfortunately, when I voted support as a user who did not stake, I got the failed message despite the motion passing:

jakubcolony · 2024-10-22T22:55:22Z

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

    actionData.motionData.motionStateHistory.hasFailedNotFinalizable;

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


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

jakubcolony · 2024-10-22T22:56:37Z

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

-              ? 'motion.finalizeStep.failed.statusText'
-              : 'motion.finalizeStep.statusText',
+            id:
+              isMotionFailedNotFinalizable || (!userStake && userVote)


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

adam-strzelec · 2024-10-29T13:46:34Z

@jakubcolony done. According to Arren, in the case where "user who did not stake but did vote" and with the outcome passed, it should have the description "Action has passed and can be executed."

jakubcolony

Sorry, I'm still unsure this is correct. When I staked and voted, I saw this when motion was ready to be finalized:

Shouldn't that say "Action has passed and can be executed"? Before finalization, I don't think we can consider the action to be "complete".

Then as a user who staked but not voted, the same motion step had a different label:

And that persisted even past finalization (at which point the action has been executed, so the label seems incorrect):

Do you actually need to take into account whether the user has voted? I would've thought you only need to consider these cases:

Motion ready to be finalized: Action has passed and can be executed.
Motion finalized: Action has passed and is now complete.
Motion failed: Keep existing copy.

arrenv · 2024-11-06T09:25:21Z

Motion ready to be finalized: Action has passed and can be executed.
Motion finalized: Action has passed and is now complete.
Motion failed: Keep existing copy.

@adam-strzelec Just to confirm, Jakub is correct here.

Everyone should see the same description in the last steps.

bassgeta

Nicely ironed out all the cases and it's looking crisp right now 👍
A completely supported motion ✔️

A motion which went through voting ✔️

A rejected motion ✔️

iamsamgibbs

This is working great for motions which are approved:

User who staked: (It does show a negative reward which I don't think is correct).

User who did not (should a user who did not stake but has a reward because they voted, be able to claim the reward? I think they should but there is no claim button here for them)

After claiming as the other user, the claimed pill shows here.

As a user who did not stake or vote:

However, when a motion is rejected, the text still says it has passed:

And when finalised the rejection:

There is also no claim button but the UserHub implies there should be.

I think the claiming issues are out of scope for this, but the wording should be fixed up here for rejected motions.

adam-strzelec · 2024-11-12T15:15:23Z

@iamsamgibbs

The reward for user who staked but not voted should be positive?
the claimed pill should be visible for everyone?
If oppose wins, what should be the text instead of "Action has passed and can be executed", and what instead of "Action has passed and now is complete"

iamsamgibbs · 2024-11-12T15:26:17Z

@adam-strzelec we might need some clarification from @arrenv for all of these:

Sorry, I didn't make it clear. That user had staked and voted. ~~I believe their reward should be positive. (but I could be mistaken)~~ Actually I think it might be correct that the reward is negative.
I think the claim button should be visible for every who has either a stake to reclaim, or a reward to claim.
I'll let Arren confirm the wording for when a motion has been rejected.

arrenv · 2024-12-06T09:31:28Z

@adam-strzelec @iamsamgibbs

It depends if the staker was on the winning or losing side of the vote. If they were on the winning side, it will be positive, if they were on the losing side it will be negative.
The "Claimed" status should be visible per individual who had staked and/or received a reward. I'm pretty sure that rewards don't need to be claimed though and are transferred automatically, so, perhaps they is where the confusion is in the app. However, we should show to that recipient the same "Claimed" status pill.
The copy should be "Action was opposed and cannot be executed.". Figma link

iamsamgibbs

Nice job, thanks for the changes.

The wording is now correct for a failed motion:

Also looks good as a user who voted but did not stake:

This issue I mentioned previously with the transaction showing "Claimable" but no claim button being visible is occurring on master, so can definitely be addressed separately.

iamsamgibbs · 2024-12-12T10:18:03Z

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

    actionData,
    refetchColony,
  ]);
+  // console.log('action data: ', actionData);


Leftover comment

bassgeta

A lot of hard work went into this, thanks for all the on the fly adjustments and following it through 💯
Finalizable ✔️

Finalized ✔️

Rejected ✔️

After voting as user who voted ✔️

rdig

Re-approving good to go

jakubcolony

Thank you @adam-strzelec, this is good to go. Just a reminder about the leftover console.log.

Passed without voting:

Passed with voting:

Failed without staking or voting:

Failed with opposing stake:

On a side note, there is a bug here (not introduced by this PR): #4004

Failed after voting:

Also a bug here, again not introduced by this PR. Added to the issue above.

Nice work! 💪

adam-strzelec · 2025-01-30T11:20:14Z

@iamsamgibbs I rebased it 😉 @jakubcolony @mmioana Can you check it one more time?

iamsamgibbs

Great job! This is working nicely!

mmioana

Looks good to me @adam-strzelec! Thank you a lot for your efforts! 🙌

mmioana · 2025-02-07T09:00:57Z

Hey @adam-strzelec! This needs a rebase

adam-strzelec · 2025-02-07T09:02:32Z

@mmioana I'm working on that right now 🙂

mmioana

Hey @adam-strzelec tested your PR and still looks good 👍 Nice work!🥇

iamsamgibbs

Still all seems good after a rebase.

…py for opposed action

adam-strzelec · 2025-02-18T12:30:58Z

@bassgeta @mmioana @iamsamgibbs I had to resolve conflicts. Can you check it one more time?

adam-strzelec self-assigned this Oct 15, 2024

adam-strzelec requested review from a team as code owners October 15, 2024 09:28

rdig previously approved these changes Oct 16, 2024

View reviewed changes

jakubcolony requested changes Oct 22, 2024

View reviewed changes

adam-strzelec dismissed rdig’s stale review via 7aa9a18 October 29, 2024 11:24

adam-strzelec requested review from jakubcolony and rdig October 29, 2024 13:46

jakubcolony requested changes Nov 1, 2024

View reviewed changes

adam-strzelec requested a review from jakubcolony November 7, 2024 08:51

bassgeta previously approved these changes Nov 11, 2024

View reviewed changes

iamsamgibbs requested changes Nov 12, 2024

View reviewed changes

adam-strzelec dismissed bassgeta’s stale review via 10456e2 December 3, 2024 12:10

adam-strzelec force-pushed the feat/16108652-agreement-overview branch from 1494d33 to 10456e2 Compare December 3, 2024 12:10

adam-strzelec requested review from bassgeta and iamsamgibbs December 9, 2024 12:07

iamsamgibbs previously approved these changes Dec 12, 2024

View reviewed changes

bassgeta previously approved these changes Dec 12, 2024

View reviewed changes

rdig previously approved these changes Dec 12, 2024

View reviewed changes

jakubcolony previously approved these changes Dec 20, 2024

View reviewed changes

adam-strzelec dismissed stale reviews from jakubcolony, rdig, and bassgeta via 05b8a7c December 23, 2024 11:46

adam-strzelec dismissed stale reviews from jakubcolony and mmioana via 2c9f434 January 30, 2025 11:18

adam-strzelec force-pushed the feat/16108652-agreement-overview branch from b3c24ec to 2c9f434 Compare January 30, 2025 11:18

adam-strzelec requested review from jakubcolony and mmioana January 30, 2025 11:20

iamsamgibbs previously approved these changes Jan 30, 2025

View reviewed changes

mmioana previously approved these changes Feb 3, 2025

View reviewed changes

adam-strzelec dismissed stale reviews from mmioana and iamsamgibbs via c089b8e February 7, 2025 09:58

adam-strzelec force-pushed the feat/16108652-agreement-overview branch from 2c9f434 to c089b8e Compare February 7, 2025 09:58

adam-strzelec requested review from iamsamgibbs and mmioana February 7, 2025 09:59

mmioana previously approved these changes Feb 7, 2025

View reviewed changes

iamsamgibbs previously approved these changes Feb 7, 2025

View reviewed changes

strzelec and others added 7 commits February 17, 2025 09:51

fix: change description for user who not stake but voted

1a95724

fix: change status text for passed and completed action

4f81647

fix: user who voted but not staked can claim

9761b26

fix: display claimed pill for users who staked or woted and change co…

b3c4cd8

…py for opposed action

fix: styles and handle translations for agreements

95c57e6

fix: add claim button for not supported actions

5f325ca

fix: rebase

a14c212

adam-strzelec dismissed stale reviews from iamsamgibbs and mmioana via a14c212 February 17, 2025 11:57

adam-strzelec force-pushed the feat/16108652-agreement-overview branch from c089b8e to a14c212 Compare February 17, 2025 11:57

adam-strzelec requested review from iamsamgibbs and mmioana February 17, 2025 11:57

Conversation

adam-strzelec commented Oct 15, 2024

Description

Testing

Diffs

Uh oh!

CLAassistant commented Oct 15, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rdig left a comment

Choose a reason for hiding this comment

Uh oh!

jakubcolony left a comment

Choose a reason for hiding this comment

Uh oh!

jakubcolony Oct 22, 2024

Choose a reason for hiding this comment

Uh oh!

jakubcolony Oct 22, 2024

Choose a reason for hiding this comment

Uh oh!

adam-strzelec commented Oct 29, 2024

Uh oh!

jakubcolony left a comment

Choose a reason for hiding this comment

Uh oh!

arrenv commented Nov 6, 2024

Uh oh!

bassgeta left a comment

Choose a reason for hiding this comment

Uh oh!

iamsamgibbs left a comment

Choose a reason for hiding this comment

Uh oh!

adam-strzelec commented Nov 12, 2024

Uh oh!

iamsamgibbs commented Nov 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

arrenv commented Dec 6, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

iamsamgibbs left a comment

Choose a reason for hiding this comment

Uh oh!

iamsamgibbs Dec 12, 2024

Choose a reason for hiding this comment

Uh oh!

bassgeta left a comment

Choose a reason for hiding this comment

Uh oh!

rdig left a comment

Choose a reason for hiding this comment

Uh oh!

jakubcolony left a comment

Choose a reason for hiding this comment

Uh oh!

adam-strzelec commented Jan 30, 2025

Uh oh!

iamsamgibbs left a comment

Choose a reason for hiding this comment

Uh oh!

mmioana left a comment

Choose a reason for hiding this comment

Uh oh!

mmioana commented Feb 7, 2025

Uh oh!

adam-strzelec commented Feb 7, 2025

Uh oh!

mmioana left a comment

Choose a reason for hiding this comment

Uh oh!

iamsamgibbs left a comment

Choose a reason for hiding this comment

Uh oh!

adam-strzelec commented Feb 18, 2025

Uh oh!

Reviewers

Assignees

Labels

CLAassistant commented Oct 15, 2024 •

edited

Loading

iamsamgibbs commented Nov 12, 2024 •

edited

Loading

arrenv commented Dec 6, 2024 •

edited

Loading