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.

Sign up for GitHub

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

Jump to bottom

shontzu/96457/Unable_to_reset_investor_password_for_swap_free_account #9391

Merged
merged 22 commits into from
Sep 18, 2023
Merged

shontzu/96457/Unable_to_reset_investor_password_for_swap_free_account #9391

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
ce13017
fix: fixed the issue where investor password is showing error
hirad-deriv Jun 26, 2023
265a973
fix: removed prop types
hirad-deriv Jun 26, 2023
ba11b82
Merge branch 'master' into Hirad/wall-1152/investor-password-for-mf-c…
hirad-deriv Jul 4, 2023
ba0176d
fix: resolved code smells
hirad-deriv Jul 4, 2023
104a03f
fix: fixed
shontzu-deriv Jul 20, 2023
8595571
Merge branch 'master' into shontzu/96457/Unable_to_reset_investor_pas…
shontzu-deriv Jul 20, 2023
4f1914b
Update cfd-reset-password-modal.tsx
shontzu-deriv Jul 21, 2023
ca599ee
Merge branch 'master' into shontzu/96457/Unable_to_reset_investor_pas…
shontzu-deriv Jul 24, 2023
a718e08
Merge branch 'master' into shontzu/96457/Unable_to_reset_investor_pas…
shontzu-deriv Jul 25, 2023
532ad88
Merge branch 'master' into shontzu/96457/Unable_to_reset_investor_pas…
shontzu-deriv Jul 25, 2023
68e249b
Merge branch 'master' into shontzu/96457/Unable_to_reset_investor_pas…
matin-deriv Jul 25, 2023
8c7d5ba
fix: resolved the conflicts
hirad-deriv Jul 26, 2023
d3cb640
fix: made changes based on the suggestions
hirad-deriv Jul 26, 2023
fa8af2c
fix: removed title_type
hirad-deriv Jul 26, 2023
62d9a3f
Merge branch 'master' of github.com:binary-com/deriv-app into shontzu…
shontzu-deriv Aug 7, 2023
21899cb
Merge branch 'shontzu/96457/Unable_to_reset_investor_password_for_swa…
shontzu-deriv Sep 1, 2023
cc756bd
chore: added derived_v in reset_password_intent
shontzu-deriv Sep 1, 2023
c3ab29a
Merge branch 'master' of github.com:binary-com/deriv-app into shontzu…
shontzu-deriv Sep 1, 2023
2d8e8c6
fix: reset investor password for MT5 derived vanuatu account
shontzu-deriv Sep 4, 2023
7c630ed
Merge pull request #16 from shontzu-deriv/shontzu/CFDS-898/Unable-to-…
shontzu-deriv Sep 4, 2023
126a892
Merge branch 'Hirad/wall-1152/investor-password-for-mf-clients-error'…
shontzu-deriv Sep 18, 2023
8a9f5a5
Merge branch 'shontzu/96457/Unable_to_reset_investor_password_for_swa…
shontzu-deriv Sep 18, 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
2 changes: 1 addition & 1 deletion packages/cfd/src/Containers/cfd-reset-password-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const ResetPasswordIntent = ({ current_list, children, is_eu, ...props }: TReset
const reset_password_type = localStorage.getItem('cfd_reset_password_type') || 'main'; // Default to main
const has_intent =
reset_password_intent &&
/(real|demo)\.(financial_stp|financial|synthetic|synthetic_svg|synthetic_bvi|financial_svg|financial_bvi|financial_fx|financial_v)/.test(
/(real|demo)\.(all|all_svg|dxtrade|synthetic|synthetic_svg|synthetic_bvi|financial|financial_svg|financial_stp|financial_bvi|financial_fx|financial_v)/.test(
reset_password_intent
);

Expand Down
2 changes: 1 addition & 1 deletion packages/cfd/src/Containers/dmt5-trade-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ const DMT5TradeModal = ({
const account_type = getCFDAccountKey({
market_type: mt5_trade_account.market_type,
sub_account_type: mt5_trade_account.sub_account_type,
platform: CFD_PLATFORMS.DMT5,
platform: CFD_PLATFORMS.MT5,
shortcode: mt5_trade_account.landing_company_short,
});
onPasswordManager(
Expand Down