Skip to content

refactor: earn flow + remove xstate/store #551

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

Draft
petar-omni wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

refactor: earn flow + remove xstate/store #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f6710c
feat(widget): add effect atom earn flow
petar-omni Jun 26, 2026
15d72af
refactor(widget): replace xstate stores with effect atoms
petar-omni Jun 26, 2026
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
6 changes: 0 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,5 @@
"husky": "catalog:",
"rev-dep": "catalog:",
"turbo": "catalog:"
},
"pnpm": {
"patchedDependencies": {
"purify-ts": "patches/purify-ts.patch",
"@stakekit/rainbowkit@2.2.11": "patches/@stakekit__rainbowkit@2.2.11.patch"
}
}
}
2 changes: 1 addition & 1 deletion packages/widget/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
"@cosmos-kit/keplr": "catalog:",
"@cosmos-kit/leap": "catalog:",
"@cosmos-kit/walletconnect": "catalog:",
"@effect/atom-react": "catalog:",
"@effect/openapi-generator": "catalog:",
"@effect/platform-node": "catalog:",
"@faker-js/faker": "catalog:",
Expand Down Expand Up @@ -117,7 +118,6 @@
"@vitejs/plugin-react": "catalog:",
"@vitest/browser-playwright": "catalog:",
"@xstate/react": "catalog:",
"@xstate/store": "catalog:",
"autoprefixer": "catalog:",
"babel-plugin-react-compiler": "catalog:",
"bignumber.js": "catalog:",
Expand Down
115 changes: 55 additions & 60 deletions packages/widget/src/Dashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { PendingCompletePage } from "./pages/complete/pages/pending-complete.pag
import { StakeCompletePage } from "./pages/complete/pages/stake-complete.page";
import { UnstakeCompletePage } from "./pages/complete/pages/unstake-complete.page";
import { EarnPageContextProvider } from "./pages/details/earn-page/state/earn-page-context";
import { EarnPageStateUsageBoundaryProvider } from "./pages/details/earn-page/state/earn-page-state-context";
import { StakeReviewPage } from "./pages/review";
import { PendingReviewPage } from "./pages/review/pages/pending-review.page";
import { UnstakeReviewPage } from "./pages/review/pages/unstake-review.page";
Expand Down Expand Up @@ -40,77 +39,73 @@ export const Dashboard = () => {

return (
<DashboardProvider>
<EarnPageStateUsageBoundaryProvider>
<EarnPageContextProvider
registerFooterButton={registerEarnFooterButton}
>
<Routes>
<Route element={<DashboardWrapper />}>
{/* Earn Tab */}
<Route element={<OverviewPage />}>
<Route index element={<EarnPageContent />} />
<EarnPageContextProvider registerFooterButton={registerEarnFooterButton}>
<Routes>
<Route element={<DashboardWrapper />}>
{/* Earn Tab */}
<Route element={<OverviewPage />}>
<Route index element={<EarnPageContent />} />

<Route element={<ConnectedCheck />}>
<Route path="review" element={<StakeReviewPage />} />
<Route path="steps" element={<StakeStepsPage />} />
<Route path="complete" element={<StakeCompletePage />} />
</Route>
<Route element={<ConnectedCheck />}>
<Route path="review" element={<StakeReviewPage />} />
<Route path="steps" element={<StakeStepsPage />} />
<Route path="complete" element={<StakeCompletePage />} />
</Route>
</Route>

{/* Manage Tab */}
<Route path="manage" element={<ManagePage />} />
{/* Manage Tab */}
<Route path="manage" element={<ManagePage />} />

{/* Position Details */}
<Route
path="positions/:integrationId/:balanceId"
element={<PositionDetailsPage />}
>
<Route index element={<PositionDetailsStakeActions />} />
{/* Position Details */}
<Route
path="positions/:integrationId/:balanceId"
element={<PositionDetailsPage />}
>
<Route index element={<PositionDetailsStakeActions />} />

{/* Staking */}
<Route path="stake">
<Route index element={<PositionDetailsStakeActions />} />
<Route path="review" element={<StakeReviewPage />} />
<Route path="steps" element={<StakeStepsPage />} />
<Route path="complete" element={<StakeCompletePage />} />
</Route>
{/* Staking */}
<Route path="stake">
<Route index element={<PositionDetailsStakeActions />} />
<Route path="review" element={<StakeReviewPage />} />
<Route path="steps" element={<StakeStepsPage />} />
<Route path="complete" element={<StakeCompletePage />} />
</Route>

<Route
path="select-validator/:pendingActionType"
element={<PositionDetailsPage />}
/>
<Route
path="select-validator/:pendingActionType"
element={<PositionDetailsPage />}
/>

{/* Unstaking */}
<Route path="unstake">
<Route index element={<PositionDetailsActions />} />
<Route path="review" element={<UnstakeReviewPage />} />
<Route path="steps" element={<UnstakeStepsPage />} />
<Route path="complete" element={<UnstakeCompletePage />} />
</Route>
{/* Unstaking */}
<Route path="unstake">
<Route index element={<PositionDetailsActions />} />
<Route path="review" element={<UnstakeReviewPage />} />
<Route path="steps" element={<UnstakeStepsPage />} />
<Route path="complete" element={<UnstakeCompletePage />} />
</Route>

{/* Pending Actions */}
<Route path="pending-action">
<Route path="review" element={<PendingReviewPage />} />
<Route path="steps" element={<PendingStepsPage />} />
<Route path="complete" element={<PendingCompletePage />} />
</Route>
{/* Pending Actions */}
<Route path="pending-action">
<Route path="review" element={<PendingReviewPage />} />
<Route path="steps" element={<PendingStepsPage />} />
<Route path="complete" element={<PendingCompletePage />} />
</Route>
</Route>

{/* Rewards Tab */}
{/* <Route path="rewards" element={<RewardsTabPage />} /> */}
{/* Rewards Tab */}
{/* <Route path="rewards" element={<RewardsTabPage />} /> */}

{/* Activity Tab */}
<Route path="activity" element={<ActivityTabPage />}>
<Route index element={<ActivityDetailsPage />} />
<Route
path=":pendingActionType/steps"
element={<ActivityStepsPage />}
/>
</Route>
{/* Activity Tab */}
<Route path="activity" element={<ActivityTabPage />}>
<Route index element={<ActivityDetailsPage />} />
<Route
path=":pendingActionType/steps"
element={<ActivityStepsPage />}
/>
</Route>
</Routes>
</EarnPageContextProvider>
</EarnPageStateUsageBoundaryProvider>
</Route>
</Routes>
</EarnPageContextProvider>

<GlobalModals />
</DashboardProvider>
Expand Down
68 changes: 0 additions & 68 deletions packages/widget/src/common/get-token-balances.ts
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions packages/widget/src/domain/types/stake.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,6 @@ const yieldsWithEnterMinBasedOnPosition = new Map<Networks, Set<Yield["id"]>>([
[Networks.Polkadot, new Set(["polkadot-dot-validator-staking"])],
]);

export const isNetworkWithEnterMinBasedOnPosition = (network: Networks) =>
yieldsWithEnterMinBasedOnPosition.has(network);

const isYieldWithEnterMinBasedOnPosition = (yieldDto: YieldBase) =>
Maybe.fromNullable(
yieldsWithEnterMinBasedOnPosition.get(
Expand Down
92 changes: 0 additions & 92 deletions packages/widget/src/hooks/api/use-dashboard-yield-catalog.ts
View file
Open in desktop

This file was deleted.

Loading