Merge pull request #59 from stdavis/newer-country-api

use newer country api on expo sdk 31+
kimxogus · Apr 2, 2019 · 02f7828 · 02f7828
2 parents 85759f4 + 63a57b1
commit 02f7828
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/packages/react-native-version-check-expo/src/ExpoVersionInfo.js b/packages/react-native-version-check-expo/src/ExpoVersionInfo.js
@@ -20,14 +20,18 @@ if (process.env.RNVC_ENV === 'test') {
     android: { versionCode = null, package: androidPackageName = null } = {},
     ios: { bundleIdentifier = null, buildNumber = null } = {},
   } = manifest;
+  let country;
+  if (Constants.expoVersion < 26) {
+    country = Util.getCurrentDeviceCountryAsync();
+  } else if (Constants.expoVersion < 31) {
+    country = Localization.getCurrentDeviceCountryAsync();
+  } else {
+    country = Localization.country;
+  }
 
   RNVersionCheck = {
     currentVersion: version,
-    country: `${
-      Constants.expoVersion < 26
-        ? Util.getCurrentDeviceCountryAsync()
-        : Localization.getCurrentDeviceCountryAsync()
-    }`,
+    country,
     currentBuildNumber: Platform.select({
       android: versionCode,
       ios: buildNumber,