Skip to content

Commit ccd01b2

Browse files
authored
Merge pull request Expensify#66011 from allgandalf/fix/65993
[CP Staging] [Fix]: Missing Copy on Tag Import Screen
2 parents 0523929 + e96e173 commit ccd01b2

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

src/components/ImportSpreadsheet.tsx

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import useOnyx from '@hooks/useOnyx';
88
import useResponsiveLayout from '@hooks/useResponsiveLayout';
99
import useThemeStyles from '@hooks/useThemeStyles';
1010
import {setSpreadsheetData} from '@libs/actions/ImportSpreadsheet';
11+
import {setImportedSpreadsheetIsImportingMultiLevelTags} from '@libs/actions/Policy/Tag';
1112
import {canUseTouchScreen} from '@libs/DeviceCapabilities';
1213
import {splitExtensionFromFileName} from '@libs/fileDownload/FileUtils';
1314
import Navigation from '@libs/Navigation/Navigation';
@@ -155,7 +156,9 @@ function ImportSpreadsheet({backTo, goTo}: ImportSpreadsheetProps) {
155156
{...panResponder.panHandlers}
156157
>
157158
<Text style={[styles.textFileUpload, styles.mb1]}>{spreadsheet?.isImportingMultiLevelTags ? translate('spreadsheet.import') : translate('spreadsheet.upload')}</Text>
158-
<RenderHTML html={getTextForImportModal()} />
159+
<Text style={[styles.subTextFileUpload, styles.textSupporting]}>
160+
<RenderHTML html={getTextForImportModal()} />
161+
</Text>
159162
</View>
160163
<FilePicker acceptableFileTypes={acceptableFileTypes}>
161164
{({openPicker}) => (
@@ -195,7 +198,12 @@ function ImportSpreadsheet({backTo, goTo}: ImportSpreadsheetProps) {
195198
<View style={[styles.flex1, safeAreaPaddingBottomStyle]}>
196199
<HeaderWithBackButton
197200
title={translate('spreadsheet.importSpreadsheet')}
198-
onBackButtonPress={() => Navigation.goBack(backTo)}
201+
onBackButtonPress={() => {
202+
if (spreadsheet?.isImportingMultiLevelTags) {
203+
setImportedSpreadsheetIsImportingMultiLevelTags(false);
204+
}
205+
Navigation.goBack(backTo);
206+
}}
199207
/>
200208

201209
<View style={[styles.flex1, styles.uploadFileView(isSmallScreenWidth)]}>

0 commit comments

Comments
 (0)