Skip to content

Commit 3efcd62

Browse files
authored
Merge pull request #68 from compolabs/fix/1083-switching-tab
[1083] Correct tab switching
2 parents 5566863 + decbba9 commit 3efcd62

File tree

10 files changed

+462
-460
lines changed

10 files changed

+462
-460
lines changed

src/screens/TradeScreen/OrderbookAndTradesInterface/OrderbookAndTradesInterface.tsx

+26-18
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,37 @@ import styled from "@emotion/styled";
33

44
import Button, { ButtonGroup } from "@components/Button";
55
import SizedBox from "@components/SizedBox";
6-
import SpotOrderBook from "@screens/TradeScreen/OrderbookAndTradesInterface/SpotOrderBook";
7-
import SpotTrades from "@screens/TradeScreen/OrderbookAndTradesInterface/SpotTrades";
86
import Text, { TEXT_TYPES } from "@src/components/Text";
97

8+
import { SpotOrderBook } from "./SpotOrderBook/SpotOrderBook";
9+
import { SpotOrderbookVMProvider } from "./SpotOrderBook/SpotOrderbookVM";
10+
import { SpotTrades } from "./SpotTrades/SpotTrades";
11+
import { SpotTradesVMProvider } from "./SpotTrades/SpotTradesVM";
12+
1013
const OrderbookAndTradesInterface: React.FC = () => {
1114
const [isOrderbook, setIsOrderbook] = useState(true);
15+
1216
return (
13-
<Root>
14-
<ButtonGroup style={{ padding: "0 12px" }}>
15-
<Button active={isOrderbook} onClick={() => setIsOrderbook(true)}>
16-
<Text primary={isOrderbook} type={TEXT_TYPES.BUTTON_SECONDARY}>
17-
orderbook
18-
</Text>
19-
</Button>
20-
<Button active={!isOrderbook} onClick={() => setIsOrderbook(false)}>
21-
<Text primary={!isOrderbook} type={TEXT_TYPES.BUTTON_SECONDARY}>
22-
trades
23-
</Text>
24-
</Button>
25-
</ButtonGroup>
26-
<SizedBox height={8} />
27-
{isOrderbook ? <SpotOrderBook /> : <SpotTrades />}
28-
</Root>
17+
<SpotOrderbookVMProvider>
18+
<SpotTradesVMProvider>
19+
<Root>
20+
<ButtonGroup style={{ padding: "0 12px" }}>
21+
<Button active={isOrderbook} onClick={() => setIsOrderbook(true)}>
22+
<Text primary={isOrderbook} type={TEXT_TYPES.BUTTON_SECONDARY}>
23+
orderbook
24+
</Text>
25+
</Button>
26+
<Button active={!isOrderbook} onClick={() => setIsOrderbook(false)}>
27+
<Text primary={!isOrderbook} type={TEXT_TYPES.BUTTON_SECONDARY}>
28+
trades
29+
</Text>
30+
</Button>
31+
</ButtonGroup>
32+
<SizedBox height={8} />
33+
{isOrderbook ? <SpotOrderBook /> : <SpotTrades />}
34+
</Root>
35+
</SpotTradesVMProvider>
36+
</SpotOrderbookVMProvider>
2937
);
3038
};
3139

0 commit comments

Comments
 (0)