Skip to content

Commit 01019e0

Browse files
committed
fix: make steps selectable for staking actions
1 parent c3455ef commit 01019e0

2 files changed

Lines changed: 2 additions & 15 deletions

File tree

  • src/components/v5/common
    • ActionSidebar/partials/Motions/steps/FinalizeStep
    • CompletedAction/partials/PaymentBuilder/partials/PaymentBuilderWidget

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ const FinalizeStep: FC<FinalizeStepProps> = ({
8282
error: ActionTypes.RECLAIM_EXPENDITURE_STAKE_ERROR,
8383
success: ActionTypes.RECLAIM_EXPENDITURE_STAKE_SUCCESS,
8484
});
85-
const associatedActionId = getMotionAssociatedActionId(actionData);
8685

8786
const handleSuccess = async () => {
8887
startPollingAction(getSafePollingInterval());

src/components/v5/common/CompletedAction/partials/PaymentBuilder/partials/PaymentBuilderWidget/utils.ts

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -166,15 +166,8 @@ export const segregateCancelActions = (
166166
export const getExpenditureStep = (
167167
expenditure: Expenditure | null | undefined,
168168
) => {
169-
const {
170-
status,
171-
userStake,
172-
cancellingActions,
173-
lockingActions,
174-
releaseActions,
175-
isStaked,
176-
} = expenditure || {};
177-
const { isForfeited } = userStake || {};
169+
const { status, cancellingActions, lockingActions, releaseActions } =
170+
expenditure || {};
178171
const isExpenditureFunded = isExpenditureFullyFunded(expenditure);
179172

180173
const allCancelledMotions = cancellingActions?.items
@@ -208,16 +201,11 @@ export const getExpenditureStep = (
208201
if (isExpenditureFunded) {
209202
return ExpenditureStep.Release;
210203
}
211-
212204
return ExpenditureStep.Funding;
213205
}
214206
case ExpenditureStatus.Finalized:
215207
return ExpenditureStep.Payment;
216208
case ExpenditureStatus.Cancelled: {
217-
if (isForfeited && isStaked) {
218-
return ExpenditureStep.Reclaim;
219-
}
220-
221209
if (releaseActions?.items && releaseActions?.items.length > 0) {
222210
return `${ExpenditureStep.Cancel}-${3}`;
223211
}

0 commit comments

Comments
 (0)