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

fix: fixed redirection back to dp2p #7609

Merged
merged 21 commits into from
May 30, 2023
Merged

fix: fixed redirection back to dp2p #7609

Changes from 2 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
947eda5
fix: fixed redirection back to dp2p
nada-deriv Feb 15, 2023
58b5008
fix: pr comment resolved
nada-deriv Feb 15, 2023
b17d512
fix: merged with latest develop
nada-deriv Feb 23, 2023
0274eb7
fix: updated with latest master
nada-deriv Mar 8, 2023
d4ce66e
fix: merged with latest master
nada-deriv Mar 16, 2023
4406c28
fix: show button for idv poi submission
nada-deriv Mar 16, 2023
de0a0c9
fix: pr comment fix
nada-deriv Mar 16, 2023
7c5d279
fix: pr comment fix
nada-deriv Mar 16, 2023
e514998
fix: added destructuring default value
nada-deriv Mar 17, 2023
2cd66a2
fix: style fix
nada-deriv Mar 17, 2023
35c889d
fix: merged with latest master
nada-deriv Mar 17, 2023
6d8dc58
fix: moved inline function outside
nada-deriv Mar 20, 2023
806b4f7
fix: updated with latest master
nada-deriv Mar 22, 2023
3043b04
fix: style fix for redirect button in idv submit
nada-deriv Mar 22, 2023
4754102
fix: merge conflicts resolved
nada-deriv Apr 3, 2023
83a1bf5
fix: merge with master
nada-deriv Apr 7, 2023
a4611a1
fix: updated with latest master
nada-deriv Apr 18, 2023
49b7cf9
fix: check for p2p using platform param
nada-deriv Apr 18, 2023
1e9a998
fix: removed unused function
nada-deriv Apr 18, 2023
0d6a836
fix: changed param checking from p2p to dp2p
nada-deriv Apr 24, 2023
e8bd136
fix: persist local storage value until cleared
nada-deriv Apr 24, 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
15 changes: 13 additions & 2 deletions packages/account/src/Sections/Verification/ProofOfIdentity/proof-of-identity-container.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Button, Loading } from '@deriv/components';
import { getPlatformRedirect, WS } from '@deriv/shared';
import { getPlatformRedirect, platforms, WS } from '@deriv/shared';
import { Localize } from '@deriv/translations';
import { useHistory } from 'react-router';
import DemoMessage from 'Components/demo-message';
Expand Down Expand Up @@ -97,7 +97,18 @@ const ProofOfIdentityContainer = ({
}

const redirect_button = should_show_redirect_btn && (
<Button primary className='proof-of-identity__redirect' onClick={() => routeBackTo(from_platform.route)}>
<Button
primary
className='proof-of-identity__redirect'
onClick={() => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we move this function outside here?

if (platforms[from_platform.name?.toLowerCase()].is_hard_redirect) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what if platforms[from_platform.name] is null? add a guard for that

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

best to assign platforms[from_platform?.name] to a variable and then de-structuring is_hard_redirect and url out from it. This way you can add a guard by assigning a default value.

const platform = platforms[from_platform.name?.toLowerCase()];
const { is_hard_redirect || '', url || '' } = platform;

const url = platforms[from_platform.name?.toLowerCase()]?.url;
window.location.href = url;
} else {
routeBackTo(from_platform.route);
}
}}
>
<Localize i18n_default_text='Back to {{platform_name}}' values={{ platform_name: from_platform.name }} />
</Button>
);
Expand Down