fixes

NMF-earth · Apr 27, 2021 · 1733ae6 · 1733ae6
1 parent c1c7b28
commit 1733ae6
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 65 deletions.
diff --git a/app.example.json b/app.example.json
@@ -19,13 +19,13 @@
       "icon": "./assets/images/ios.icon.png",
       "bundleIdentifier": "nmf.earth",
       "supportsTablet": true,
-      "buildNumber": "19"
+      "buildNumber": "20"
     },
     "android": {
       "icon": "./assets/images/android.icon.png",
       "useNextNotificationsApi": true,
       "package": "nmf.earth",
-      "versionCode": 19
+      "versionCode": 20
     },
     "userInterfaceStyle": "automatic",
     "hooks": {

diff --git a/app/navigation/Navigator/BottomTabNavigator.tsx b/app/navigation/Navigator/BottomTabNavigator.tsx
@@ -45,7 +45,6 @@ const BottomTabNavigator = (): React.ReactElement => {
           borderTopWidth: 2,
           borderTopColor: Colors.green10,
           paddingBottom: bottom / 2 + 6,
-          paddingTop: 2,
         },
       }}
     >

diff --git a/app/screens/EmissionItem/EmissionItemScreen.navigationOptions.tsx b/app/screens/EmissionItem/EmissionItemScreen.navigationOptions.tsx
@@ -6,7 +6,7 @@ import { Text, InfoButton } from "components";
 import { t } from "utils";
 import { Colors, ComponentsStyle } from "style";
 
