From a8abbbb52757051a806de2a0a362e5ccab3c07ac Mon Sep 17 00:00:00 2001 From: souyahia-monk Date: Mon, 13 Feb 2023 16:21:41 +0100 Subject: [PATCH 1/2] Updated the label of retake all in french --- packages/camera/src/i18n/resources/fr.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/camera/src/i18n/resources/fr.js b/packages/camera/src/i18n/resources/fr.js index 6c3e0e897..078392e5a 100644 --- a/packages/camera/src/i18n/resources/fr.js +++ b/packages/camera/src/i18n/resources/fr.js @@ -25,7 +25,7 @@ const fr = { tooMuchTodo: 'Impossible de vérifier toutes les images, cela pourrait affecter la précision des résultats', allRejected: 'Impossible d\'upload les images, veuillez réessayer', loading: 'Chargement...', - retakeAll: 'Recommencer tout', + retakeAll: 'Reprendre ces photos', submit: 'Passer', }, subtitle: { From 65d81f0bb4df4dd36642bb2d8828f563d60e6ab5 Mon Sep 17 00:00:00 2001 From: souyahia-monk Date: Mon, 13 Feb 2023 16:55:10 +0100 Subject: [PATCH 2/2] Hide the retake all button when there is no picture to retake --- .../UploadCard/hooks/useVariant.js | 6 ++-- .../UploadCenter/UploadCard/index.js | 2 +- .../src/components/UploadCenter/index.js | 30 ++++++++++++------- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/packages/camera/src/components/UploadCenter/UploadCard/hooks/useVariant.js b/packages/camera/src/components/UploadCenter/UploadCard/hooks/useVariant.js index 80f775df3..379607862 100644 --- a/packages/camera/src/components/UploadCenter/UploadCard/hooks/useVariant.js +++ b/packages/camera/src/components/UploadCenter/UploadCard/hooks/useVariant.js @@ -15,7 +15,7 @@ export default function useThumbnail({ label: t('uploadCenter.variant.retake.label'), icon: 'camera-retake', callback: handleRetake, - sublable: t('uploadCenter.variant.retake.sublabel'), + sublabel: t('uploadCenter.variant.retake.sublabel'), color: colors.error, }; } @@ -32,7 +32,7 @@ export default function useThumbnail({ label: t('uploadCenter.variant.recheck.label'), icon: 'alert-circle', callback: handleRecheck, - sublable: t('uploadCenter.variant.recheck.sublabel'), + sublabel: t('uploadCenter.variant.recheck.sublabel'), color: colors.disabled, }; } @@ -41,7 +41,7 @@ export default function useThumbnail({ label: t('uploadCenter.variant.retake.label'), icon: 'camera-retake', callback: handleRetake, - sublable: t('uploadCenter.variant.retake.sublabel'), + sublabel: t('uploadCenter.variant.retake.sublabel'), color: colors.accent, }; }, [isPending, isComplianceFailed, isComplianceIdle, isUploadFailed, diff --git a/packages/camera/src/components/UploadCenter/UploadCard/index.js b/packages/camera/src/components/UploadCenter/UploadCard/index.js index 79e85c40d..82859de29 100644 --- a/packages/camera/src/components/UploadCenter/UploadCard/index.js +++ b/packages/camera/src/components/UploadCenter/UploadCard/index.js @@ -95,7 +95,7 @@ function UploadCard({ {variant?.callback ? ( - {`, ${variant.sublable}`} + {`, ${variant.sublabel}`} ) : null} diff --git a/packages/camera/src/components/UploadCenter/index.js b/packages/camera/src/components/UploadCenter/index.js index 673d8602c..5b1babc16 100644 --- a/packages/camera/src/components/UploadCenter/index.js +++ b/packages/camera/src/components/UploadCenter/index.js @@ -115,6 +115,14 @@ export default function UploadCenter({ onComplianceCheckStart(); }, [onComplianceCheckStart]); + const displayRetakeAll = useMemo( + () => Object.values(uploads.state).some((u) => !!u.error) || Object.values(compliance.state) + .some((c) => ['rejected', 'unsatisfied'].includes(c.status) + || c?.result?.data?.compliances?.image_quality_assessment?.is_compliant === false + || c?.result?.data?.compliances?.zoom_level?.is_compliant === false), + [compliance, uploads], + ); + const statEventsData = useMemo(() => ({ retakesNeeded: ids.length, compliances: Object.entries(compliance.state) @@ -210,16 +218,18 @@ export default function UploadCenter({ {/* actions */} - + {displayRetakeAll ? ( + + ) : null}