-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #96 from thisyahlen-deriv/thisyahlen/trade-modal
chore: trademodal
- Loading branch information
Showing
22 changed files
with
632 additions
and
3 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| export * from './components'; | ||
| export * from './constants'; | ||
| export * from './flows'; | ||
| export * from './screens'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| import { useEffect } from 'react'; | ||
| import QRCode from 'qrcode.react'; | ||
|
|
||
| import { AppToIconMapper, CFDPlatforms, LinksMapper, PlatformDetails, TAppLinks } from '@cfd/constants'; | ||
| import { TradeScreen } from '@cfd/screens'; | ||
| import { Modal, Text, useDevice } from '@deriv-com/ui'; | ||
|
|
||
| import { useQueryParams } from '@/hooks'; | ||
| import { useCFDContext } from '@/providers'; | ||
| import { THooks } from '@/types'; | ||
|
|
||
| export const TradeModal = () => { | ||
| const { isDesktop } = useDevice(); | ||
| const { setCfdState, cfdState } = useCFDContext(); | ||
| const { isModalOpen, closeModal } = useQueryParams(); | ||
|
|
||
| const { account, marketType, platform = CFDPlatforms.MT5 } = cfdState; | ||
|
|
||
| useEffect(() => { | ||
| setCfdState({ | ||
| marketType, | ||
| platform, | ||
| }); | ||
| if (platform === CFDPlatforms.MT5) setCfdState({ accountId: (account as THooks.MT5AccountsList)?.loginid }); | ||
| }, [account, marketType, platform, setCfdState]); | ||
|
|
||
| const appOrder = ['ios', 'android', 'huawei']; | ||
|
|
||
| return ( | ||
| <Modal ariaHideApp={false} isOpen={isModalOpen('TradeModal')} onRequestClose={closeModal}> | ||
| <Modal.Header onRequestClose={closeModal}> | ||
| <Text weight='bold'>Trade</Text> | ||
| </Modal.Header> | ||
| <Modal.Body className='w-auto h-auto'> | ||
| <TradeScreen account={account} /> | ||
| </Modal.Body> | ||
| <Modal.Footer> | ||
| <div className='pt-0 min-h-[190px] flex justify-center items-center flex-col h-fit w-full gap-16'> | ||
| <Text align='center' size='xs' weight='bold'> | ||
| Download {PlatformDetails[platform]?.title} on your phone to trade with the{' '} | ||
| {PlatformDetails[platform].title} account | ||
| </Text> | ||
| <div className='flex gap-16'> | ||
| <div className='flex flex-col justify-center gap-8'> | ||
| {appOrder.map(app => { | ||
| const AppsLinkMapper = LinksMapper[platform][app as keyof TAppLinks]; | ||
| if (AppsLinkMapper) { | ||
| const AppIcon = AppToIconMapper[app]; | ||
| const appLink = AppsLinkMapper; | ||
| return ( | ||
| <AppIcon | ||
| className='w-[137px] h-[40px] cursor-pointer' | ||
| key={app} | ||
| onClick={() => window.open(appLink)} | ||
| /> | ||
| ); | ||
| } | ||
| return null; | ||
| })} | ||
| </div> | ||
| {isDesktop && ( | ||
| <div className='border-1 border-solid border-system-light-hover-background rounded-xs flex flex-col justify-center items-center w-[150px] gap-[5px] p-8'> | ||
| <QRCode size={80} value={PlatformDetails[platform].link} /> | ||
| <Text align='center' size='xs'> | ||
| Scan the QR code to download {PlatformDetails[platform].title} | ||
| </Text> | ||
| </div> | ||
| )} | ||
| </div> | ||
| </div> | ||
| </Modal.Footer> | ||
| </Modal> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export { TradeModal } from './TradeModal'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| export * from './DxtradePasswordModal'; | ||
| export * from './MT5PasswordModal'; | ||
| export * from './MT5SuccessModal'; | ||
| export * from './TradeModal'; |
58 changes: 58 additions & 0 deletions
58
src/cfd/screens/TradeScreen/TradeDetailsItem/TradeDetailsItem.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| import { useRef } from 'react'; | ||
| import { twMerge } from 'tailwind-merge'; | ||
| import { useHover } from 'usehooks-ts'; | ||
|
|
||
| import { Button, Text, Tooltip, useDevice } from '@deriv-com/ui'; | ||
|
|
||
| import EditIcon from '@/assets/svgs/ic-edit.svg?react'; | ||
| import { Clipboard } from '@/components'; | ||
| import { useQueryParams } from '@/hooks'; | ||
|
|
||
| type TTradeDetailsItemProps = { | ||
| className?: string; | ||
| label?: string; | ||
| value: string; | ||
| variant?: 'clipboard' | 'info' | 'password'; | ||
| }; | ||
|
|
||
| export const TradeDetailsItem = ({ className, label, value, variant = 'clipboard' }: TTradeDetailsItemProps) => { | ||
| const { isDesktop } = useDevice(); | ||
| const hoverRef = useRef(null); | ||
| const isHovered = useHover(hoverRef); | ||
| const { openModal } = useQueryParams(); | ||
| return ( | ||
| <div | ||
| className={twMerge( | ||
| 'flex items-center h-32 justify-between bg-system-light-secondary-background p-5 pl-8', | ||
| className | ||
| )} | ||
| > | ||
| {label && <Text size='sm'>{label}</Text>} | ||
| <div className='flex items-center gap-x-8'> | ||
| {variant === 'info' ? ( | ||
| <Text color='less-prominent' size='sm'> | ||
| {value} | ||
| </Text> | ||
| ) : ( | ||
| <Text size='sm' weight='bold'> | ||
| {value} | ||
| </Text> | ||
| )} | ||
| {variant === 'clipboard' && <Clipboard textCopy={value} />} | ||
| {variant === 'password' && ( | ||
| <Tooltip | ||
| position='left' | ||
| triggerAction={isHovered && isDesktop ? 'hover' : 'click'} | ||
| message='Change password' | ||
| > | ||
| <div ref={hoverRef}> | ||
| <Button className='underline' color='white' size='sm' variant='ghost'> | ||
| <EditIcon className='cursor-pointer' onClick={() => openModal('ChangePassword')} /> | ||
| </Button> | ||
| </div> | ||
| </Tooltip> | ||
| )} | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export { TradeDetailsItem } from './TradeDetailsItem'; |
Oops, something went wrong.