@@ -25,7 +25,7 @@ import WorkspaceOwnerPaymentCardForm from './WorkspaceOwnerPaymentCardForm';
2525
2626type WorkspaceOwnerChangeWrapperPageProps = WithPolicyOnyxProps & PlatformStackScreenProps < SettingsNavigatorParamList , typeof SCREENS . WORKSPACE . OWNER_CHANGE_CHECK > ;
2727
28- function WorkspaceOwnerChangeWrapperPage ( { route, policy} : WorkspaceOwnerChangeWrapperPageProps ) {
28+ function WorkspaceOwnerChangeWrapperPage ( { route, policy, isLoadingPolicy } : WorkspaceOwnerChangeWrapperPageProps ) {
2929 const styles = useThemeStyles ( ) ;
3030 const { translate} = useLocalize ( ) ;
3131 const [ privateStripeCustomerID ] = useOnyx ( ONYXKEYS . NVP_PRIVATE_STRIPE_CUSTOMER_ID , { canBeMissing : true } ) ;
@@ -39,12 +39,12 @@ function WorkspaceOwnerChangeWrapperPage({route, policy}: WorkspaceOwnerChangeWr
3939 const shouldShowPaymentCardForm = error === CONST . POLICY . OWNERSHIP_ERRORS . NO_BILLING_CARD || isAuthRequired ;
4040
4141 useEffect ( ( ) => {
42- if ( policy ?. isChangeOwnerFailed || policy ?. isChangeOwnerSuccessful ) {
42+ if ( isLoadingPolicy || policy ?. isChangeOwnerFailed || policy ?. isChangeOwnerSuccessful ) {
4343 return ;
4444 }
4545 requestWorkspaceOwnerChange ( policy , currentUserPersonalDetails . accountID , currentUserPersonalDetails . login ?? '' ) ;
4646 // eslint-disable-next-line react-hooks/exhaustive-deps
47- } , [ policyID ] ) ;
47+ } , [ policyID , isLoadingPolicy ] ) ;
4848
4949 useEffect ( ( ) => {
5050 if ( ! policy || policy ?. isLoading ) {
@@ -72,6 +72,8 @@ function WorkspaceOwnerChangeWrapperPage({route, policy}: WorkspaceOwnerChangeWr
7272 }
7373 } , [ accountID , backTo , policy , policy ?. errorFields ?. changeOwner , policyID ] ) ;
7474
75+ const isLoading = isLoadingPolicy || ! ! policy ?. isLoading ;
76+
7577 return (
7678 < AccessOrNotFoundWrapper
7779 accessVariants = { [ CONST . POLICY . ACCESS_VARIANTS . ADMIN , CONST . POLICY . ACCESS_VARIANTS . PAID ] }
@@ -92,9 +94,9 @@ function WorkspaceOwnerChangeWrapperPage({route, policy}: WorkspaceOwnerChangeWr
9294 } }
9395 />
9496 < View style = { [ styles . containerWithSpaceBetween , error !== CONST . POLICY . OWNERSHIP_ERRORS . NO_BILLING_CARD ? styles . ph5 : styles . ph0 , styles . pb0 ] } >
95- { ! ! policy ?. isLoading && < FullScreenLoadingIndicator /> }
97+ { isLoading && < FullScreenLoadingIndicator /> }
9698 { shouldShowPaymentCardForm && < WorkspaceOwnerPaymentCardForm policy = { policy } /> }
97- { ! policy ?. isLoading && ! shouldShowPaymentCardForm && (
99+ { ! isLoading && ! shouldShowPaymentCardForm && (
98100 < WorkspaceOwnerChangeCheck
99101 policy = { policy }
100102 accountID = { accountID }
0 commit comments