diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts index 2ca42f2af0366..a2ca1ff5e8ca4 100755 --- a/src/ONYXKEYS.ts +++ b/src/ONYXKEYS.ts @@ -706,6 +706,9 @@ const ONYXKEYS = { */ WORKSPACE_CARDS_LIST: 'cards_', + /** Collection of objects where each object represents the card assignment that failed */ + FAILED_COMPANY_CARDS_ASSIGNMENTS: 'failedCompanyCardsAssignments_', + /** Expensify cards settings */ PRIVATE_EXPENSIFY_CARD_SETTINGS: 'private_expensifyCardSettings_', @@ -1131,6 +1134,7 @@ type OnyxCollectionValuesMapping = { [ONYXKEYS.COLLECTION.EXPENSIFY_CARD_BANK_ACCOUNT_METADATA]: OnyxTypes.ExpensifyCardBankAccountMetadata; [ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_MANUAL_BILLING]: boolean; [ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST]: OnyxTypes.WorkspaceCardsList; + [ONYXKEYS.COLLECTION.FAILED_COMPANY_CARDS_ASSIGNMENTS]: OnyxTypes.FailedCompanyCardAssignments; [ONYXKEYS.COLLECTION.EXPENSIFY_CARD_CONTINUOUS_RECONCILIATION_CONNECTION]: OnyxTypes.PolicyConnectionName; [ONYXKEYS.COLLECTION.EXPENSIFY_CARD_USE_CONTINUOUS_RECONCILIATION]: OnyxTypes.CardContinuousReconciliation; [ONYXKEYS.COLLECTION.LAST_SELECTED_FEED]: OnyxTypes.CompanyCardFeedWithDomainID; diff --git a/src/components/ErrorMessageRow.tsx b/src/components/ErrorMessageRow.tsx index 8086fc714f6ed..9d3274aa34ddc 100644 --- a/src/components/ErrorMessageRow.tsx +++ b/src/components/ErrorMessageRow.tsx @@ -16,17 +16,14 @@ type ErrorMessageRowProps = { /** Additional style object for the error row text */ errorRowTextStyles?: StyleProp; - /** A function to run when the X button next to the error is clicked */ - onClose?: () => void; - - /** Whether we can dismiss the error message */ - canDismissError?: boolean; + /** If passed, an X button next to the error will be shown and which triggers this callback */ + onDismiss?: () => void; /** A function to dismiss error */ dismissError?: () => void; }; -function ErrorMessageRow({errors, errorRowStyles, onClose, canDismissError = true, dismissError, errorRowTextStyles}: ErrorMessageRowProps) { +function ErrorMessageRow({errors, errorRowStyles, onDismiss, dismissError, errorRowTextStyles}: ErrorMessageRowProps) { // Some errors have a null message. This is used to apply opacity only and to avoid showing redundant messages. const errorEntries = Object.entries(errors ?? {}); const filteredErrorEntries = errorEntries.filter((errorEntry): errorEntry is [string, string | ReceiptError | OnyxCommon.TranslationKeyError] => errorEntry[1] !== null); @@ -37,10 +34,9 @@ function ErrorMessageRow({errors, errorRowStyles, onClose, canDismissError = tru ) : null; diff --git a/src/components/ImportSpreadsheetColumns.tsx b/src/components/ImportSpreadsheetColumns.tsx index b1d8b93127404..d05c309da9ed6 100644 --- a/src/components/ImportSpreadsheetColumns.tsx +++ b/src/components/ImportSpreadsheetColumns.tsx @@ -108,7 +108,6 @@ function ImportSpreadsheetColumns({ shouldDisplayErrorAbove errors={errors} errorRowStyles={styles.mv2} - canDismissError={false} >