fix: 🐛 fix no data ui

yeukfei02 · Feb 16, 2023 · 719a3b7 · 719a3b7
1 parent eba9acd
commit 719a3b7
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 24 deletions.
diff --git a/src/components/busArrivalTime/BusArrivalTime.js b/src/components/busArrivalTime/BusArrivalTime.js
@@ -138,20 +138,30 @@ function BusArrivalTime() {
     if (!loading) {
       if (!_.isEmpty(busArrivalTime)) {
         busArrivalTimeView = busArrivalTime.map((item, i) => {
-          return (
-            <View key={i}>
-              <Card style={styles.cardContainer}>
-                <Card.Title
-                  title={`${t("next")} ${item.eta_seq || i + 1} ${t("bus")}`}
-                />
-                <Card.Content>
-                  <Title>
-                    {t("remainingTime")} {getMinutesDiffStr(item.eta)}
-                  </Title>
+          if (item.eta_seq && item.eta) {
+            return (
+              <View key={i}>
+                <Card style={styles.cardContainer}>
+                  <Card.Title
+                    title={`${t("next")} ${item.eta_seq || i + 1} ${t("bus")}`}
+                  />
+                  <Card.Content>
+                    <Title>
+                      {t("remainingTime")} {getMinutesDiffStr(item.eta)}
+                    </Title>
+                  </Card.Content>
+                </Card>
+              </View>
+            );
+          } else {
+            return (
+              <Card key={i} style={styles.cardContainer}>
+                <Card.Content style={{ alignSelf: "center" }}>
+                  <Title style={{ color: "red" }}>{t("noData")}</Title>
                 </Card.Content>
               </Card>
-            </View>
-          );
+            );
+          }
         });
       } else {
         busArrivalTimeView = (

diff --git a/src/components/busStopArrivalTime/BusStopArrivalTime.js b/src/components/busStopArrivalTime/BusStopArrivalTime.js
@@ -137,20 +137,30 @@ function BusStopArrivalTime() {
         busStopArrivalTimeView = Object.entries(busStopArrivalTime).map(
           ([key, value], i) => {
             const valueListView = value.map((item, i) => {
-              return (
-                <View key={i}>
-                  <Card style={styles.cardContainer}>
-                    <Card.Title
-                      title={`${t("next")} ${item.eta_seq} ${t("bus")}`}
-                    />
-                    <Card.Content>
-                      <Title>
-                        {t("remainingTime")} {getMinutesDiffStr(item.eta)}
-                      </Title>
+              if (item.eta_seq && item.eta) {
+                return (
+                  <View key={i}>
+                    <Card style={styles.cardContainer}>
+                      <Card.Title
+                        title={`${t("next")} ${item.eta_seq} ${t("bus")}`}
+                      />
+                      <Card.Content>
+                        <Title>
+                          {t("remainingTime")} {getMinutesDiffStr(item.eta)}
+                        </Title>
+                      </Card.Content>
+                    </Card>
+                  </View>
+                );
+              } else {
+                return (
+                  <Card key={i} style={styles.cardContainer}>
+                    <Card.Content style={{ alignSelf: "center" }}>
+                      <Title style={{ color: "red" }}>{t("noData")}</Title>
                     </Card.Content>
                   </Card>
-                </View>
-              );
+                );
+              }
             });
 
             const view = (