Skip to content

Commit 9ad3142

Browse files
authored
Merge pull request #10432 from Expensify/arosiclair-unblock-wpws
Remove blocking loading spinner from WorkspacePagewithSections
2 parents 8cc92aa + 5cb48a3 commit 9ad3142

File tree

1 file changed

+10
-19
lines changed

1 file changed

+10
-19
lines changed

src/pages/workspace/WorkspacePageWithSections.js

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
3-
import {ActivityIndicator, View, ScrollView} from 'react-native';
3+
import {View, ScrollView} from 'react-native';
44
import {withOnyx} from 'react-native-onyx';
55
import lodashGet from 'lodash/get';
66
import styles from '../../styles/styles';
7-
import themeColors from '../../styles/themes/default';
87
import Navigation from '../../libs/Navigation/Navigation';
98
import compose from '../../libs/compose';
109
import ROUTES from '../../ROUTES';
@@ -104,24 +103,16 @@ class WorkspacePageWithSections extends React.Component {
104103
onBackButtonPress={() => Navigation.navigate(ROUTES.getWorkspaceInitialRoute(policyID))}
105104
onCloseButtonPress={() => Navigation.dismissModal()}
106105
/>
107-
{this.props.reimbursementAccount.loading ? (
108-
<View style={[styles.flex1, styles.alignItemsCenter, styles.justifyContentCenter]}>
109-
<ActivityIndicator color={themeColors.spinner} size="large" />
106+
<ScrollView
107+
style={[styles.settingsPageBackground, styles.flex1, styles.w100]}
108+
>
109+
<View style={[styles.w100, styles.flex1]}>
110+
111+
{this.props.children(hasVBA, policyID, isUsingECard)}
112+
110113
</View>
111-
) : (
112-
<>
113-
<ScrollView
114-
style={[styles.settingsPageBackground, styles.flex1, styles.w100]}
115-
>
116-
<View style={[styles.w100, styles.flex1]}>
117-
118-
{this.props.children(hasVBA, policyID, isUsingECard)}
119-
120-
</View>
121-
</ScrollView>
122-
{this.props.footer}
123-
</>
124-
)}
114+
</ScrollView>
115+
{this.props.footer}
125116
</ScreenWrapper>
126117
);
127118
}

0 commit comments

Comments
 (0)