[Wave Collect] [Xero] Show organization name

src/components/ConnectionLayout.tsx

@@ -20,15 +20,15 @@ type ConnectionLayoutProps = {
     /** Header title for the connection */
     headerTitle: TranslationPaths;
 
+    /** The subtitle to show in the header */
+    headerSubtitle?: string;
+
     /** React nodes that will be shown */
     children?: React.ReactNode;
 
     /** Title of the connection component */
     title?: TranslationPaths;
 
-    /** Subtitle of the connection */
-    subtitle?: TranslationPaths;
-
     /** The current policyID */
     policyID: string;
 
@@ -44,22 +44,18 @@ type ConnectionLayoutProps = {
     /** Style of the title text */
     titleStyle?: StyleProp<TextStyle> | undefined;
 
-    /** Style of the subtitle text */
-    subTitleStyle?: StyleProp<TextStyle> | undefined;
-
     /** Whether to use ScrollView or not */
     shouldUseScrollView?: boolean;
 };
 
-type ConnectionLayoutContentProps = Pick<ConnectionLayoutProps, 'title' | 'titleStyle' | 'subtitle' | 'subTitleStyle' | 'children'>;
+type ConnectionLayoutContentProps = Pick<ConnectionLayoutProps, 'title' | 'titleStyle' | 'children'>;
 
-function ConnectionLayoutContent({title, titleStyle, subtitle, subTitleStyle, children}: ConnectionLayoutContentProps) {
+function ConnectionLayoutContent({title, titleStyle, children}: ConnectionLayoutContentProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     return (
         <>
             {title && <Text style={[styles.pb5, titleStyle]}>{translate(title)}</Text>}
-            {subtitle && <Text style={[styles.textLabelSupporting, subTitleStyle]}>{translate(subtitle)}</Text>}
             {children}
         </>
     );
@@ -70,13 +66,12 @@ function ConnectionLayout({
     headerTitle,
     children,
     title,
-    subtitle,
+    headerSubtitle: subtitle,
     policyID,
     accessVariants,
     featureName,
     contentContainerStyle,
     titleStyle,
-    subTitleStyle,
     shouldUseScrollView = true,
 }: ConnectionLayoutProps) {
     const {translate} = useLocalize();
@@ -85,14 +80,12 @@ function ConnectionLayout({
         () => (
             <ConnectionLayoutContent
                 title={title}
-                subtitle={subtitle}
-                subTitleStyle={subTitleStyle}
                 titleStyle={titleStyle}
             >
                 {children}
             </ConnectionLayoutContent>
         ),
-        [title, subtitle, titleStyle, subTitleStyle, children],
+        [title, titleStyle, children],
     );
 
     return (
@@ -108,6 +101,7 @@ function ConnectionLayout({
             >
                 <HeaderWithBackButton
                     title={translate(headerTitle)}
+                    subtitle={subtitle}
                     onBackButtonPress={() => Navigation.goBack()}
                 />
                 {shouldUseScrollView ? (

src/components/ReportActionItem/MoneyRequestView.tsx

@@ -346,7 +346,7 @@ function MoneyRequestView({
                     <OfflineWithFeedback
                         pendingAction={pendingAction}
                         errors={transaction?.errors}
-                        errorRowStyles={[styles.ml4]}
+                        errorRowStyles={[styles.mh4]}
                         onClose={() => {
                             if (!transaction?.transactionID) {
                                 return;

src/languages/en.ts

@@ -717,6 +717,7 @@ export default {
             other: 'Unexpected error, please try again later.',
             genericCreateFailureMessage: 'Unexpected error submitting this expense. Please try again later.',
             genericCreateInvoiceFailureMessage: 'Unexpected error sending invoice, please try again later.',
+            receiptDeleteFailureError: 'Unexpected error deleting this receipt. Please try again later.',
             // eslint-disable-next-line rulesdir/use-periods-for-error-messages
             receiptFailureMessage: "The receipt didn't upload. ",
             // eslint-disable-next-line rulesdir/use-periods-for-error-messages

src/languages/es.ts

@@ -712,6 +712,7 @@ export default {
             other: 'Error inesperado, por favor inténtalo más tarde.',
             genericCreateFailureMessage: 'Error inesperado al enviar este gasto. Por favor, inténtalo más tarde.',
             genericCreateInvoiceFailureMessage: 'Error inesperado al enviar la factura, inténtalo de nuevo más tarde.',
+            receiptDeleteFailureError: 'Error inesperado al borrar este recibo. Vuelve a intentarlo más tarde.',
             // eslint-disable-next-line rulesdir/use-periods-for-error-messages
             receiptFailureMessage: 'El recibo no se subió. ',
             // eslint-disable-next-line rulesdir/use-periods-for-error-messages

src/libs/actions/IOU.ts

@@ -6315,7 +6315,10 @@ function detachReceipt(transactionID: string) {
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
-            value: transaction,
+            value: {
+                ...transaction,
+                errors: ErrorUtils.getMicroSecondOnyxError('iou.error.receiptDeleteFailureError'),
+            },
         },
     ];
 

src/pages/workspace/accounting/xero/advanced/XeroAdvancedPage.tsx

@@ -7,6 +7,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import * as Connections from '@libs/actions/connections';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
+import {findCurrentXeroOrganization, getXeroTenants} from '@libs/PolicyUtils';
 import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
 import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
@@ -30,10 +31,14 @@ function XeroAdvancedPage({policy}: WithPolicyConnectionsProps) {
         return selectedAccount?.name ?? '';
     }, [bankAccounts, invoiceCollectionsAccountID]);
 
+    const tenants = useMemo(() => getXeroTenants(policy ?? undefined), [policy]);
+    const currentXeroOrganization = findCurrentXeroOrganization(tenants, policy?.connections?.xero?.config?.tenantID);
+
     return (
         <ConnectionLayout
             displayName={XeroAdvancedPage.displayName}
             headerTitle="workspace.xero.advancedConfig.advanced"
+            headerSubtitle={currentXeroOrganization?.name}
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
             policyID={policyID}
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}

src/pages/workspace/accounting/xero/export/XeroExportConfigurationPage.tsx

@@ -1,11 +1,12 @@
-import React from 'react';
+import React, {useMemo} from 'react';
 import ConnectionLayout from '@components/ConnectionLayout';
 import type {MenuItemProps} from '@components/MenuItem';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import type {OfflineWithFeedbackProps} from '@components/OfflineWithFeedback';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
+import {findCurrentXeroOrganization, getXeroTenants} from '@libs/PolicyUtils';
 import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
 import CONST from '@src/CONST';
@@ -19,6 +20,9 @@ function XeroExportConfigurationPage({policy}: WithPolicyConnectionsProps) {
     const policyOwner = policy?.owner ?? '';
 
     const {export: exportConfiguration, errorFields, pendingFields} = policy?.connections?.xero?.config ?? {};
+    const tenants = useMemo(() => getXeroTenants(policy ?? undefined), [policy]);
+    const currentXeroOrganization = findCurrentXeroOrganization(tenants, policy?.connections?.xero?.config?.tenantID);
+
     const menuItems: MenuItem[] = [
         {
             description: translate('workspace.xero.preferredExporter'),
@@ -77,6 +81,7 @@ function XeroExportConfigurationPage({policy}: WithPolicyConnectionsProps) {
         <ConnectionLayout
             displayName={XeroExportConfigurationPage.displayName}
             headerTitle="workspace.xero.export"
+            headerSubtitle={currentXeroOrganization?.name}
             title="workspace.xero.exportDescription"
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
             policyID={policyID}