Skip to content
Merged
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion src/pages/iou/request/step/IOURequestStepConfirmation.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import ActivityIndicator from '@components/ActivityIndicator';
import DragAndDropConsumer from '@components/DragAndDrop/Consumer';
import DragAndDropProvider from '@components/DragAndDrop/Provider';
import DropZoneUI from '@components/DropZone/DropZoneUI';
Expand Down Expand Up @@ -813,7 +814,16 @@ function IOURequestStepConfirmation({
};

if (isLoadingTransaction) {
return <FullScreenLoadingIndicator />;
// When embedded on IOURequestStartPage (shouldHideHeader), the parent header and tab bar stay visible,
// so per UI-1 use ActivityIndicator (the user can still go back). In the standalone RHP route there is
// no chrome behind this early return, so keep the fullscreen loader.
return shouldHideHeader ? (
<View style={[styles.flex1, styles.fullScreenLoading]}>
<ActivityIndicator size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE} />
</View>
) : (
<FullScreenLoadingIndicator shouldUseGoBackButton />
);
}

const showNextTransaction = () => {
Expand Down
Loading