fix(exams): fix checks on canBeRejected and canBeAccepted loot boxes

polito · Jun 17, 2024 · 4bbaa2c · 4bbaa2c
1 parent 53a57d7
commit 4bbaa2c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/features/transcript/components/ProvisionalGradeListItem.tsx b/src/features/transcript/components/ProvisionalGradeListItem.tsx
@@ -35,7 +35,7 @@ export const ProvisionalGradeListItem = ({ grade }: Props) => {
   const subtitle = useMemo(() => {
     switch (grade.state) {
       case ProvisionalGradeStateEnum.Confirmed:
-        if (!grade.isFailure && !grade.isWithdrawn) {
+        if (grade.canBeRejected) {
           return (
             <TextWithLinks style={styles.rejectableSubtitle}>
               {t('transcriptGradesScreen.rejectionCountdown', {

diff --git a/src/features/transcript/screens/ProvisionalGradeScreen.tsx b/src/features/transcript/screens/ProvisionalGradeScreen.tsx
@@ -96,8 +96,7 @@ export const ProvisionalGradeScreen = ({ navigation, route }: Props) => {
             <Row
               pb={
                 grade.state === ProvisionalGradeStateEnum.Confirmed &&
-                !grade.isFailure &&
-                !grade.isWithdrawn &&
+                (grade.canBeAccepted || grade.canBeRejected) &&
                 rejectionTime
                   ? 0
                   : 5
@@ -141,8 +140,7 @@ export const ProvisionalGradeScreen = ({ navigation, route }: Props) => {
               </Col>
             </Row>
             {grade.state === ProvisionalGradeStateEnum.Confirmed &&
-              !grade.isFailure &&
-              !grade.isWithdrawn &&
+              grade.canBeAccepted &&
               rejectionTime && (
                 <Row pl={5} pb={5}>
                   <Text style={styles.autoRegistration}>
@@ -174,10 +172,9 @@ export const ProvisionalGradeScreen = ({ navigation, route }: Props) => {
           action={() => navigation.navigate('Person', { id: grade?.teacherId })}
         />
       )}
-      {grade?.state === ProvisionalGradeStateEnum.Confirmed &&
-        !grade.isFailure &&
-        !grade.isWithdrawn && (
-          <CtaButtonContainer absolute={true}>
+      {grade?.state === ProvisionalGradeStateEnum.Confirmed && (
+        <CtaButtonContainer absolute={true} modal>
+          {grade?.canBeAccepted && (
             <CtaButton
               title={t('provisionalGradeScreen.acceptGradeCta')}
               action={() =>
@@ -198,6 +195,8 @@ export const ProvisionalGradeScreen = ({ navigation, route }: Props) => {
               }
               containerStyle={{ paddingVertical: 0 }}
             />
+          )}
+          {grade?.canBeRejected && (
             <CtaButton
               title={t('provisionalGradeScreen.rejectGradeCta', {
                 hours: rejectionTime,
@@ -222,8 +221,9 @@ export const ProvisionalGradeScreen = ({ navigation, route }: Props) => {
               containerStyle={{ paddingVertical: 0 }}
               destructive
             />
-          </CtaButtonContainer>
-        )}
+          )}
+        </CtaButtonContainer>
+      )}
     </>
   );
 };