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

Fix blinking on Accounting Centre Pane when clicking of modal asking for setting up of 2FA when connecting to Xero #50371

Merged
merged 2 commits into from
Oct 8, 2024
Merged

Fix blinking on Accounting Centre Pane when clicking of modal asking for setting up of 2FA when connecting to Xero #50371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d0ecd5
remove unnecessary dismissModal
c3024 Oct 8, 2024
e475488
migrate to useOnyx
c3024 Oct 8, 2024
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
20 changes: 4 additions & 16 deletions src/components/ConnectToXeroFlow/index.native.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React, {useEffect, useRef, useState} from 'react';
import type {OnyxEntry} from 'react-native-onyx';
import {useOnyx, withOnyx} from 'react-native-onyx';
import {useOnyx} from 'react-native-onyx';
import {WebView} from 'react-native-webview';
import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
Expand All @@ -14,19 +13,13 @@ import Navigation from '@libs/Navigation/Navigation';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import type {Session} from '@src/types/onyx';
import type {ConnectToXeroFlowProps} from './types';

type ConnectToXeroFlowOnyxProps = {
/** Session info for the currently logged in user. */
session: OnyxEntry<Session>;
};

function ConnectToXeroFlow({policyID, session}: ConnectToXeroFlowProps & ConnectToXeroFlowOnyxProps) {
function ConnectToXeroFlow({policyID}: ConnectToXeroFlowProps) {
const {translate} = useLocalize();
const webViewRef = useRef<WebView>(null);
const [isWebViewOpen, setWebViewOpen] = useState(false);

const [session] = useOnyx(ONYXKEYS.SESSION);
const authToken = session?.authToken ?? null;

const [account] = useOnyx(ONYXKEYS.ACCOUNT);
Expand All @@ -51,7 +44,6 @@ function ConnectToXeroFlow({policyID, session}: ConnectToXeroFlowProps & Connect
<RequireTwoFactorAuthenticationModal
onSubmit={() => {
setIsRequire2FAModalOpen(false);
Navigation.dismissModal();
Navigation.navigate(ROUTES.SETTINGS_2FA.getRoute(ROUTES.POLICY_ACCOUNTING.getRoute(policyID), getXeroSetupLink(policyID)));
}}
onCancel={() => setIsRequire2FAModalOpen(false)}
Expand Down Expand Up @@ -91,8 +83,4 @@ function ConnectToXeroFlow({policyID, session}: ConnectToXeroFlowProps & Connect

ConnectToXeroFlow.displayName = 'ConnectToXeroFlow';

export default withOnyx<ConnectToXeroFlowProps & ConnectToXeroFlowOnyxProps, ConnectToXeroFlowOnyxProps>({
session: {
key: ONYXKEYS.SESSION,
},
})(ConnectToXeroFlow);
export default ConnectToXeroFlow;
1 change: 0 additions & 1 deletion src/components/ConnectToXeroFlow/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ function ConnectToXeroFlow({policyID}: ConnectToXeroFlowProps) {
<RequireTwoFactorAuthenticationModal
onSubmit={() => {
setIsRequire2FAModalOpen(false);
Navigation.dismissModal();
Navigation.navigate(ROUTES.SETTINGS_2FA.getRoute(ROUTES.POLICY_ACCOUNTING.getRoute(policyID), getXeroSetupLink(policyID)));
}}
onCancel={() => {
Expand Down
Loading