Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ameerul /remove p2p from cashier #7777

Merged
merged 19 commits into from
Apr 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9a3da34
chore: cherry picked
ameerul-deriv Mar 1, 2023
ee839a6
chore: merged develop and fixed conflicts
ameerul-deriv Mar 3, 2023
60b4e8e
Merge branch 'develop' of github.com:binary-com/deriv-app into remove…
ameerul-deriv Mar 8, 2023
634e42c
chore: fixed issues with server time
ameerul-deriv Mar 8, 2023
9c14241
chore: replaced notifications with new hook and removed props from app
ameerul-deriv Mar 8, 2023
2afbd5f
Merge branch 'master' of github.com:binary-com/deriv-app into remove-…
ameerul-deriv Mar 9, 2023
1bf6580
chore: fixed merge conflicts with automate daily limit feature and ma…
ameerul-deriv Mar 20, 2023
b118b43
chore: fixed history routing issue
ameerul-deriv Mar 20, 2023
2f30e5b
Merge branch 'master' of github.com:binary-com/deriv-app into remove-…
ameerul-deriv Mar 21, 2023
fcca7b2
chore: fixed order routing issue, and merge conflicts
ameerul-deriv Mar 23, 2023
f8186cf
chore: removed p2p-cashier
ameerul-deriv Mar 23, 2023
0d30162
chore: fixed tests, added TODOs
ameerul-deriv Mar 23, 2023
c40edc7
chore: removed d.ts files
ameerul-deriv Mar 24, 2023
9784f36
Merge branch 'master' of github.com:binary-com/deriv-app into remove-…
ameerul-deriv Mar 24, 2023
14fc426
Merge branch 'master' of github.com:binary-com/deriv-app into remove-…
ameerul-deriv Apr 5, 2023
b516099
Merge branch 'master' into remove-p2p-cashier
ameerul-deriv Apr 5, 2023
a2beaa5
chore: fixed conflicts
ameerul-deriv Apr 12, 2023
1ee0f95
Merge branch 'remove-p2p-cashier' of github.com:ameerul-deriv/deriv-a…
ameerul-deriv Apr 12, 2023
cd3b7ec
Merge branch 'master' of github.com:binary-com/deriv-app into remove-…
ameerul-deriv Apr 12, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions packages/cashier/src/constants/routes-config.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import React from 'react';
import P2P from '@deriv/p2p';
import { routes, moduleLoader } from '@deriv/shared';
import { localize } from '@deriv/translations';
import { Cashier } from '../containers';
import { AccountTransfer, Deposit, OnRamp, P2PCashier, PaymentAgent, PaymentAgentTransfer, Withdrawal } from '../pages';
import { AccountTransfer, Deposit, OnRamp, PaymentAgent, PaymentAgentTransfer, Withdrawal } from '../pages';
import { TRouteConfig, TRoute } from '../types';

// Error Routes
Expand Down Expand Up @@ -52,13 +53,13 @@ const initRoutesConfig = (): TRouteConfig[] => [
},
{
path: routes.cashier_p2p,
component: P2PCashier,
component: P2P,
getTitle: () => localize('Deriv P2P'),
icon_component: 'IcDp2p',
},
{
path: routes.cashier_p2p_verification,
component: P2PCashier,
component: P2P,
getTitle: () => localize('Deriv P2P'),
icon_component: 'IcDp2p',
is_invisible: true,
Expand Down
3 changes: 1 addition & 2 deletions packages/cashier/src/pages/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import AccountTransfer from './account-transfer';
import Deposit from './deposit';
import OnRamp from './on-ramp';
import P2PCashier from './p2p-cashier';
import PaymentAgent from './payment-agent';
import PaymentAgentTransfer from './payment-agent-transfer';
import Withdrawal from './withdrawal';

export { AccountTransfer, Deposit, OnRamp, P2PCashier, PaymentAgent, PaymentAgentTransfer, Withdrawal };
export { AccountTransfer, Deposit, OnRamp, PaymentAgent, PaymentAgentTransfer, Withdrawal };

This file was deleted.

3 changes: 0 additions & 3 deletions packages/cashier/src/pages/p2p-cashier/index.ts

This file was deleted.

170 changes: 0 additions & 170 deletions packages/cashier/src/pages/p2p-cashier/p2p-cashier.tsx

This file was deleted.

Loading