-const emissionsInfoAvailable = [FoodType.chocolate, FoodType.cheese];
+const emissionsInfoAvailable = [FoodType.cheese];
 
 const navigationOptions = (prop) => {
   const emissionModelType = path(["route", "params", "emissionModelType"], prop);

diff --git a/app/screens/EmissionItem/EmissionItemScreen.styles.ts b/app/screens/EmissionItem/EmissionItemScreen.styles.ts
@@ -8,11 +8,12 @@ export default StyleSheet.create({
     paddingTop: 22,
   },
   lastItem: {
-    paddingTop: 6,
+    alignItems: "flex-start",
+    paddingTop: 2,
     paddingBottom: 24,
   },
   text: {
-    paddingTop: 6,
+    paddingTop: 2,
   },
   date: {
     flexDirection: "row",

diff --git a/app/screens/EmissionItem/EmissionItemScreen.tsx b/app/screens/EmissionItem/EmissionItemScreen.tsx
@@ -1,4 +1,4 @@
-import React, { Fragment, useEffect } from "react";
+import React, { useEffect } from "react";
 import { useSelector, useDispatch } from "react-redux";
 import { ScrollView, View, Switch } from "react-native";
 import { isEmpty, pathOr } from "ramda";
@@ -44,60 +44,58 @@ const EmissionItemScreen = ({ language = "" }: LocalizationContextProps) => {
     if (!emission) navigator.goBack();
   }, [navigator, emission]);
 
+  if (isEmpty(emission)) {
+    return null;
+  }
+
   return (
-    <Fragment>
-      {!isEmpty(emission) && (
-        <ScrollView style={styles.container}>
-          {name.length ? (
-            <>
-              <Text.H3>{t("EMISSION_ITEM_SCREEN_NAME")}</Text.H3>
-              <Text.Primary darkGray style={styles.lastItem}>
-                {name}
-              </Text.Primary>
-            </>
-          ) : null}
-          <>
-            <Text.H3>{t("EMISSION_ITEM_SCREEN_TYPE")}</Text.H3>
-            <Text.Primary darkGray style={styles.lastItem}>
-              {ui.getTranslationEmissionType(emissionType)}
-              {" - "}
-              {ui.getTranslationEmissionModelType(emissionModelType)}
-            </Text.Primary>
-          </>
-          <Text.H3>{t("EMISSION_ITEM_SCREEN_QUANTITY")}</Text.H3>
+    <ScrollView style={styles.container}>
+      {name.length ? (
+        <>
+          <Text.H3>{t("EMISSION_ITEM_SCREEN_NAME")}</Text.H3>
           <Text.Primary darkGray style={styles.lastItem}>
-            <FormattedNumber
-              maximumFractionDigits={2}
-              value={co2Emission > 1 ? co2Emission : co2Emission * 1000}
-            />{" "}
-            {co2Emission > 1 ? " kgC02eq" : " gC02eq"}
+            {name}
           </Text.Primary>
+        </>
+      ) : null}
+      <Text.H3>{t("EMISSION_ITEM_SCREEN_TYPE")}</Text.H3>
+      <Text.Primary darkGray style={styles.lastItem}>
+        {ui.getTranslationEmissionType(emissionType)}
+        {" - "}
+        {ui.getTranslationEmissionModelType(emissionModelType)}
+      </Text.Primary>
+      <Text.H3>{t("EMISSION_ITEM_SCREEN_QUANTITY")}</Text.H3>
+      <Text.Primary darkGray style={styles.lastItem}>
+        <FormattedNumber
+          maximumFractionDigits={2}
+          value={co2Emission > 1 ? co2Emission : co2Emission * 1000}
+        />{" "}
+        {co2Emission > 1 ? " kgC02eq" : " gC02eq"}
+      </Text.Primary>
 
-          <Text.H3>{t("EMISSION_ITEM_SCREEN_MITIGATED")}</Text.H3>
-          <Text.Primary darkGray style={styles.text}>
-            {isMitigated
-              ? t("EMISSION_ITEM_SCREEN_IS_MITIGATED")
-              : t("EMISSION_ITEM_SCREEN_IS_NOT_MITIGATED")}
-          </Text.Primary>
-          <View style={styles.lastItem}>
-            <Switch value={isMitigated} onValueChange={toggleIsMitigated} />
-          </View>
+      <Text.H3>{t("EMISSION_ITEM_SCREEN_MITIGATED")}</Text.H3>
+      <Text.Primary darkGray style={styles.text}>
+        {isMitigated
+          ? t("EMISSION_ITEM_SCREEN_IS_MITIGATED")
+          : t("EMISSION_ITEM_SCREEN_IS_NOT_MITIGATED")}
+      </Text.Primary>
+      <View style={styles.lastItem}>
+        <Switch value={isMitigated} onValueChange={toggleIsMitigated} />
+      </View>
 
-          <Text.H3>{t("EMISSION_ITEM_SCREEN_DATE")}</Text.H3>
-          <View style={styles.date}>
-            <Text.Primary darkGray style={[styles.lastItem, styles.day]}>
-              {day + " "}
-            </Text.Primary>
-            <Text.Primary darkGray style={styles.lastItem}>
-              {monthAndYear}
-            </Text.Primary>
-          </View>
-          <Button.Primary red fullWidth onPress={deleteEmission} textType={"Primary"}>
-            <Text.Primary white>{t("EMISSION_ITEM_SCREEN_DELETE_EMISSION")}</Text.Primary>
-          </Button.Primary>
-        </ScrollView>
-      )}
-    </Fragment>
+      <Text.H3>{t("EMISSION_ITEM_SCREEN_DATE")}</Text.H3>
+      <View style={styles.date}>
+        <Text.Primary darkGray style={[styles.lastItem, styles.day]}>
+          {day + " "}
+        </Text.Primary>
+        <Text.Primary darkGray style={styles.lastItem}>
+          {monthAndYear}
+        </Text.Primary>
+      </View>
+      <Button.Primary red fullWidth onPress={deleteEmission} textType={"Primary"}>
+        <Text.Primary white>{t("EMISSION_ITEM_SCREEN_DELETE_EMISSION")}</Text.Primary>
+      </Button.Primary>
+    </ScrollView>
   );
 };
 

diff --git a/app/screens/EmissionItem/__tests__/__snapshots__/EmissionItemScreen.test.tsx.snap b/app/screens/EmissionItem/__tests__/__snapshots__/EmissionItemScreen.test.tsx.snap
@@ -19,8 +19,9 @@ exports[`EmissionsScreen renders correctly 1`] = `
       darkGray={true}
       style={
         Object {
+          "alignItems": "flex-start",
           "paddingBottom": 24,
-          "paddingTop": 6,
+          "paddingTop": 2,
         }
       }
     >
@@ -33,8 +34,9 @@ exports[`EmissionsScreen renders correctly 1`] = `
       darkGray={true}
       style={
         Object {
+          "alignItems": "flex-start",
           "paddingBottom": 24,
-          "paddingTop": 6,
+          "paddingTop": 2,
         }
       }
     >
@@ -48,8 +50,9 @@ exports[`EmissionsScreen renders correctly 1`] = `
       darkGray={true}
       style={
         Object {
+          "alignItems": "flex-start",
           "paddingBottom": 24,
-          "paddingTop": 6,
+          "paddingTop": 2,
         }
       }
     >
@@ -67,7 +70,7 @@ exports[`EmissionsScreen renders correctly 1`] = `
       darkGray={true}
       style={
         Object {
-          "paddingTop": 6,
+          "paddingTop": 2,
         }
       }
     >
@@ -76,8 +79,9 @@ exports[`EmissionsScreen renders correctly 1`] = `
     <View
       style={
         Object {
+          "alignItems": "flex-start",
           "paddingBottom": 24,
-          "paddingTop": 6,
+          "paddingTop": 2,
         }
       }
     >
@@ -110,8 +114,9 @@ exports[`EmissionsScreen renders correctly 1`] = `
         style={
           Array [
             Object {
+              "alignItems": "flex-start",
               "paddingBottom": 24,
-              "paddingTop": 6,
+              "paddingTop": 2,
             },
             Object {
               "textTransform": "capitalize",
@@ -125,8 +130,9 @@ exports[`EmissionsScreen renders correctly 1`] = `
         darkGray={true}
         style={
           Object {
+            "alignItems": "flex-start",
             "paddingBottom": 24,
-            "paddingTop": 6,
+            "paddingTop": 2,
           }
         }
       >

diff --git a/app/screens/MonthlyBudget/MonthlyBudgetScreen.tsx b/app/screens/MonthlyBudget/MonthlyBudgetScreen.tsx
@@ -85,7 +85,7 @@ const MonthlyBudgetScreen = ({ navigation }) => {
           <View style={styles.parisAgreement}>
             <Text.Secondary center>
               {t("MONTHLY_BUDGET_SCREEN_PARIS_AGREEMENT")}
-              <Text.Secondary bold blue>
+              <Text.Secondary bold darkGray>
                 {" 166 kg CO2"}
               </Text.Secondary>
             </Text.Secondary>

diff --git a/app/screens/MonthlyBudget/__tests__/__snapshots__/MonthlyBudgetScreen.test.tsx.snap b/app/screens/MonthlyBudget/__tests__/__snapshots__/MonthlyBudgetScreen.test.tsx.snap
@@ -200,8 +200,8 @@ exports[`MonthlyBudgetScreen renders correctly 1`] = `
           >
             If you wish to respect the Paris agreement (to keep the rise in global average temperature below 2 degrees), set your monthly budget at
             <Text.Secondary
-              blue={true}
               bold={true}
+              darkGray={true}
             >
                166 kg CO2
             </Text.Secondary>