Page MenuHomePhabricator
Files F3571183

D11100.diff
No OneTemporary
Actions

D11100.diff
View Options

diff --git a/native/account/registration/existing-ethereum-account.react.js b/native/account/registration/existing-ethereum-account.react.js
--- a/native/account/registration/existing-ethereum-account.react.js
+++ b/native/account/registration/existing-ethereum-account.react.js
@@ -9,6 +9,7 @@
import { createLoadingStatusSelector } from 'lib/selectors/loading-selectors.js';
import type { SIWEResult } from 'lib/types/siwe-types.js';
import { useDispatch } from 'lib/utils/redux-utils.js';
+import { usingCommServicesAccessToken } from 'lib/utils/services-utils.js';
import RegistrationButtonContainer from './registration-button-container.react.js';
import RegistrationButton from './registration-button.react.js';
@@ -20,7 +21,10 @@
import { useStyles } from '../../themes/colors.js';
import { UnknownErrorAlertDetails } from '../../utils/alert-messages.js';
import Alert from '../../utils/alert.js';
-import { useLegacySIWEServerCall } from '../siwe-hooks.js';
+import {
+ useIdentityWalletLogInCall,
+ useLegacySIWEServerCall,
+} from '../siwe-hooks.js';
const siweAuthLoadingStatusSelector =
createLoadingStatusSelector(siweAuthActionTypes);
@@ -33,30 +37,47 @@
};
function ExistingEthereumAccount(props: Props): React.Node {
const legacySiweServerCall = useLegacySIWEServerCall();
+ const identityWalletLogInCall = useIdentityWalletLogInCall();
const { params } = props.route;
const dispatch = useDispatch();
const onProceedToLogIn = React.useCallback(async () => {
- try {
- await legacySiweServerCall({ ...params, doNotRegister: true });
- } catch (e) {
- Alert.alert(
- UnknownErrorAlertDetails.title,
- UnknownErrorAlertDetails.message,
- [{ text: 'OK' }],
- {
- cancelable: false,
+ if (usingCommServicesAccessToken) {
+ try {
+ await identityWalletLogInCall(params);
+ } catch (e) {
+ Alert.alert(
+ UnknownErrorAlertDetails.title,
+ UnknownErrorAlertDetails.message,
+ [{ text: 'OK' }],
+ {
+ cancelable: false,
+ },
+ );
+ throw e;
+ }
+ } else {
+ try {
+ await legacySiweServerCall({ ...params, doNotRegister: true });
+ } catch (e) {
+ Alert.alert(
+ UnknownErrorAlertDetails.title,
+ UnknownErrorAlertDetails.message,
+ [{ text: 'OK' }],
+ {
+ cancelable: false,
+ },
+ );
+ throw e;
+ }
+ dispatch({
+ type: setDataLoadedActionType,
+ payload: {
+ dataLoaded: true,
},
- );
- throw e;
+ });
}
- dispatch({
- type: setDataLoadedActionType,
- payload: {
- dataLoaded: true,
- },
- });
- }, [legacySiweServerCall, params, dispatch]);
+ }, [legacySiweServerCall, identityWalletLogInCall, params, dispatch]);
const siweAuthCallLoading = useSelector(
state => siweAuthLoadingStatusSelector(state) === 'loading',

File Metadata

Mime Type
text/plain
Expires
Sun, Dec 29, 8:16 AM (9 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2731271
Default Alt Text
D11100.diff (2 KB)

Event Timeline