Skip to content

Commit 0fa8a9e

Browse files
Merge pull request #431 from monkvision/feature/MN-213/update-retake-all-button
Update Retake Button [TOYOTA]
2 parents dcc9690 + 65d81f0 commit 0fa8a9e

File tree

4 files changed

+25
-15
lines changed

4 files changed

+25
-15
lines changed

packages/camera/src/components/UploadCenter/UploadCard/hooks/useVariant.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export default function useThumbnail({
1515
label: t('uploadCenter.variant.retake.label'),
1616
icon: 'camera-retake',
1717
callback: handleRetake,
18-
sublable: t('uploadCenter.variant.retake.sublabel'),
18+
sublabel: t('uploadCenter.variant.retake.sublabel'),
1919
color: colors.error,
2020
};
2121
}
@@ -32,7 +32,7 @@ export default function useThumbnail({
3232
label: t('uploadCenter.variant.recheck.label'),
3333
icon: 'alert-circle',
3434
callback: handleRecheck,
35-
sublable: t('uploadCenter.variant.recheck.sublabel'),
35+
sublabel: t('uploadCenter.variant.recheck.sublabel'),
3636
color: colors.disabled,
3737
};
3838
}
@@ -41,7 +41,7 @@ export default function useThumbnail({
4141
label: t('uploadCenter.variant.retake.label'),
4242
icon: 'camera-retake',
4343
callback: handleRetake,
44-
sublable: t('uploadCenter.variant.retake.sublabel'),
44+
sublabel: t('uploadCenter.variant.retake.sublabel'),
4545
color: colors.accent,
4646
};
4747
}, [isPending, isComplianceFailed, isComplianceIdle, isUploadFailed,

packages/camera/src/components/UploadCenter/UploadCard/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ function UploadCard({
9595
{variant?.callback
9696
? (
9797
<TouchableOpacity onPress={variant.callback}>
98-
<Text style={{ fontWeight: 'bold' }}>{`, ${variant.sublable}`}</Text>
98+
<Text style={{ fontWeight: 'bold' }}>{`, ${variant.sublabel}`}</Text>
9999
</TouchableOpacity>
100100
)
101101
: null}

packages/camera/src/components/UploadCenter/index.js

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,14 @@ export default function UploadCenter({
115115
onComplianceCheckStart();
116116
}, [onComplianceCheckStart]);
117117

118+
const displayRetakeAll = useMemo(
119+
() => Object.values(uploads.state).some((u) => !!u.error) || Object.values(compliance.state)
120+
.some((c) => ['rejected', 'unsatisfied'].includes(c.status)
121+
|| c?.result?.data?.compliances?.image_quality_assessment?.is_compliant === false
122+
|| c?.result?.data?.compliances?.zoom_level?.is_compliant === false),
123+
[compliance, uploads],
124+
);
125+
118126
const statEventsData = useMemo(() => ({
119127
retakesNeeded: ids.length,
120128
compliances: Object.entries(compliance.state)
@@ -210,16 +218,18 @@ export default function UploadCenter({
210218

211219
{/* actions */}
212220
<View style={styles.actions}>
213-
<Button
214-
onPress={handleRetakeAll}
215-
colors={colors}
216-
color={colors.actions.primary}
217-
disabled={!hasFulfilledAllUploads}
218-
>
219-
<Text style={{ color: colors.actions.primary.text || colors.text }}>
220-
{`${t('uploadCenter.view.retakeAll')} ${ids.length ? `(${ids.length})` : ''}`}
221-
</Text>
222-
</Button>
221+
{displayRetakeAll ? (
222+
<Button
223+
onPress={handleRetakeAll}
224+
colors={colors}
225+
color={colors.actions.primary}
226+
disabled={!hasFulfilledAllUploads}
227+
>
228+
<Text style={{ color: colors.actions.primary.text || colors.text }}>
229+
{`${t('uploadCenter.view.retakeAll')} ${ids.length ? `(${ids.length})` : ''}`}
230+
</Text>
231+
</Button>
232+
) : null}
223233
<Button
224234
colors={colors}
225235
color={colors.actions.secondary}

packages/camera/src/i18n/resources/fr.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const fr = {
2525
tooMuchTodo: 'Impossible de vérifier toutes les images, cela pourrait affecter la précision des résultats',
2626
allRejected: 'Impossible d\'upload les images, veuillez réessayer',
2727
loading: 'Chargement...',
28-
retakeAll: 'Recommencer tout',
28+
retakeAll: 'Reprendre ces photos',
2929
submit: 'Passer',
3030
},
3131
subtitle: {

0 commit comments

Comments
 (0)