fix: make expandatures stakes finalizable in UserHub menu

JoinColony · Feb 3, 2025 · 4a19126 · 4a19126
1 parent 915cb1a
commit 4a19126
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/amplify/backend/api/colonycdapp/schema/schema.graphql b/amplify/backend/api/colonycdapp/schema/schema.graphql
@@ -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!

diff --git a/docker/colony-cdapp-dev-env-block-ingestor b/docker/colony-cdapp-dev-env-block-ingestor
@@ -1,6 +1,6 @@
 FROM colony-cdapp-dev-env/base:latest
 
-ENV BLOCK_INGESTOR_HASH=77acd2cb6ed86877a19807bee2a902a6e846bdbf
+ENV BLOCK_INGESTOR_HASH=e01173c6d74ceaa58c58fb47c78958a240ad84fb
 
 # Declare volumes to set up metadata
 VOLUME [ "/colonyCDapp/amplify/mock-data" ]

diff --git a/src/components/common/Extensions/UserHub/partials/StakesTab/helpers.ts b/src/components/common/Extensions/UserHub/partials/StakesTab/helpers.ts
@@ -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';
@@ -36,7 +37,7 @@ export const getStakeStatus = (
     return UserStakeStatus.Claimed;
   }
 
-  if (stake.action?.expenditureId) {
+  if (stake.type === UserStakeType.StakedExpenditure) {
     return UserStakeStatus.Staking;
   }
 

diff --git a/src/graphql/generated.ts b/src/graphql/generated.ts