Skip to content

Commit 5cf5087

Browse files
Anton-rockAnton-rock
authored
Feat: withdraw page (#397)
1 parent 760a698 commit 5cf5087

File tree

13 files changed

+377
-209
lines changed

13 files changed

+377
-209
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"pnpm": ">=10.4.0"
1818
},
1919
"dependencies": {
20-
"@compolabs/spark-orderbook-ts-sdk": "https://registry.npmjs.org/@compolabs/spark-orderbook-ts-sdk/-/spark-orderbook-ts-sdk-1.16.5.tgz",
20+
"@compolabs/spark-orderbook-ts-sdk": "https://registry.npmjs.org/@compolabs/spark-orderbook-ts-sdk/-/spark-orderbook-ts-sdk-1.16.7.tgz",
2121
"@compolabs/tradingview-chart": "^1.0.21",
2222
"@emotion/react": "^11.11.3",
2323
"@emotion/styled": "^11.11.0",

‎pnpm-lock.yaml

Lines changed: 8 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/App.tsx

Lines changed: 35 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,24 @@
1-
import React, { useState } from "react";
2-
import { Navigate, Route, Routes } from "react-router-dom";
1+
import React from "react";
2+
import { Route, Routes } from "react-router-dom";
33
import styled from "@emotion/styled";
44
import { observer } from "mobx-react";
5-
import Competitions from "src/screens/Competitions";
6-
import Leaderboard from "src/screens/Leaderboard";
75

86
import ConnectWalletDialog from "@components/ConnectWalletDialog";
97
import { Column } from "@components/Flex";
108
import Header from "@components/Header";
11-
import { MobileAppStoreSheet } from "@components/Modal/MobileAppStoreSheet";
12-
import { Onboarding } from "@components/Onboarding";
13-
import { HeaderPoints } from "@components/Points/HeaderPoints";
149
import WalletConnectors from "@components/WalletConnectors";
1510

1611
import { useClearUrlParam } from "@hooks/useClearUrlParam";
17-
import { useMedia } from "@hooks/useMedia";
1812
import { useStores } from "@stores";
1913
import { MODAL_TYPE } from "@stores/ModalStore";
2014

2115
import SideManageAssets from "@screens/Assets/SideManageAssets/SideManageAssets";
22-
import Dashboard from "@screens/Dashboard";
23-
import Faucet from "@screens/Faucet";
24-
import SpotScreen from "@screens/SpotScreen";
25-
import Stats from "@screens/Stats/Stats";
26-
import { SwapScreen } from "@screens/SwapScreen";
16+
import { AssetsWithdrawal } from "@screens/AssetsWithdrawal/AssetsWithdrawal";
2717

2818
import { ROUTES } from "@constants";
2919

30-
import { FeatureToggleProvider, IntercomProvider, UnderConstructionProvider } from "@src/providers";
31-
import { DiscordProvider } from "@src/providers/DiscordProvider";
32-
3320
const App: React.FC = observer(() => {
34-
const { modalStore, tradeStore } = useStores();
35-
const media = useMedia();
36-
37-
const [isAppStoreSheetVisible, setIsAppStoreSheetVisible] = useState(() => media.mobile);
21+
const { modalStore } = useStores();
3822

3923
// This hooks is used to clear unnecessary URL parameters,
4024
// specifically "tx_id", after returning from the faucet
@@ -43,34 +27,37 @@ const App: React.FC = observer(() => {
4327
// usePrivateKeyAsAuth();
4428

4529
return (
46-
<IntercomProvider>
47-
<DiscordProvider>
48-
<FeatureToggleProvider>
49-
<UnderConstructionProvider>
50-
<Root>
51-
<Header />
52-
<HeaderPoints />
53-
<Routes>
54-
<Route element={<SpotScreen />} path={`${ROUTES.SPOT}/:marketId`} />
55-
<Route element={<SwapScreen />} path={ROUTES.SWAP} />
56-
<Route element={<Faucet />} path={ROUTES.FAUCET} />
57-
<Route element={<Navigate to={ROUTES.ROOT} />} path="*" />
58-
<Route element={<Navigate to={`${ROUTES.SPOT}/${tradeStore.marketSymbol}`} />} path={ROUTES.ROOT} />
59-
<Route element={<Dashboard />} path={ROUTES.DASHBOARD} />
60-
<Route element={<Leaderboard />} path={ROUTES.LEADERBOARD} />
61-
<Route element={<Competitions />} path={ROUTES.COMPETITIONS} />
62-
<Route element={<Stats />} path={ROUTES.STATS} />
63-
</Routes>
64-
<SideManageAssets />
65-
<WalletConnectors visible={modalStore.isOpen(MODAL_TYPE.SELECT_WALLET)} onClose={modalStore.close} />
66-
<ConnectWalletDialog visible={modalStore.isOpen(MODAL_TYPE.CONNECT)} onClose={modalStore.close} />
67-
<MobileAppStoreSheet isOpen={isAppStoreSheetVisible} onClose={() => setIsAppStoreSheetVisible(false)} />
68-
<Onboarding />
69-
</Root>
70-
</UnderConstructionProvider>
71-
</FeatureToggleProvider>
72-
</DiscordProvider>
73-
</IntercomProvider>
30+
// <IntercomProvider>
31+
// <DiscordProvider>
32+
// <FeatureToggleProvider>
33+
// <UnderConstructionProvider>
34+
<Root>
35+
<Header />
36+
{/* <HeaderPoints /> */}
37+
<Routes>
38+
<Route element={<AssetsWithdrawal />} path={`${ROUTES.ROOT}`} />
39+
</Routes>
40+
{/*<Routes>*/}
41+
{/* <Route element={<SpotScreen />} path={`${ROUTES.SPOT}/:marketId`} />*/}
42+
{/* <Route element={<SwapScreen />} path={ROUTES.SWAP} />*/}
43+
{/* <Route element={<Faucet />} path={ROUTES.FAUCET} />*/}
44+
{/* <Route element={<Navigate to={ROUTES.ROOT} />} path="*" />*/}
45+
{/* <Route element={<Navigate to={`${ROUTES.SPOT}/${tradeStore.marketSymbol}`} />} path={ROUTES.ROOT} />*/}
46+
{/* <Route element={<Dashboard />} path={ROUTES.DASHBOARD} />*/}
47+
{/* <Route element={<Leaderboard />} path={ROUTES.LEADERBOARD} />*/}
48+
{/* <Route element={<Competitions />} path={ROUTES.COMPETITIONS} />*/}
49+
{/* <Route element={<Stats />} path={ROUTES.STATS} />*/}
50+
{/*</Routes>*/}
51+
<SideManageAssets />
52+
<WalletConnectors visible={modalStore.isOpen(MODAL_TYPE.SELECT_WALLET)} onClose={modalStore.close} />
53+
<ConnectWalletDialog visible={modalStore.isOpen(MODAL_TYPE.CONNECT)} onClose={modalStore.close} />
54+
{/*<MobileAppStoreSheet isOpen={isAppStoreSheetVisible} onClose={() => setIsAppStoreSheetVisible(false)} />*/}
55+
{/*<Onboarding />*/}
56+
</Root>
57+
// </UnderConstructionProvider>
58+
// </FeatureToggleProvider>
59+
// </DiscordProvider>
60+
// </IntercomProvider>
7461
);
7562
});
7663

‎src/blockchain/fuel/FuelNetwork.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,24 @@ export class FuelNetwork {
118118
return this.orderbookSdk.fulfillOrderManyWithDeposit(...params);
119119
};
120120

121+
fetchOrderIdsByAddress = async (
122+
...params: Parameters<typeof this.orderbookSdk.fetchOrderIdsByAddress>
123+
): Promise<string[]> => {
124+
return this.orderbookSdk.fetchOrderIdsByAddress(...params);
125+
};
126+
121127
cancelSpotOrder = async (
122128
...params: Parameters<typeof this.orderbookSdk.cancelOrder>
123129
): Promise<WriteTransactionResponse> => {
124130
return this.orderbookSdk.cancelOrder(...params);
125131
};
126132

133+
cancelSpotOrderMutli = async (
134+
...params: Parameters<typeof this.orderbookSdk.cancelOrderMulticall>
135+
): Promise<WriteTransactionResponse> => {
136+
return this.orderbookSdk.cancelOrderMulticall(...params);
137+
};
138+
127139
mintToken = async (...params: Parameters<typeof this.orderbookSdk.mintToken>): Promise<WriteTransactionResponse> => {
128140
return this.orderbookSdk.mintToken(...params);
129141
};

‎src/components/Header/Header.tsx

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { observer } from "mobx-react";
55
import Button from "@components/Button";
66
import { media } from "@themes/breakpoints";
77

8-
import DataBase from "@assets/icons/dataBase.svg?react";
98
import Logo from "@assets/icons/logo.svg?react";
109
import Menu from "@assets/icons/menu.svg?react";
1110

@@ -24,7 +23,7 @@ import MobileMenu from "./MobileMenu";
2423
import WalletAddressButton from "./WalletAddressButton";
2524

2625
const Header: React.FC = observer(() => {
27-
const { modalStore, quickAssetsStore } = useStores();
26+
const { modalStore } = useStores();
2827
const media = useMedia();
2928

3029
const [isMobileMenuOpen, openMobileMenu, closeMobileMenu] = useFlag();
@@ -72,15 +71,15 @@ const Header: React.FC = observer(() => {
7271
</SmartFlex>
7372
<SmartFlex center="y" gap="8px">
7473
{renderWallet()}
75-
<ButtonStyled
74+
{/* <ButtonStyled
7675
data-onboarding="assets-mobile"
7776
fitContent
7877
onClick={() => quickAssetsStore.setQuickAssets(true)}
7978
>
8079
<SmartFlex>
8180
<DataBase />
8281
</SmartFlex>
83-
</ButtonStyled>
82+
</ButtonStyled> */}
8483
<MenuContainer data-onboarding="menu-mobile" onClick={toggleMenu}>
8584
<Menu />
8685
</MenuContainer>
@@ -102,12 +101,12 @@ const Header: React.FC = observer(() => {
102101
</SmartFlex>
103102
</SmartFlex>
104103
<SmartFlex center="y" gap="16px">
105-
<Button data-onboarding="assets-desktop" fitContent onClick={() => quickAssetsStore.setQuickAssets(true)}>
104+
{/* <Button data-onboarding="assets-desktop" fitContent onClick={() => quickAssetsStore.setQuickAssets(true)}>
106105
<SmartFlex center="y" gap="8px">
107106
<DataBase />
108107
Assets
109108
</SmartFlex>
110-
</Button>
109+
</Button> */}
111110
{renderWallet()}
112111
</SmartFlex>
113112
</>
@@ -145,11 +144,11 @@ const Root = styled(SmartFlex)`
145144
}
146145
`;
147146

148-
const ButtonStyled = styled(Button)`
149-
padding: 5px;
150-
width: 34px;
151-
height: 34px;
152-
`;
147+
// const ButtonStyled = styled(Button)`
148+
// padding: 5px;
149+
// width: 34px;
150+
// height: 34px;
151+
// `;
153152

154153
const Divider = styled.div`
155154
margin: 0 16px;

0 commit comments

Comments
 (0)