From f14a3582e6b8dc19573b48b035fe31c560dac77a Mon Sep 17 00:00:00 2001
From: Ivan Chen <ivan@tagg.id>
Date: Tue, 2 Mar 2021 16:25:49 -0500
Subject: renamed and changed logic to check for multiple versions

---
 src/constants/api.ts          | 2 +-
 src/routes/Routes.tsx         | 6 +++---
 src/services/CommonService.ts | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/constants/api.ts b/src/constants/api.ts
index 57c26824..380dd061 100644
--- a/src/constants/api.ts
+++ b/src/constants/api.ts
@@ -4,7 +4,7 @@ const BASE_URL: string = 'http://127.0.0.1:8000/'; // local server
 
 const API_URL: string = BASE_URL + 'api/';
 export const LOGIN_ENDPOINT: string = API_URL + 'login/';
-export const VERSION_ENDPOINT: string = API_URL + 'version/';
+export const VERSION_ENDPOINT: string = API_URL + 'version/v2/';
 export const REGISTER_ENDPOINT: string = API_URL + 'register/';
 export const EDIT_PROFILE_ENDPOINT: string = API_URL + 'edit-profile/';
 export const SEND_OTP_ENDPOINT: string = API_URL + 'send-otp/';
diff --git a/src/routes/Routes.tsx b/src/routes/Routes.tsx
index 1cbc9bc5..01ffacab 100644
--- a/src/routes/Routes.tsx
+++ b/src/routes/Routes.tsx
@@ -3,7 +3,7 @@ import React, {useEffect, useState} from 'react';
 import DeviceInfo from 'react-native-device-info';
 import SplashScreen from 'react-native-splash-screen';
 import {useDispatch, useSelector} from 'react-redux';
-import {fcmService, getLiveVersion} from '../services';
+import {fcmService, getCurrentLiveVersions} from '../services';
 import {
   updateNewNotificationReceived,
   updateNewVersionAvailable,
@@ -54,8 +54,8 @@ const Routes: React.FC = () => {
 
   useEffect(() => {
     const checkVersion = async () => {
-      const liveVersion = await getLiveVersion();
-      if (liveVersion && liveVersion !== DeviceInfo.getVersion()) {
+      const liveVersions = await getCurrentLiveVersions();
+      if (liveVersions.includes(DeviceInfo.getVersion())) {
         setNewVersionAvailable(true);
         dispatch(updateNewVersionAvailable(true));
       }
diff --git a/src/services/CommonService.ts b/src/services/CommonService.ts
index 9fa7417f..5bc1174d 100644
--- a/src/services/CommonService.ts
+++ b/src/services/CommonService.ts
@@ -22,7 +22,7 @@ export const loadImageFromURL = async (url: string) => {
   }
 };
 
-export const getLiveVersion = async () => {
+export const getCurrentLiveVersions = async () => {
   try {
     const response = await fetch(VERSION_ENDPOINT, {method: 'GET'});
     return response.status === 200 ? await response.json() : undefined;
-- 
cgit v1.2.3-70-g09d2