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

fix: make expandatures stakes finalizable in UserHub menu #4238

Merged
merged 1 commit into from
Feb 5, 2025
Merged

fix: make expandatures stakes finalizable in UserHub menu #4238

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
3 changes: 1 addition & 2 deletions amplify/backend/api/colonycdapp/schema/schema.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4147,8 +4147,7 @@ type UserStake @model {
)
user: User! @hasOne(fields: ["userAddress"])
colonyAddress: ID!
# TODO: Make this field non-nullable once migration is done
type: UserStakeType
type: UserStakeType!
amount: String!
isClaimed: Boolean!
actionId: ID!
Expand Down
2 changes: 1 addition & 1 deletion docker/colony-cdapp-dev-env-block-ingestor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM colony-cdapp-dev-env/base:latest

ENV BLOCK_INGESTOR_HASH=844f5a387f7d2bb22c47bbc1b26d8eba4daf10e3
ENV BLOCK_INGESTOR_HASH=de36c3611e9d40c1bdf4f906af18ce34fab61eab

# Declare volumes to set up metadata
VOLUME [ "/colonyCDapp/amplify/mock-data" ]
Expand Down
3 changes: 2 additions & 1 deletion src/components/common/Extensions/UserHub/partials/StakesTab/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { MotionState as NetworkMotionState } from '@colony/colony-js';

import { UserStakeType } from '~gql';
import { type MotionStatesMap } from '~hooks/useNetworkMotionStates.ts';
import { type VotingReputationByColonyAddress } from '~hooks/useNetworkMotionStatesAllColonies.ts';
import { type UserStake } from '~types/graphql.ts';
Expand Down Expand Up @@ -36,7 +37,7 @@ export const getStakeStatus = (
return UserStakeStatus.Claimed;
}

if (stake.action?.expenditureId) {
if (stake.type === UserStakeType.StakedExpenditure) {
return UserStakeStatus.Staking;
}

Expand Down
8 changes: 4 additions & 4 deletions src/graphql/generated.ts
View file
Open in desktop

Large diffs are not rendered by default.