diff --git a/src/components/AccountSwitcher/AccountInfo.tsx b/src/components/AccountSwitcher/AccountInfo.tsx index d280e91..da7f10b 100644 --- a/src/components/AccountSwitcher/AccountInfo.tsx +++ b/src/components/AccountSwitcher/AccountInfo.tsx @@ -1,25 +1,25 @@ -import React from "react"; -import { useClientStore } from "@/stores/clientStore"; -import { LogOut } from "lucide-react"; -import { useAccount } from "@/hooks/useAccount"; -import { CurrencyIcon } from "@/components/Currency/CurrencyIcon"; -import { useLogout } from "@/hooks/useLogout"; -import * as Popover from "@radix-ui/react-popover"; +import React from "react" +import { useClientStore } from "@/stores/clientStore" +import { LogOut } from "lucide-react" +import { useAccount } from "@/hooks/useAccount" +import { CurrencyIcon } from "@/components/Currency/CurrencyIcon" +import { useLogout } from "@/hooks/useLogout" +import * as Popover from "@radix-ui/react-popover" interface AccountInfoProps { - onSelect: () => void; + onSelect: () => void } export const AccountInfo: React.FC = ({ onSelect }) => { - const { balance, currency, setBalance } = useClientStore(); + const { balance, currency, setBalance } = useClientStore() const { accountType, selectedAccountId, switchAccountType, selectAccount, getAvailableAccounts, - } = useAccount(); - const logout = useLogout(); + } = useAccount() + const logout = useLogout() return (
@@ -57,12 +57,15 @@ export const AccountInfo: React.FC = ({ onSelect }) => { selectedAccountId === account.id ? "bg-gray-200" : "" }`} onClick={() => { - selectAccount(account.id); - onSelect(); + selectAccount(account.id) + onSelect() }} >
- +

@@ -74,17 +77,20 @@ export const AccountInfo: React.FC = ({ onSelect }) => {

{selectedAccountId === account.id && account.isDemo ? ( - ) : ( -

{balance} {account.currency}

+

+ {accountType === "demo" ? "10,000" : balance}{" "} + {account.currency} +

)}
@@ -97,7 +103,7 @@ export const AccountInfo: React.FC = ({ onSelect }) => {

Total assets

- {balance} {currency} + {accountType === "demo" ? "10,000" : balance} {currency}

@@ -118,5 +124,5 @@ export const AccountInfo: React.FC = ({ onSelect }) => {

- ); -}; + ) +} diff --git a/src/components/AccountSwitcher/AccountSwitcher.tsx b/src/components/AccountSwitcher/AccountSwitcher.tsx index 69d6c23..be67610 100644 --- a/src/components/AccountSwitcher/AccountSwitcher.tsx +++ b/src/components/AccountSwitcher/AccountSwitcher.tsx @@ -1,16 +1,20 @@ -import React, { useState } from 'react'; -import { ChevronDown, ChevronUp } from 'lucide-react'; -import { useClientStore } from '@/stores/clientStore'; -import { useAccount } from '@/hooks/useAccount'; -import { AccountPopover, AccountPopoverContent, AccountPopoverTrigger } from '@/components/ui/account-popover'; -import { AccountInfo } from './AccountInfo'; -import { useOrientationStore } from '@/stores/orientationStore'; +import React, { useState } from "react" +import { ChevronDown, ChevronUp } from "lucide-react" +import { useClientStore } from "@/stores/clientStore" +import { useAccount } from "@/hooks/useAccount" +import { + AccountPopover, + AccountPopoverContent, + AccountPopoverTrigger, +} from "@/components/ui/account-popover" +import { AccountInfo } from "./AccountInfo" +import { useOrientationStore } from "@/stores/orientationStore" export const AccountSwitcher: React.FC = () => { - const { balance } = useClientStore(); - const { selectedAccount } = useAccount(); - const { isLandscape } = useOrientationStore(); - const [isOpen, setIsOpen] = useState(false); + const { balance } = useClientStore() + const { selectedAccount } = useAccount() + const { isLandscape } = useOrientationStore() + const [isOpen, setIsOpen] = useState(false) return ( @@ -18,31 +22,48 @@ export const AccountSwitcher: React.FC = () => { - + setIsOpen(false)} /> - ); -}; + ) +} -export default AccountSwitcher; +export default AccountSwitcher diff --git a/src/screens/TradePage/components/TradeFormController.tsx b/src/screens/TradePage/components/TradeFormController.tsx index 1fdf73f..ed134a9 100644 --- a/src/screens/TradePage/components/TradeFormController.tsx +++ b/src/screens/TradePage/components/TradeFormController.tsx @@ -158,7 +158,7 @@ export const TradeFormController: React.FC = ({ const initialStates: ButtonStates = {} tradeTypeConfigs[trade_type].buttons.forEach((button) => { initialStates[button.actionName] = { - loading: true, + loading: false, error: null, payout: buttonStates[button.actionName]?.payout || 0, reconnecting: false, @@ -192,10 +192,7 @@ export const TradeFormController: React.FC = ({ : "" }`} > -
+
{isLandscape ? ( @@ -277,17 +274,20 @@ export const TradeFormController: React.FC = ({ buttonStates[button.actionName]?.loading ? "Loading..." : `${ - buttonStates[button.actionName]?.payout || 0 + // added for demo proposes will change it to 0 once api is connected + buttonStates[button.actionName]?.payout || 10 } ${currency}` } title_position={button.position} disabled={ - buttonStates[button.actionName]?.loading || - buttonStates[button.actionName]?.error !== null + buttonStates[button.actionName]?.loading + // Commenting it as api is not working we'll enable it once api is working + // buttonStates[button.actionName]?.error !== null } loading={ - buttonStates[button.actionName]?.loading || - buttonStates[button.actionName]?.reconnecting + buttonStates[button.actionName]?.loading + // Commenting it as api is not working we'll enable it once api is working + // buttonStates[button.actionName]?.reconnecting } error={buttonStates[button.actionName]?.error} onClick={() => { @@ -367,17 +367,21 @@ export const TradeFormController: React.FC = ({ buttonStates[button.actionName]?.loading ? "Loading..." : `${ - buttonStates[button.actionName]?.payout || 0 + buttonStates[button.actionName]?.payout || 10 } ${currency}` } title_position={button.position} disabled={ - buttonStates[button.actionName]?.loading || - buttonStates[button.actionName]?.error !== null + buttonStates[button.actionName]?.loading + // || + // Commenting it as api is not working we'll enable it once api is working + // buttonStates[button.actionName]?.error !== null } loading={ - buttonStates[button.actionName]?.loading || - buttonStates[button.actionName]?.reconnecting + buttonStates[button.actionName]?.loading + // || + // Commenting it as api is not working we'll enable it once api is working + // buttonStates[button.actionName]?.reconnecting } error={buttonStates[button.actionName]?.error} onClick={() => {