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

Namadillo: Temporarily removing modal animation #1013

Merged
merged 1 commit into from
Aug 20, 2024
Merged

Namadillo: Temporarily removing modal animation #1013

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: 2 additions & 1 deletion apps/namadillo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"crypto-browserify": "^3.12.0",
"ethers": "^6.7.1",
"fp-ts": "^2.16.1",
"framer-motion": "^11.0.28",
"framer-motion": "^11.3.28",
"idb-keyval": "^6.2.1",
"invariant": "^2.2.4",
"io-ts": "^2.2.21",
Expand Down Expand Up @@ -47,6 +47,7 @@
"release:no-npm": "release-it --verbose --no-npm.publish --ci",
"start:proxy": "node ./scripts/startProxies.js",
"dev": "vite",
"preview": "vite preview",
"dev:local": "NODE_ENV=development NAMADA_INTERFACE_LOCAL=\"true\" yarn dev",
"dev:proxy": "NAMADA_INTERFACE_PROXY=true && ./scripts/start-proxies.sh && yarn dev:local",
"dev:old": "NODE_ENV=development webpack-dev-server",
Expand Down
27 changes: 12 additions & 15 deletions apps/namadillo/src/App/AppRoutes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Router } from "@remix-run/router";
import { AnimatePresence } from "framer-motion";
import {
Route,
Routes,
Expand Down Expand Up @@ -43,20 +42,18 @@ export const MainRoutes = (): JSX.Element => {
/>
</Route>
</Routes>
<AnimatePresence>
<Routes location={location} key={settingsAnimationKey}>
<Route
path={`${SettingsRoutes.index()}/*`}
element={<SettingsPanel />}
errorElement={<RouteErrorBoundary />}
/>
<Route
path={`${MessageRoutes.index()}/*`}
element={<SignMessages />}
errorElement={<RouteErrorBoundary />}
/>
</Routes>
</AnimatePresence>
<Routes location={location} key={settingsAnimationKey}>
<Route
path={`${SettingsRoutes.index()}/*`}
element={<SettingsPanel />}
errorElement={<RouteErrorBoundary />}
/>
<Route
path={`${MessageRoutes.index()}/*`}
element={<SignMessages />}
errorElement={<RouteErrorBoundary />}
/>
</Routes>
<ScrollRestoration />
</>
);
Expand Down
25 changes: 11 additions & 14 deletions apps/namadillo/src/App/Staking/Staking.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { minimumGasPriceAtom } from "atoms/fees";
import { AnimatePresence } from "framer-motion";
import { useAtomValue } from "jotai";
import { Route, Routes, useLocation } from "react-router-dom";
import IncrementBonding from "./IncrementBonding";
Expand All @@ -25,19 +24,17 @@ export const Staking = (): JSX.Element => {
<Routes>
<Route path="/*" element={<StakingOverview />} />
</Routes>
<AnimatePresence>
<Routes location={location} key={location.pathname}>
<Route
path={`${StakingRoutes.incrementBonding()}`}
element={<IncrementBonding />}
/>
<Route path={`${StakingRoutes.unstake()}`} element={<Unstake />} />
<Route
path={`${StakingRoutes.redelegateBonding()}`}
element={<ReDelegate />}
/>
</Routes>
</AnimatePresence>
<Routes location={location} key={location.pathname}>
<Route
path={`${StakingRoutes.incrementBonding()}`}
element={<IncrementBonding />}
/>
<Route path={`${StakingRoutes.unstake()}`} element={<Unstake />} />
<Route
path={`${StakingRoutes.redelegateBonding()}`}
element={<ReDelegate />}
/>
</Routes>
</main>
);
};
10 changes: 5 additions & 5 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8483,7 +8483,7 @@ __metadata:
eslint-plugin-react-hooks: "npm:^4.6.0"
ethers: "npm:^6.7.1"
fp-ts: "npm:^2.16.1"
framer-motion: "npm:^11.0.28"
framer-motion: "npm:^11.3.28"
history: "npm:^5.3.0"
html-webpack-plugin: "npm:^5.5.0"
idb-keyval: "npm:^6.2.1"
Expand Down Expand Up @@ -19518,9 +19518,9 @@ __metadata:
languageName: node
linkType: hard

"framer-motion@npm:^11.0.28":
version: 11.1.7
resolution: "framer-motion@npm:11.1.7"
"framer-motion@npm:^11.3.28":
version: 11.3.28
resolution: "framer-motion@npm:11.3.28"
dependencies:
tslib: "npm:^2.4.0"
peerDependencies:
Expand All @@ -19534,7 +19534,7 @@ __metadata:
optional: true
react-dom:
optional: true
checksum: 33ab19674170b88df2ceed655d95851e23ff270a0239a2bc84f464f6ae9632868d2c1b440e1be0187cd99cedd88ed22fab1e6234f67c40a2d215bd99c15dad31
checksum: f5aaf914f764ca4a05f7b77e50469b0dbd3311f7be98be871385075513370840de2f154422c7cdc00664147a3cc04f31053997c5eb3131edb25a1abfec570f93
languageName: node
linkType: hard

Expand Down
Loading