diff --git a/src/components/busArrivalTime/BusArrivalTime.js b/src/components/busArrivalTime/BusArrivalTime.js
index a1eb652..95e00f3 100644
--- 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 (
-
-
-
-
-
- {t("remainingTime")} {getMinutesDiffStr(item.eta)}
-
+ if (item.eta_seq && item.eta) {
+ return (
+
+
+
+
+
+ {t("remainingTime")} {getMinutesDiffStr(item.eta)}
+
+
+
+
+ );
+ } else {
+ return (
+
+
+ {t("noData")}
-
- );
+ );
+ }
});
} else {
busArrivalTimeView = (
diff --git a/src/components/busStopArrivalTime/BusStopArrivalTime.js b/src/components/busStopArrivalTime/BusStopArrivalTime.js
index 3573b08..59b1210 100644
--- 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 (
-
-
-
-
-
- {t("remainingTime")} {getMinutesDiffStr(item.eta)}
-
+ if (item.eta_seq && item.eta) {
+ return (
+
+
+
+
+
+ {t("remainingTime")} {getMinutesDiffStr(item.eta)}
+
+
+
+
+ );
+ } else {
+ return (
+
+
+ {t("noData")}
-
- );
+ );
+ }
});
const view = (