-
Notifications
You must be signed in to change notification settings - Fork 298
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Co-authored-by: Carol Sachdeva <58209918+carol-deriv@users.noreply.github.com>
- Loading branch information
1 parent
70d12b1
commit 9a3da34
Showing
33 changed files
with
463 additions
and
473 deletions.
There are no files selected for viewing
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,154 +1,16 @@ | ||
| import React from 'react'; | ||
| import { RouteComponentProps } from 'react-router'; | ||
| import { withRouter } from 'react-router-dom'; | ||
| import { getLanguage } from '@deriv/translations'; | ||
| import { routes, WS } from '@deriv/shared'; | ||
| import { Loading } from '@deriv/components'; | ||
| import { observer, useStore } from '@deriv/stores'; | ||
| import P2P from '@deriv/p2p'; | ||
| import { get, init, timePromise } from 'Utils/server_time'; | ||
| import { useCashierStore } from '../../stores/useCashierStores'; | ||
|
|
||
| type TP2PCashierProps = RouteComponentProps & { | ||
| history: History; | ||
| location: { | ||
| search: string; | ||
| hash: string; | ||
| }; | ||
| }; | ||
| import { observer, useStore } from '@deriv/stores'; | ||
|
|
||
| /* P2P will use the same websocket connection as Deriv/Binary, we need to pass it as a prop */ | ||
| const P2PCashier = observer(({ history, location }: TP2PCashierProps) => { | ||
| const { notifications, client, ui, common } = useStore(); | ||
| const { | ||
| addNotificationMessage, | ||
| filterNotificationMessages, | ||
| refreshNotifications, | ||
| removeNotificationByKey, | ||
| removeNotificationMessage, | ||
| setP2POrderProps, | ||
| } = notifications; | ||
| const { balance, currency, local_currency_config, loginid, is_logging_in, is_virtual, residence } = client; | ||
| const { notification_messages_ui: Notifications, is_dark_mode_on, is_mobile, setCurrentFocus, current_focus } = ui; | ||
| const { platform } = common; | ||
| const { general_store } = useCashierStore(); | ||
| const { setNotificationCount, setOnRemount } = general_store; | ||
| const [order_id, setOrderId] = React.useState<string | null>(null); | ||
| const [action_param, setActionParam] = React.useState<string | null>(null); | ||
| const [code_param, setCodeParam] = React.useState<string | null>(null); | ||
| const url_params = new URLSearchParams(location.search); | ||
| const server_time = { | ||
| get, | ||
| init, | ||
| timePromise, | ||
| }; | ||
|
|
||
| const setQueryOrder = React.useCallback( | ||
| (input_order_id: string | null) => { | ||
| if (is_mobile) { | ||
| url_params.delete('action'); | ||
| url_params.delete('code'); | ||
| } | ||
|
|
||
| if (url_params.has('order_id') || url_params.has('order')) { | ||
| url_params.delete('order'); | ||
| url_params.delete('order_id'); | ||
| } | ||
|
|
||
| if (input_order_id) { | ||
| url_params.append('order', input_order_id); | ||
| } | ||
|
|
||
| if (!input_order_id) { | ||
| history.replace({ | ||
| search: '', | ||
| hash: location.hash, | ||
| }); | ||
|
|
||
| setOrderId(null); | ||
| } else if (order_id !== input_order_id) { | ||
| // Changing query params | ||
| history.push({ | ||
| pathname: routes.cashier_p2p, | ||
| search: url_params.toString(), | ||
| hash: location.hash, | ||
| }); | ||
| url_params.delete('action'); | ||
| url_params.delete('code'); | ||
| setOrderId(input_order_id); | ||
| } | ||
| }, | ||
|
|
||
| // eslint-disable-next-line react-hooks/exhaustive-deps | ||
| [history, location.hash, location.search] | ||
| ); | ||
|
|
||
| React.useEffect(() => { | ||
| let passed_order_id; | ||
|
|
||
| setActionParam(url_params.get('action')); | ||
| if (is_mobile) { | ||
| setCodeParam(localStorage.getItem('verification_code.p2p_order_confirm')); | ||
| } else if (!code_param) { | ||
| if (url_params.has('code')) { | ||
| setCodeParam(url_params.get('code')); | ||
| } else if (localStorage.getItem('verification_code.p2p_order_confirm')) { | ||
| setCodeParam(localStorage.getItem('verification_code.p2p_order_confirm')); | ||
| } | ||
| } | ||
|
|
||
| // Different emails give us different params (order / order_id), | ||
| // don't remove order_id since it's consistent for mobile and web for 2FA | ||
| if (url_params.has('order_id')) { | ||
| passed_order_id = url_params.get('order_id'); | ||
| } else if (url_params.has('order')) { | ||
| passed_order_id = url_params.get('order'); | ||
| } | ||
|
|
||
| if (passed_order_id) { | ||
| setQueryOrder(passed_order_id); | ||
| } | ||
|
|
||
| return () => setQueryOrder(null); | ||
|
|
||
| // eslint-disable-next-line react-hooks/exhaustive-deps | ||
| }, []); | ||
|
|
||
| if (is_logging_in) { | ||
| return <Loading is_fullscreen />; | ||
| } | ||
| const P2PCashier = observer(() => { | ||
| const { modules } = useStore(); | ||
| const { cashier } = modules; | ||
| const { general_store } = cashier; | ||
| const { setNotificationCount } = general_store; | ||
|
|
||
| return ( | ||
| <P2P | ||
| addNotificationMessage={addNotificationMessage} | ||
| balance={balance} | ||
| client={{ currency, local_currency_config, is_virtual, residence, loginid }} | ||
| current_focus={current_focus} | ||
| filterNotificationMessages={filterNotificationMessages} | ||
| history={history} | ||
| is_dark_mode_on={is_dark_mode_on} | ||
| is_mobile={is_mobile} | ||
| lang={getLanguage()} | ||
| modal_root_id='modal_root' | ||
| order_id={order_id} | ||
| platform={platform} | ||
| Notifications={Notifications} | ||
| poi_url={routes.proof_of_identity} | ||
| refreshNotifications={refreshNotifications} | ||
| removeNotificationByKey={removeNotificationByKey} | ||
| removeNotificationMessage={removeNotificationMessage} | ||
| server_time={server_time} | ||
| setCurrentFocus={setCurrentFocus} | ||
| setNotificationCount={setNotificationCount} | ||
| setOrderId={setQueryOrder} | ||
| setOnRemount={setOnRemount} | ||
| setP2POrderProps={setP2POrderProps} | ||
| should_show_verification={/verification/.test(location.hash)} | ||
| verification_action={action_param} | ||
| verification_code={code_param} | ||
| websocket_api={WS} | ||
| /> | ||
| ); | ||
| return <P2P setNotificationCount={setNotificationCount} />; | ||
| }); | ||
|
|
||
| export default withRouter(P2PCashier); |
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,10 @@ | ||
| import type { TStores } from '@deriv/stores'; | ||
| import type RootStore from './src/stores/index'; | ||
|
|
||
| declare module '@deriv/stores' { | ||
| export function useStore(): TStores & { | ||
| modules: { | ||
| p2p: RootStore; | ||
| }; | ||
| }; | ||
| } |
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
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
Oops, something went wrong.