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

Migrate OnfidoStep.js to a functional component #27784

Merged
merged 8 commits into from
Sep 22, 2023
Merged

Migrate OnfidoStep.js to a functional component #27784

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f3e3eaf
chore: refactor OnfidoStep class component to a functional one
adhorodyski Sep 19, 2023
15c8d62
chore: extract onfido and navigation handlers
adhorodyski Sep 19, 2023
6f296f1
chore: fix import style
adhorodyski Sep 19, 2023
3d50060
chore: rename callbacks
adhorodyski Sep 19, 2023
f901067
chore: add displayName for the component
adhorodyski Sep 20, 2023
dd3d3d5
chore: declare numbers without a separator
adhorodyski Sep 20, 2023
3b2e02c
fix: use correct fallback when navigating back
adhorodyski Sep 21, 2023
4c5c73c
chore: satisfy prettier
adhorodyski Sep 22, 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
113 changes: 58 additions & 55 deletions src/pages/EnablePayments/OnfidoStep.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import React, {useCallback} from 'react';
import {withOnyx} from 'react-native-onyx';
import Onfido from '../../components/Onfido';
import ONYXKEYS from '../../ONYXKEYS';
Expand All @@ -7,8 +7,7 @@ import Navigation from '../../libs/Navigation/Navigation';
import CONST from '../../CONST';
import HeaderWithBackButton from '../../components/HeaderWithBackButton';
import * as Wallet from '../../libs/actions/Wallet';
import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
import compose from '../../libs/compose';
import useLocalize from '../../hooks/useLocalize';
import Growl from '../../libs/Growl';
import OnfidoPrivacy from './OnfidoPrivacy';
import walletOnfidoDataPropTypes from './walletOnfidoDataPropTypes';
Expand All @@ -18,8 +17,6 @@ import ROUTES from '../../ROUTES';
const propTypes = {
/** Stores various information used to build the UI and call any APIs */
walletOnfidoData: walletOnfidoDataPropTypes,

...withLocalizePropTypes,
};

const defaultProps = {
Expand All @@ -29,60 +26,66 @@ const defaultProps = {
},
};

class OnfidoStep extends React.Component {
/**
* @returns {boolean|*}
*/
canShowOnfido() {
return this.props.walletOnfidoData.hasAcceptedPrivacyPolicy && !this.props.walletOnfidoData.isLoading && !this.props.walletOnfidoData.error && this.props.walletOnfidoData.sdkToken;
}
function OnfidoStep({walletOnfidoData}) {
const {translate} = useLocalize();
adhorodyski marked this conversation as resolved.
Show resolved Hide resolved

const shouldShowOnfido = walletOnfidoData.hasAcceptedPrivacyPolicy && !walletOnfidoData.isLoading && !walletOnfidoData.error && walletOnfidoData.sdkToken;

const goBack = useCallback(() => {
Navigation.goBack(ROUTES.HOME);
}, []);

const goToPreviousStep = useCallback(() => {
Wallet.updateCurrentStep(CONST.WALLET.STEP.ADDITIONAL_DETAILS);
}, []);

const reportError = useCallback(() => {
Growl.error(translate('onfidoStep.genericError'), 10000);
}, [translate]);

render() {
return (
<>
<HeaderWithBackButton
title={this.props.translate('onfidoStep.verifyIdentity')}
onBackButtonPress={() => Wallet.updateCurrentStep(CONST.WALLET.STEP.ADDITIONAL_DETAILS)}
/>
<FullPageOfflineBlockingView>
{this.canShowOnfido() ? (
<Onfido
sdkToken={this.props.walletOnfidoData.sdkToken}
onError={() => {
Growl.error(this.props.translate('onfidoStep.genericError'), 10000);
}}
onUserExit={() => {
Navigation.goBack(ROUTES.HOME);
}}
onSuccess={(data) => {
BankAccounts.verifyIdentity({
onfidoData: JSON.stringify({
...data,
applicantID: this.props.walletOnfidoData.applicantID,
}),
});
}}
/>
) : (
<OnfidoPrivacy walletOnfidoData={this.props.walletOnfidoData} />
)}
</FullPageOfflineBlockingView>
</>
);
}
const verifyIdentity = useCallback(
(data) => {
BankAccounts.verifyIdentity({
onfidoData: JSON.stringify({
...data,
applicantID: walletOnfidoData.applicantID,
}),
});
},
[walletOnfidoData.applicantID],
);

return (
<>
<HeaderWithBackButton
title={translate('onfidoStep.verifyIdentity')}
onBackButtonPress={goToPreviousStep}
/>
<FullPageOfflineBlockingView>
{shouldShowOnfido ? (
<Onfido
sdkToken={walletOnfidoData.sdkToken}
onUserExit={goBack}
onError={reportError}
onSuccess={verifyIdentity}
/>
) : (
<OnfidoPrivacy walletOnfidoData={walletOnfidoData} />
)}
</FullPageOfflineBlockingView>
</>
);
}

OnfidoStep.propTypes = propTypes;
OnfidoStep.defaultProps = defaultProps;
OnfidoStep.displayName = 'OnfidoStep';
adhorodyski marked this conversation as resolved.
Show resolved Hide resolved

export default compose(
withLocalize,
withOnyx({
walletOnfidoData: {
key: ONYXKEYS.WALLET_ONFIDO,
export default withOnyx({
walletOnfidoData: {
key: ONYXKEYS.WALLET_ONFIDO,

// Let's get a new onfido token each time the user hits this flow (as it should only be once)
initWithStoredValues: false,
},
}),
)(OnfidoStep);
// Let's get a new onfido token each time the user hits this flow (as it should only be once)
initWithStoredValues: false,
},
})(OnfidoStep);
Loading