Skip to content
Merged
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,8 @@ function MoneyRequestReportPreviewContent({
[action?.childStateNum, action?.childStatusNum, iouReport?.stateNum, iouReport?.statusNum, translate],
);

const shouldShowReportStatus = !!reportStatus && !!expenseCount;

const reportStatusColorStyle = useMemo(
() => getReportStatusColorStyle(theme, iouReport?.stateNum ?? action?.childStateNum, iouReport?.statusNum ?? action?.childStatusNum),
[action?.childStateNum, action?.childStatusNum, iouReport?.stateNum, iouReport?.statusNum, theme],
Expand Down Expand Up @@ -634,7 +636,7 @@ function MoneyRequestReportPreviewContent({
) : null,
[CONST.REPORT.REPORT_PREVIEW_ACTIONS.VIEW]: (
<Button
text={shouldShowAccessPlaceHolder ? translate('common.viewReport') : translate('common.view')}
text={translate('common.view')}
onPress={() => {
openReportFromPreview();
}}
Expand Down Expand Up @@ -735,9 +737,10 @@ function MoneyRequestReportPreviewContent({
{showStatusAndSkeleton && shouldShowSkeleton ? (
<MoneyReportHeaderStatusBarSkeleton />
) : (
(!shouldShowEmptyPlaceholder || shouldShowAccessPlaceHolder) && (
(!shouldShowEmptyPlaceholder || shouldShowAccessPlaceHolder) &&
(shouldShowReportStatus || !shouldShowAccessPlaceHolder) && (
<View style={[styles.flexRow, styles.justifyContentStart, styles.alignItemsCenter]}>
{!!reportStatus && !!expenseCount && (
{shouldShowReportStatus && (
<View
style={[
styles.reportStatusContainer,
Expand Down
1 change: 0 additions & 1 deletion src/languages/de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,6 @@ const translations: TranslationDeepObject<typeof en> = {
copyToClipboard: 'In die Zwischenablage kopieren',
thisIsTakingLongerThanExpected: 'Das dauert länger als erwartet ...',
domains: 'Domänen',
viewReport: 'Bericht anzeigen',
actionRequired: 'Aktion erforderlich',
duplicate: 'Duplizieren',
duplicated: 'Dupliziert',
Expand Down
1 change: 0 additions & 1 deletion src/languages/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,6 @@ const translations = {
wallet: 'Wallet',
preferences: 'Preferences',
view: 'View',
viewReport: 'View report',
review: (reviewParams?: ReviewParams) => `Review${reviewParams?.amount ? ` ${reviewParams?.amount}` : ''}`,
not: 'Not',
signIn: 'Sign in',
Expand Down
1 change: 0 additions & 1 deletion src/languages/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ const translations: TranslationDeepObject<typeof en> = {
wallet: 'Billetera',
preferences: 'Preferencias',
view: 'Ver',
viewReport: 'Ver informe',
review: (reviewParams) => `Revisar${reviewParams?.amount ? ` ${reviewParams?.amount}` : ''}`,
not: 'No',
privacyPolicy: 'la Política de Privacidad de Expensify',
Expand Down
1 change: 0 additions & 1 deletion src/languages/fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,6 @@ const translations: TranslationDeepObject<typeof en> = {
copyToClipboard: 'Copier dans le presse-papiers',
thisIsTakingLongerThanExpected: 'Cela prend plus de temps que prévu...',
domains: 'Domaines',
viewReport: 'Voir le rapport',
actionRequired: 'Action requise',
duplicate: 'Dupliquer',
duplicated: 'Dupliqué',
Expand Down
1 change: 0 additions & 1 deletion src/languages/it.ts
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,6 @@ const translations: TranslationDeepObject<typeof en> = {
copyToClipboard: 'Copia negli appunti',
thisIsTakingLongerThanExpected: 'Sta richiedendo più tempo del previsto...',
domains: 'Domini',
viewReport: 'Visualizza rendiconto',
actionRequired: 'Azione richiesta',
duplicate: 'Duplica',
duplicated: 'Duplicato',
Expand Down
1 change: 0 additions & 1 deletion src/languages/ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,6 @@ const translations: TranslationDeepObject<typeof en> = {
copyToClipboard: 'クリップボードにコピー',
thisIsTakingLongerThanExpected: '予想より時間がかかっています…',
domains: 'ドメイン',
viewReport: 'レポートを表示',
actionRequired: '対応が必要',
duplicate: '複製',
duplicated: '重複',
Expand Down
1 change: 0 additions & 1 deletion src/languages/nl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,6 @@ const translations: TranslationDeepObject<typeof en> = {
copyToClipboard: 'Kopiëren naar klembord',
thisIsTakingLongerThanExpected: 'Dit duurt langer dan verwacht...',
domains: 'Domeinen',
viewReport: 'Rapport bekijken',
actionRequired: 'Actie vereist',
duplicate: 'Dupliceren',
duplicated: 'Gedupliceerd',
Expand Down
1 change: 0 additions & 1 deletion src/languages/pl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,6 @@ const translations: TranslationDeepObject<typeof en> = {
copyToClipboard: 'Kopiuj do schowka',
thisIsTakingLongerThanExpected: 'To trwa dłużej, niż się spodziewaliśmy…',
domains: 'Domeny',
viewReport: 'Wyświetl raport',
actionRequired: 'Wymagane działanie',
duplicate: 'Duplikat',
duplicated: 'Zduplikowano',
Expand Down
1 change: 0 additions & 1 deletion src/languages/pt-BR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,6 @@ const translations: TranslationDeepObject<typeof en> = {
copyToClipboard: 'Copiar para a área de transferência',
thisIsTakingLongerThanExpected: 'Isso está levando mais tempo do que o esperado...',
domains: 'Domínios',
viewReport: 'Ver relatório',
actionRequired: 'Ação necessária',
duplicate: 'Duplicar',
duplicated: 'Duplicado',
Expand Down
1 change: 0 additions & 1 deletion src/languages/zh-hans.ts
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,6 @@ const translations: TranslationDeepObject<typeof en> = {
copyToClipboard: '复制到剪贴板',
thisIsTakingLongerThanExpected: '这比预期花费的时间更长...',
domains: '域名',
viewReport: '查看报告',
actionRequired: '需要操作',
duplicate: '复制',
duplicated: '已重复',
Expand Down
Loading