Skip to content

Commit

Permalink
Merge branch 'main-broker-address-lookup' into chore/EMS-4013
Browse files Browse the repository at this point in the history
  • Loading branch information
@ttbarnes
ttbarnes committed Jan 29, 2025
2 parents a725bf3 + 978cf0b commit ac2c4d2
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 16 deletions.
17 changes: 9 additions & 8 deletions e2e-tests/content-strings/error-messages.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -567,23 +567,24 @@ export const ERROR_MESSAGES = {
IS_EMPTY: 'Select if you adhere to all the requirements of the Modern Slavery Act 2015',
},
[FIELD_IDS.INSURANCE.DECLARATIONS.MODERN_SLAVERY.HAS_NO_OFFENSES_OR_INVESTIGATIONS]: {
IS_EMPTY: 'Select if you are under investigation or been fine, convicted or found guilty or not',
IS_EMPTY: 'Select if you are under investigation, or, have been fined, convicted, or, found guilty',
},
[FIELD_IDS.INSURANCE.DECLARATIONS.MODERN_SLAVERY.IS_NOT_AWARE_OF_EXISTING_SLAVERY]: {
IS_EMPTY: 'Select if you are or are not aware of Modern Slavery in respect of yourself, the export contract, holding company or supply chain',
IS_EMPTY:
'Select if you are not aware of the existence of Modern Slavery in respect of yourself, the export contract(s), your immediate holding company or your supply chain',
},
CONDITIONAL_REASONS: {
[FIELD_IDS.INSURANCE.DECLARATIONS.MODERN_SLAVERY.CONDITIONAL_REASONS.CANNOT_ADHERE_TO_ALL_REQUIREMENTS]: {
IS_EMPTY: 'Enter full details of why you cannot adhere',
ABOVE_MAXIMUM: `The explanation of why you cannot adhere cannot be more than ${MAXIMUM_CHARACTERS.DECLARATIONS.MODERN_SLAVERY.CONDITIONAL_REASON} characters`,
IS_EMPTY: 'Enter full details as to why you cannot adhere',
ABOVE_MAXIMUM: `The explanation of why you cannot confirm cannot be more than ${MAXIMUM_CHARACTERS.DECLARATIONS.MODERN_SLAVERY.CONDITIONAL_REASON} characters`,
},
[FIELD_IDS.INSURANCE.DECLARATIONS.MODERN_SLAVERY.CONDITIONAL_REASONS.OFFENSES_OR_INVESTIGATIONS]: {
IS_EMPTY: 'Enter full details of why you cannot confirm',
ABOVE_MAXIMUM: `The explanation of why you cannot confirm cannot be more than ${MAXIMUM_CHARACTERS.DECLARATIONS.MODERN_SLAVERY.CONDITIONAL_REASON} characters`,
IS_EMPTY: 'Enter full details as to why you cannot confirm',
ABOVE_MAXIMUM: `The explanation of why you cannot confirm cannot be more than ${MAXIMUM_CHARACTERS.DECLARATIONS.MODERN_SLAVERY.CONDITIONAL_REASON} characters`,
},
[FIELD_IDS.INSURANCE.DECLARATIONS.MODERN_SLAVERY.CONDITIONAL_REASONS.AWARE_OF_EXISTING_SLAVERY]: {
IS_EMPTY: 'Enter full details of why you cannot confirm',
ABOVE_MAXIMUM: `The explanation of why you cannot confirm cannot be more than ${MAXIMUM_CHARACTERS.DECLARATIONS.MODERN_SLAVERY.CONDITIONAL_REASON} characters`,
IS_EMPTY: 'Enter full details as to why you cannot confirm',
ABOVE_MAXIMUM: `The explanation of why you cannot confirm cannot be more than ${MAXIMUM_CHARACTERS.DECLARATIONS.MODERN_SLAVERY.CONDITIONAL_REASON} characters`,
},
},
},
Expand Down
17 changes: 9 additions & 8 deletions src/ui/server/content-strings/error-messages.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -571,23 +571,24 @@ export const ERROR_MESSAGES = {
IS_EMPTY: 'Select if you adhere to all the requirements of the Modern Slavery Act 2015',
},
[FIELD_IDS.INSURANCE.DECLARATIONS.MODERN_SLAVERY.HAS_NO_OFFENSES_OR_INVESTIGATIONS]: {
IS_EMPTY: 'Select if you are under investigation or been fine, convicted or found guilty or not',
IS_EMPTY: 'Select if you are under investigation, or, have been fined, convicted, or, found guilty',
},
[FIELD_IDS.INSURANCE.DECLARATIONS.MODERN_SLAVERY.IS_NOT_AWARE_OF_EXISTING_SLAVERY]: {
IS_EMPTY: 'Select if you are or are not aware of Modern Slavery in respect of yourself, the export contract, holding company or supply chain',
IS_EMPTY:
'Select if you are not aware of the existence of Modern Slavery in respect of yourself, the export contract(s), your immediate holding company or your supply chain',
},
CONDITIONAL_REASONS: {
[FIELD_IDS.INSURANCE.DECLARATIONS.MODERN_SLAVERY.CONDITIONAL_REASONS.CANNOT_ADHERE_TO_ALL_REQUIREMENTS]: {
IS_EMPTY: 'Enter full details of why you cannot adhere',
ABOVE_MAXIMUM: `The explanation of why you cannot adhere cannot be more than ${MAXIMUM_CHARACTERS.DECLARATIONS.MODERN_SLAVERY.CONDITIONAL_REASON} characters`,
IS_EMPTY: 'Enter full details as to why you cannot adhere',
ABOVE_MAXIMUM: `The explanation of why you cannot confirm cannot be more than ${MAXIMUM_CHARACTERS.DECLARATIONS.MODERN_SLAVERY.CONDITIONAL_REASON} characters`,
},
[FIELD_IDS.INSURANCE.DECLARATIONS.MODERN_SLAVERY.CONDITIONAL_REASONS.OFFENSES_OR_INVESTIGATIONS]: {
IS_EMPTY: 'Enter full details of why you cannot confirm',
ABOVE_MAXIMUM: `The explanation of why you cannot confirm cannot be more than ${MAXIMUM_CHARACTERS.DECLARATIONS.MODERN_SLAVERY.CONDITIONAL_REASON} characters`,
IS_EMPTY: 'Enter full details as to why you cannot confirm',
ABOVE_MAXIMUM: `The explanation of why you cannot confirm cannot be more than ${MAXIMUM_CHARACTERS.DECLARATIONS.MODERN_SLAVERY.CONDITIONAL_REASON} characters`,
},
[FIELD_IDS.INSURANCE.DECLARATIONS.MODERN_SLAVERY.CONDITIONAL_REASONS.AWARE_OF_EXISTING_SLAVERY]: {
IS_EMPTY: 'Enter full details of why you cannot confirm',
ABOVE_MAXIMUM: `The explanation of why you cannot confirm cannot be more than ${MAXIMUM_CHARACTERS.DECLARATIONS.MODERN_SLAVERY.CONDITIONAL_REASON} characters`,
IS_EMPTY: 'Enter full details as to why you cannot confirm',
ABOVE_MAXIMUM: `The explanation of why you cannot confirm cannot be more than ${MAXIMUM_CHARACTERS.DECLARATIONS.MODERN_SLAVERY.CONDITIONAL_REASON} characters`,
},
},
},
Expand Down

0 comments on commit ac2c4d2

Please sign in to comment.