diff --git a/package-lock.json b/package-lock.json index af56db721..9f59b6466 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,14 +13,14 @@ "date-fns": "3.6.0", "formik": "2.4.5", "i18next": "23.11.5", - "markdown-to-jsx": "7.4.6", + "markdown-to-jsx": "7.4.7", "next": "14.2.3", "next-i18next": "15.3.0", "next-seo": "6.5.0", "pino": "8.20.0", "react": "18.2.0", "react-dom": "18.2.0", - "react-focus-on": "3.9.2", + "react-focus-on": "3.9.3", "react-i18next": "14.1.0", "react-idle-timer": "5.7.2", "sharp": "0.33.3", @@ -6441,9 +6441,10 @@ "dev": true }, "node_modules/focus-lock": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/focus-lock/-/focus-lock-1.3.4.tgz", - "integrity": "sha512-Gv0N3mvej3pD+HWkNryrF8sExzEHqhQ6OSFxD4DPxm9n5HGCaHme98ZMBZroNEAJcsdtHxk+skvThGKyUeoEGA==", + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/focus-lock/-/focus-lock-1.3.5.tgz", + "integrity": "sha512-QFaHbhv9WPUeLYBDe/PAuLKJ4Dd9OPvKs9xZBr3yLXnUrDNaVXKu2baDBXe3naPY30hgHYSsf2JW4jzas2mDEQ==", + "license": "MIT", "dependencies": { "tslib": "^2.0.3" }, @@ -11060,9 +11061,10 @@ "dev": true }, "node_modules/markdown-to-jsx": { - "version": "7.4.6", - "resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-7.4.6.tgz", - "integrity": "sha512-3cyNxI/PwotvYkjg6KmFaN1uyN/7NqETteD2DobBB8ro/FR9jsHIh4Fi7ywAz0s9QHRKCmGlOUggs5GxSWACKA==", + "version": "7.4.7", + "resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-7.4.7.tgz", + "integrity": "sha512-0+ls1IQZdU6cwM1yu0ZjjiVWYtkbExSyUIFU2ZeDIFuZM1W42Mh4OlJ4nb4apX4H8smxDHRdFaoIVJGwfv5hkg==", + "license": "MIT", "engines": { "node": ">= 10" }, @@ -13036,6 +13038,7 @@ "version": "1.2.6", "resolved": "https://registry.npmjs.org/react-clientside-effect/-/react-clientside-effect-1.2.6.tgz", "integrity": "sha512-XGGGRQAKY+q25Lz9a/4EPqom7WRjz3z9R2k4jhVKA/puQFH/5Nt27vFZYql4m4NVNdUvX8PS3O7r/Zzm7cjUlg==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.12.13" }, @@ -13061,15 +13064,16 @@ "integrity": "sha512-suNP+J1VU1MWFKcyt7RtjiSWUjvidmQSlqu+eHslq+342xCbGTYmC0mEhPCOHxlW0CywylOC1u2DFAT+bv4dBw==" }, "node_modules/react-focus-lock": { - "version": "2.11.2", - "resolved": "https://registry.npmjs.org/react-focus-lock/-/react-focus-lock-2.11.2.tgz", - "integrity": "sha512-DDTbEiov0+RthESPVSTIdAWPPKic+op3sCcP+icbMRobvQNt7LuAlJ3KoarqQv5sCgKArru3kXmlmFTa27/CdQ==", + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/react-focus-lock/-/react-focus-lock-2.12.1.tgz", + "integrity": "sha512-lfp8Dve4yJagkHiFrC1bGtib3mF2ktqwPJw4/WGcgPW+pJ/AVQA5X2vI7xgp13FcxFEpYBBHpXai/N2DBNC0Jw==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.0.0", - "focus-lock": "^1.3.2", + "focus-lock": "^1.3.5", "prop-types": "^15.6.2", "react-clientside-effect": "^1.2.6", - "use-callback-ref": "^1.3.0", + "use-callback-ref": "^1.3.2", "use-sidecar": "^1.1.2" }, "peerDependencies": { @@ -13083,16 +13087,16 @@ } }, "node_modules/react-focus-on": { - "version": "3.9.2", - "resolved": "https://registry.npmjs.org/react-focus-on/-/react-focus-on-3.9.2.tgz", - "integrity": "sha512-3UZ9PjA+pe8ZK3B+rz7zcgJUIRJVzJEddYe6R5WVUAsSXW8awHw9nXJqK0UU5MenGEUh/tMUBWMqN633+d2eCA==", + "version": "3.9.3", + "resolved": "https://registry.npmjs.org/react-focus-on/-/react-focus-on-3.9.3.tgz", + "integrity": "sha512-GSLz54TvP6OUlsvnlgHJu80nHOAO2ikRTtDt/aP8GZu3DPPAbwHFdliveBwUfPnyKLUKutFMCJUkH55vuo4uKQ==", + "license": "MIT", "dependencies": { "aria-hidden": "^1.2.2", - "react-focus-lock": "^2.11.2", + "react-focus-lock": "^2.11.3", "react-remove-scroll": "^2.5.7", "react-style-singleton": "^2.2.1", "tslib": "^2.3.1", - "use-callback-ref": "^1.3.0", "use-sidecar": "^1.1.2" }, "engines": { @@ -15012,9 +15016,10 @@ } }, "node_modules/use-callback-ref": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.0.tgz", - "integrity": "sha512-3FT9PRuRdbB9HfXhEq35u4oZkvpJ5kuYbpqhCfmiZyReuRgpnhDlbr2ZEnnuS0RrJAPn6l23xjFg9kpDM+Ms7w==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.2.tgz", + "integrity": "sha512-elOQwe6Q8gqZgDA8mrh44qRTQqpIHDcZ3hXTLjBe1i4ph8XpNJnO+aQf3NaG+lriLopI4HMx9VjQLfPQ6vhnoA==", + "license": "MIT", "dependencies": { "tslib": "^2.0.0" }, diff --git a/package.json b/package.json index 88c122f61..922700866 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "report:generate": "marge index.json --reportDir report --assetsDir report/assets --reportPageTitle index.html", "test:unit": "jest", "test:coverage": "jest --coverage --forceExit", - "prepare": "husky install", + "prepare": "husky", "tsc:validate": "tsc --noEmit --incremental false" }, "dependencies": { @@ -24,14 +24,14 @@ "date-fns": "3.6.0", "formik": "2.4.5", "i18next": "23.11.5", - "markdown-to-jsx": "7.4.6", + "markdown-to-jsx": "7.4.7", "next": "14.2.3", "next-i18next": "15.3.0", "next-seo": "6.5.0", "pino": "8.20.0", "react": "18.2.0", "react-dom": "18.2.0", - "react-focus-on": "3.9.2", + "react-focus-on": "3.9.3", "react-i18next": "14.1.0", "react-idle-timer": "5.7.2", "sharp": "0.33.3", diff --git a/public/locales/en/expectations.json b/public/locales/en/expectations.json index a69f94a81..238bbf179 100644 --- a/public/locales/en/expectations.json +++ b/public/locales/en/expectations.json @@ -1,6 +1,6 @@ { "additional-info": { - "contact-us": "Contact us only if you don’t receive your documents within 6 weeks of receiving your passport.", + "contact-us": "Contact us only if you don't receive your documents within 6 weeks of receiving your passport.", "documents-separately": "We may send your supporting documents back separately.", "header": "Additional information" }, diff --git a/public/locales/en/status.json b/public/locales/en/status.json index 7825c4a73..8dd032b48 100644 --- a/public/locales/en/status.json +++ b/public/locales/en/status.json @@ -77,7 +77,13 @@ "mailing": "We're mailing it to you by Canada Post", "remote-area": "If you live in a northern or remote area, it may take up to 8 business days to arrive.", "supporting-documents": "We may send your supporting documents back separately.", - "take-up-to": "It can take up to 2 to 3 business days to arrive." + "take-up-to": "It can take up to 2 to 3 business days to arrive.", + "united-states": { + "title": "Special instructions for applicants residing in the United States", + "mailed-us": "If your passport is being mailed to the United States, it will be sent to you via FedEx.", + "supporting-documents": "You'll receive your passport and supporting documents in the same envelope.", + "contact-us": "If you don't receive your passport and supporting documents, contact us." + } }, "shipped-fedex": { "contact-us": "If you don't receive your passport and supporting documents, contact us.", diff --git a/public/locales/fr/status.json b/public/locales/fr/status.json index d7e37048d..62ca097fb 100644 --- a/public/locales/fr/status.json +++ b/public/locales/fr/status.json @@ -77,7 +77,13 @@ "mailing": "Nous vous l'envoyons par Postes Canada.", "remote-area": "Si vous vivez dans une région au nord ou éloignée, cela pourrait prendre jusqu'à 8 jours ouvrables pour arriver.", "supporting-documents": "Nous pourrions renvoyer vos documents fournis en support de la demande séparément.", - "take-up-to": "Cela peut prendre jusqu'à 2 à 3 jours ouvrables pour arriver." + "take-up-to": "Cela peut prendre jusqu'à 2 à 3 jours ouvrables pour arriver.", + "united-states": { + "title": "Instructions spéciales pour les requérants résidant aux États-Unis.", + "mailed-us": "Si votre passeport est envoyé aux États-Unis, il vous sera envoyé via FedEx.", + "supporting-documents": "Vous recevrez le passeport et les documents justificatifs dans la même enveloppe.", + "contact-us": "Si vous ne recevez pas votre passeport et vos documents, veuillez nous contacter." + } }, "shipped-fedex": { "contact-us": "Si vous ne recevez pas votre passeport et vos documents, veuillez nous contacter.", diff --git a/src/components/check-status-responses/CheckStatusShippingCanadaPost.tsx b/src/components/check-status-responses/CheckStatusShippingCanadaPost.tsx index aa316616f..50ffca3e1 100644 --- a/src/components/check-status-responses/CheckStatusShippingCanadaPost.tsx +++ b/src/components/check-status-responses/CheckStatusShippingCanadaPost.tsx @@ -2,6 +2,7 @@ import { Trans, useTranslation } from 'next-i18next' import AlertBlock from '../AlertBlock' import AlertSection from '../AlertSection' +import Collapse from '../Collapse' import ExternalLink from '../ExternalLink' export interface CheckStatusShippingCanadaPostProps { @@ -20,7 +21,7 @@ export const CheckStatusShippingCanadaPost = ({

{t('shipped-canada-post.header')}.

- +

{t('shipped-canada-post.mailing')}

@@ -57,6 +58,56 @@ export const CheckStatusShippingCanadaPost = ({ )} + +
+

+ {t('shipped-canada-post.united-states.mailed-us')} +

+ {trackingNumber ? ( + <> +

+ +

+

+ + ), + }} + /> +

+ + ) : ( + <> + )} +

+ + {t('shipped-canada-post.united-states.supporting-documents')} + +

+

+ , + }} + /> +

+
+

{t('shipped-canada-post.supporting-documents')}