Skip to content

Commit

Permalink
Feat new flow mf account (#35)
Browse files Browse the repository at this point in the history 
* fix: resolved issues with index

* ref: refactored trade assessment code

* fix: added unique key

* fix: refactored response pick

* feat: added check to disable financial and trade assessment for not risk clients

* feat: made changes to dialog

* fix: modified text content

* fix: risk status flag

* fix: css issues

* fix: added missing store state

* fix: modified conditions

* fix: added new flag to check

* resolved conflict in ui-store

* fix bug (deriv-com#6154)

* yauheni/ 70488/ edit note in self-exclusion message box (deriv-com#6044)

* text|edit_note_self_exclusion_message_box

* test fix

* regexp in tests fix

* accident text deleted

* popup message text fix

* text fixes

* test text query fix

Co-authored-by: “yauheni-kryzhyk-deriv” <“yauheni@deriv.me”>

* Akmal / Ignore IDV verification if client is high risk && withdrawals are locked (deriv-com#4644)

* Ignore IDV verification if client is high risk

* Fix formatting

* Fix cfd-poi issue due to client store unavailability

* Fix formatting

* Merge with master

* Fix formatting

* Merge with master

* Revert "Merge with master"

This reverts commit 4bead99.

* Fix merge issues

* Chain extra condition to cover wrong status returned from BE

* Fix: wrong component shown when manual upload is triggered

* fix:tax_number_validation (deriv-com#6259)

* george / rm65047 / convert routes, cashier, error-component components to TS (deriv-com#6361)

* perf(cashier routes): convert csahier routes to TS

* perf(cashier routes): convert error-component to TS

* refactor(error-dialog, types): refactor error-dialog types, move error type to shared types

* perf(cashier): convert cashier to TS

* perf(types): refactor types

* refactor(routes with sub routes): refactor default subroute

* refactor(types): add/refactor server error type

* test: refactor pathname

* refactor(route types): refactor route types

* fix: fix ts error in React.Suspense

* george / rm65033 / ts migration of withdraw UI components (deriv-com#6343)

* perf(cashier withdraw): convert withdrawal-verification-email to TS

* perf: add data-testid for checklist action

* perf(cashier withdraw): convert withdrawal-locked to TS

* perf(types): add types for TClinetStore

* perf(cashier withdraw): convert withdraw to TS

* perf(cashier withdraw): convert crypto-withdraw-receipt to TS

* perf(cashier withdraw): convert crypto-withdraw-form to TS

* perf(cashier withdraw): convert withdrawal to TS

* refactor(cashier withdraw): refactor array syntax (ts)

* test(cashier withdraw): remove eslint disables for tests

* update deriv go redirection link (deriv-com#6386)

* Farzin/68320/Update cashier withdrawal locked status if PA already withdraw all his allowable withdrawal amount (deriv-com#6032)

* fix(cashier): ✨ handle `PACommisionWithdrawalLimit` state in `CashierLocked`

* test(cashier): ✅ add test case to `CashierLocked` for `PACommisionWithdrawalLimit`

* Trigger Build

* Jim/73479/appstore-workspace-ts-fix (deriv-com#6208)

* chore: update appstore tsconfig

* chore: update appstore tsconfig

* chore: add react and types/react packages to appstore

* refactor: remove unnecessary includes

* refactor: change from reexports to import -> export

* Niloofar Sadeghi / Trader Typescript configuration issue (deriv-com#6275)

* fix: trader typscript configuration issue

* fix: tsc errors on trader

* Niloofar Sadeghi / Add typescript configuration on reports (deriv-com#6276)

* chores: add typescript configuration on reports

* fix: remove extra paths

* fix: revert removing packages

* george / rm65041 / migrate p2p-cashier component to TS (deriv-com#6177)

* refactor(p2p-cashier): migrate p2p-cashier component to TS

* commit

* perf(types): add types for notification store

* perf(types): add types for ui store

* perf(types): convert p2p-cashier to TS

* refactor(types): change RootStore type to TRootStore

* test(p2p-cashier): test fix (change wrapper order fro p2p-cashier component)

* refactor(types): refactor current_focus type

* test(p2p-cashier): remove eslint disables

* Vinu/Ts onramp cashier (deriv-com#5727)

* refactor: converted on-ramp module into typescript

* refactor: included type related to store in on-ramp

* ts fix in on-ramp-provider-card.spec.tsx

* added path in tsconfig

* added path in tsconfig

* added type for react-router-dom

* added ts related change required for migrating all components (deriv-com#5760)

* changed the name of data-testid in on-ramp component

* ts-migration-crypto-fiat-converter (deriv-com#5796)

* Trigger build

* Update package-lock

* ts-migration-cashier-notifications (deriv-com#5765)

* implemented review comments and updated branch as per latest upstream branch

* bahar/funds_protection_component-ts-migration (deriv-com#5756)

* funds_protection_component-ts-migration

* remove_extra_type_file

* fix_merge_issue

* hamid/migrate-transfer-confirm-to-ts (deriv-com#5815)

* Migrate TransferConfirm to TS

* Rename component in test file

* Replace Confirm with TransferConfirm in PAs

* Enhance Tests

* ts-migration-page-404 (deriv-com#5766)

* corrected imports in on-ramp pages

* coreected setSideNotes type in on-ramp file

* arranged the order of imports in on-ramp

* refactor: add menu-option type to types folder in cashier

* replaced type for FormEvent in on-ramp from Types

* added types from TRootstore

* added types of TClientStore, TUiStore and TCommonStore in on-ramp

Co-authored-by: Nijil Nirmal <nijil@deriv.com>
Co-authored-by: Bahar <bahar@firstsource.tech>
Co-authored-by: Hamid <hamid@re-work.dev>

* hamid/65036/migrate-account-transfer-to-ts (deriv-com#6305)

* Migrate Account Transfer to TS

* Enhance type names

* Remove eslint ignore line

* Remove generic type from useState

* trigger tests

* Fix test errors

* Change data-testid name

* Niloofar Sadeghi / Account typscript configuration issue (deriv-com#6273)

* fix: account typscript configuration issue

* text: remove include comment on account tsconfig

* fix: added missing store

* Niloofar Sadeghi / Circleci issue (deriv-com#6402)

* fix: circle ci issue

* fix: circle ci issue

* Niloofar Sadeghi / Add typescript to each workspace dependency (deriv-com#6306)

* build: add typescript to all packages

* build: move typescript to devdependency

* add some TS configs to eslint file

* fix: conflicts

* Shayan/74388/fix ts config on cfd (deriv-com#6351)

* checking circle/ci test

* removed test changes

* fix: updated tsconfig and fixed some errors

* fix: updated tsconfig and added globals.d.ts

* chore: removed experimentalsDecorators from local config

* translations: 📚 sync translations with crowdin (deriv-com#6405)

Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>

* fix: status

* hamid/75726/missing-grey-box-side-note (deriv-com#6410)

* Fix sidenote in mobile view of account-transfer

* Remove duplicate title

* Add sideNote title

Co-authored-by: Eduard Hrachou <107860964+eduard-deriv@users.noreply.github.com>
Co-authored-by: yauheni-kryzhyk-deriv <103182683+yauheni-kryzhyk-deriv@users.noreply.github.com>
Co-authored-by: “yauheni-kryzhyk-deriv” <“yauheni@deriv.me”>
Co-authored-by: Akmal Djumakhodjaev <akmal@binary.com>
Co-authored-by: amina-deriv <84661147+amina-deriv@users.noreply.github.com>
Co-authored-by: George Usynin <103181646+george-usynin-binary@users.noreply.github.com>
Co-authored-by: Carol Sachdeva <58209918+carol-binary@users.noreply.github.com>
Co-authored-by: Farzin Mirzaie <72082844+farzin-fs@users.noreply.github.com>
Co-authored-by: Jim Daniels Wasswa <104334373+jim-deriv@users.noreply.github.com>
Co-authored-by: Niloofar Sadeghi <93518187+niloo-fs@users.noreply.github.com>
Co-authored-by: vinu-deriv <100689171+vinu-deriv@users.noreply.github.com>
Co-authored-by: Nijil Nirmal <nijil@deriv.com>
Co-authored-by: Bahar <bahar@firstsource.tech>
Co-authored-by: Hamid <hamid@re-work.dev>
Co-authored-by: Shayan Khaleghparast <100833613+iman-fs@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: DerivFE <80095553+DerivFE@users.noreply.github.com>
  • Loading branch information
@likhith-deriv @eduard-deriv
@yauheni-deriv @akmal-deriv @amina-deriv @heorhi-deriv @carolsachdeva @farzin-deriv @jim-deriv @niloofar-deriv @vinu-deriv @nijil-deriv @shayan-deriv @github-actions @DerivFE
18 people authored Sep 8, 2022
1 parent 10efeae commit 9ccaa6d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 13 deletions.
10 changes: 0 additions & 10 deletions ...hier/src/pages/account-transfer/account-transfer-form/account-transfer-form-side-note.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,16 +110,6 @@ const AccountTransferNote = ({

return (
<div className='account-transfer-form__notes'>
<DesktopWrapper>
<Text
as='h2'
color='prominent'
weight='bold'
className='cashier__header account-transfer-form__notes-header'
>
<Localize i18n_default_text='Notes' />
</Text>
</DesktopWrapper>
<AccountTransferBullet>
{is_dxtrade_allowed ? (
<Localize
Expand Down
4 changes: 4 additions & 0 deletions packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@
padding: 1.6rem 0;
}

@include desktop {
margin-top: 0.8rem;
}

.account-transfer-form__notes-header {
margin-top: 0;
}
Expand Down
11 changes: 8 additions & 3 deletions packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import ErrorDialog from 'Components/error-dialog';
import PercentageSelector from 'Components/percentage-selector';
import RecentTransaction from 'Components/recent-transaction';
import AccountTransferNote from './account-transfer-form-side-note';
import SideNote from 'Components/side-note';
import './account-transfer-form.scss';

type TSelect = {
Expand Down Expand Up @@ -324,7 +325,11 @@ const AccountTransferForm = ({
is_mt_transfer={is_mt_transfer}
/>
);
setSideNotes(side_notes);
setSideNotes([
<SideNote title={<Localize i18n_default_text='Notes' />} key={0}>
{side_notes}
</SideNote>,
]);
}
}, [transfer_fee, selected_from, selected_to, minimum_fee, from_accounts, is_dxtrade_allowed, crypto_transactions]); // eslint-disable-line react-hooks/exhaustive-deps

Expand Down Expand Up @@ -559,7 +564,7 @@ const AccountTransferForm = ({
<Localize i18n_default_text='Transfer' />
</Button>
</div>
<MobileWrapper>
<SideNote title={<Localize i18n_default_text='Notes' />} is_mobile>
{is_crypto && crypto_transactions?.length ? <RecentTransaction /> : null}
<AccountTransferNote
allowed_transfers_count={{
Expand All @@ -575,7 +580,7 @@ const AccountTransferForm = ({
is_dxtrade_transfer={is_dxtrade_transfer}
is_mt_transfer={is_mt_transfer}
/>
</MobileWrapper>
</SideNote>
<ErrorDialog error={error} />
</Form>
)}
Expand Down

0 comments on commit 9ccaa6d

Please sign in to comment.