Skip to content

Commit

Permalink
Feat: Restyled migration tool (#1864)
Browse files Browse the repository at this point in the history
Co-authored-by: Nikita Boakrev <[email protected]>
  • Loading branch information
JoaquinBattilana and MareskoY authored Apr 23, 2024
1 parent e995c78 commit 05f6d52
Show file tree
Hide file tree
Showing 34 changed files with 819 additions and 509 deletions.
49 changes: 23 additions & 26 deletions pages/_app.page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import { TransactionEventHandler } from 'src/components/TransactionEventHandler'
import { GasStationProvider } from 'src/components/transactions/GasStation/GasStationProvider';
import { AppDataProvider } from 'src/hooks/app-data-provider/useAppDataProvider';
import { ModalContextProvider } from 'src/hooks/useModal';
import { PermissionProvider } from 'src/hooks/usePermissions';
import { Web3ContextProvider } from 'src/libs/web3-data-provider/Web3Provider';
import { useRootStore } from 'src/store/root';
import { SharedDependenciesProvider } from 'src/ui-config/SharedDependenciesProvider';
Expand Down Expand Up @@ -139,31 +138,29 @@ export default function MyApp(props: MyAppProps) {
<Web3ContextProvider>
<AppGlobalStyles>
<AddressBlocked>
<PermissionProvider>
<ModalContextProvider>
<SharedDependenciesProvider>
<AppDataProvider>
<GasStationProvider>
{getLayout(<Component {...pageProps} />)}
<SupplyModal />
<WithdrawModal />
<BorrowModal />
<RepayModal />
<CollateralChangeModal />
<RateSwitchModal />
<DebtSwitchModal />
<ClaimRewardsModal />
<EmodeModal />
<SwapModal />
<FaucetModal />
<TransactionEventHandler />
<SwitchModal />
<StakingMigrateModal />
</GasStationProvider>
</AppDataProvider>
</SharedDependenciesProvider>
</ModalContextProvider>
</PermissionProvider>
<ModalContextProvider>
<SharedDependenciesProvider>
<AppDataProvider>
<GasStationProvider>
{getLayout(<Component {...pageProps} />)}
<SupplyModal />
<WithdrawModal />
<BorrowModal />
<RepayModal />
<CollateralChangeModal />
<RateSwitchModal />
<DebtSwitchModal />
<ClaimRewardsModal />
<EmodeModal />
<SwapModal />
<FaucetModal />
<TransactionEventHandler />
<SwitchModal />
<StakingMigrateModal />
</GasStationProvider>
</AppDataProvider>
</SharedDependenciesProvider>
</ModalContextProvider>
</AddressBlocked>
</AppGlobalStyles>
</Web3ContextProvider>
Expand Down
6 changes: 2 additions & 4 deletions pages/index.page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { Box, Typography } from '@mui/material';
import { useEffect, useState } from 'react';
import StyledToggleButton from 'src/components/StyledToggleButton';
import StyledToggleButtonGroup from 'src/components/StyledToggleButtonGroup';
import { usePermissions } from 'src/hooks/usePermissions';
import { useProtocolDataContext } from 'src/hooks/useProtocolDataContext';
import { useRootStore } from 'src/store/root';

Expand All @@ -17,7 +16,6 @@ import { DashboardTopPanel } from '../src/modules/dashboard/DashboardTopPanel';
export default function Home() {
const { currentAccount, loading: web3Loading } = useWeb3Context();
const { currentMarket } = useProtocolDataContext();
const { isPermissionsLoading } = usePermissions();
const trackEvent = useRootStore((store) => store.trackEvent);

const [mode, setMode] = useState<'supply' | 'borrow' | ''>('supply');
Expand All @@ -33,7 +31,7 @@ export default function Home() {
<DashboardTopPanel />

<ContentContainer>
{currentAccount && !isPermissionsLoading && (
{currentAccount && (
<Box
sx={{
display: { xs: 'flex', lg: 'none' },
Expand Down Expand Up @@ -62,7 +60,7 @@ export default function Home() {
</Box>
)}

{currentAccount && !isPermissionsLoading ? (
{currentAccount ? (
<DashboardContentWrapper isBorrow={mode === 'borrow'} />
) : (
<ConnectWalletPaper loading={web3Loading} />
Expand Down
Loading

2 comments on commit 05f6d52

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit was deployed on ipfs

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit was deployed on ipfs

Please sign in to comment.