diff --git a/src/components/Duel/DuelResultModal.tsx b/src/components/Duel/DuelResultModal.tsx index f756b879b13669672a6eb6b4e740028531c5ce12..53113cef4c10cf1fcfd167c0d42537b2f94c0e43 100644 --- a/src/components/Duel/DuelResultModal.tsx +++ b/src/components/Duel/DuelResultModal.tsx @@ -61,17 +61,17 @@ const DuelResultModal: React.FC<DuelResultModalProps> = ({ </div> <div className="text-18-normal"> {empty - ? t('duel.empty.message1') + ? t('duel.empty.message1') + result + ' €' : win ? t('duel.sucess.message1') + result + ' €' : t('duel.lost.message1') + result + ' €'} </div> <div className="text-18-normal"> {empty - ? t('duel.empty.message2') + ? t('duel.empty.message2') + userChallenge.title : win - ? t('duel.sucess.message2') - : t('duel.lost.message2')} + ? t('duel.sucess.message2') + userChallenge.title + : t('duel.lost.message2') + userChallenge.title + '...'} </div> <MuiButton className="button" diff --git a/src/locales/fr.json b/src/locales/fr.json index e2ef29d85868d6eba25ae9a905270d3e80317211..f24f7ccddb5a870e66e5064eb8dd82481d459999 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -365,15 +365,21 @@ "sucess": { "title": "Félicitations !", "message1": "Vous avez économisé ", - "message2": "et gagné un ours polaire", + "message2": "et gagné le badge ", "button": "Youpi" }, "lost": { "title": "Presque !", "message1": "Vous avez dépassé de ", - "message2": "et presque gagné un ours polaire...", + "message2": "et presque manqué le badge ", "button": "Dommage..." }, + "empty": { + "title": "Félicitations !", + "message1": "Vous avez économisé ", + "message2": "et gagné le badge ", + "button": "Youpi" + }, "empty_value": { "title": "Oups !", "message1": "Vous n'avez pas de période de référence valide pour lancer ce duel.", diff --git a/src/services/challenge.service.ts b/src/services/challenge.service.ts index 6dac9f65e8aff06821e3a8bf92f881267993c36d..bcfc7f5d2ce7e830ea2350031e4124a06c4709b7 100644 --- a/src/services/challenge.service.ts +++ b/src/services/challenge.service.ts @@ -769,6 +769,20 @@ export default class ChallengeService { if (userChallenge.duel.userConsumption < userChallenge.duel.threshold) { isWin = true } + } else { + const duration = userChallenge.duel.duration.days + if ( + dataloads.length === duration && + dataloads[duration - 1].value !== -1 + ) { + console.log(dataloads[duration - 1].value) + isDone = true + if ( + userChallenge.duel.userConsumption < userChallenge.duel.threshold + ) { + isWin = true + } + } } }