Merge pull request #5451 from EdgeApp/jon/new-ver-msg

Jon/new-ver-msg

Author: Jon-edge

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased (develop)
 
+- added: "Update Available" modal
+
 ## 4.23.0 (staging)
 
 - added: Add Abstract ETH Layer 2 support

src/components/modals/UpdateModal.tsx

@@ -1685,6 +1685,7 @@ const strings = {
   notifications_recent: 'Recent',
   notifications_none: `You're all caught up!`,
   swap: 'Swap',
+  update_available: 'Update Available',
 
   // Currency Labels
   currency_label_AFN: 'Afghani',

src/locales/en_US.ts

@@ -1455,6 +1455,7 @@
   "notifications_recent": "Recent",
   "notifications_none": "You're all caught up!",
   "swap": "Swap",
+  "update_available": "Update Available",
   "currency_label_AFN": "Afghani",
   "currency_label_ALL": "Lek",
   "currency_label_DZD": "Algerian Dinar",

src/locales/strings/enUS.json

@@ -6,7 +6,7 @@ export const edgeConfig: AppConfig = {
   appId: undefined,
   appName: 'Edge',
   appNameShort: 'Edge',
-  appStore: 'https://itunes.apple.com/app/id1344400091',
+  appStore: 'https://apps.apple.com/us/app/edge-crypto-bitcoin-wallet/id1344400091',
   backupAccountSite: 'https://edge.app/light-account-creation/',
   configName: 'edge',
   darkTheme: edgeDark,
@@ -23,6 +23,7 @@ export const edgeConfig: AppConfig = {
   lightTheme: edgeLight,
   notificationServers: ['https://push2.edge.app'],
   phoneNumber: '+1-619-777-5688',
+  playStore: 'https://play.google.com/store/apps/details?id=co.edgesecure.app&hl=en_US',
   referralServers: ['https://referral1.edge.app'],
   supportsEdgeLogin: true,
   supportEmail: '[email protected]',

src/theme/edgeConfig.ts

@@ -6,7 +6,7 @@ export const testConfig: AppConfig = {
   appId: 'com.testy.wallet',
   appName: 'Testy Wallet',
   appNameShort: 'Testy',
-  appStore: 'https://itunes.apple.com/app/id1344400092',
+  appStore: 'https://apps.apple.com/us/app/edge-crypto-bitcoin-wallet/id1344400091',
   backupAccountSite: 'https://support.testy.com/accountbackupinfo',
   configName: 'test',
   darkTheme: testDark,
@@ -24,6 +24,7 @@ export const testConfig: AppConfig = {
   lightTheme: testLight,
   notificationServers: ['https://push2.edge.app'],
   phoneNumber: '+1-800-100-1000',
+  playStore: 'https://play.google.com/store/apps/details?id=co.edgesecure.app&hl=en_US',
   referralServers: ['https://referral1.testy.com'],
   supportsEdgeLogin: false,
   supportEmail: '[email protected]',

src/theme/testConfig.ts

@@ -334,6 +334,7 @@ export interface AppConfig {
   lightTheme: Theme
   notificationServers: string[]
   phoneNumber: string
+  playStore: string
   referralServers?: string[]
   supportsEdgeLogin: boolean
   supportEmail: string

src/types/types.ts

@@ -6,6 +6,7 @@ import { getVersion } from 'react-native-device-info'
 
 import { config } from '../theme/appConfig'
 import { asyncWaterfall, getOsVersion, shuffleArray } from './utils'
+import { checkAppVersion } from './versionCheck'
 const INFO_SERVERS = ['https://info1.edge.app', 'https://info2.edge.app']
 const RATES_SERVERS = ['https://rates1.edge.app', 'https://rates2.edge.app']
 
@@ -87,6 +88,7 @@ export const initInfoServer = async () => {
       } else {
         const infoData = await response.json()
         infoServerData.rollup = asInfoRollup(infoData)
+        await checkAppVersion()
       }
     } catch (e) {
       console.warn('initInfoServer: Failed to ping info server')

src/util/network.ts

@@ -0,0 +1,55 @@
+import * as React from 'react'
+import { Linking, Platform } from 'react-native'
+import { getVersion } from 'react-native-device-info'
+
+import { ButtonsModal } from '../components/modals/ButtonsModal'
+import { Airship } from '../components/services/AirshipInstance'
+import { getLocaleOrDefaultString } from '../locales/intl'
+import { lstrings } from '../locales/strings'
+import { config } from '../theme/appConfig'
+import { infoServerData } from './network'
+
+const compareVersions = (v1: string, v2: string): number => {
+  const v1Parts = v1.split('-')[0].split('.').map(Number)
+  const v2Parts = v2.split('-')[0].split('.').map(Number)
+
+  for (let i = 0; i < 3; i++) {
+    if (v1Parts[i] > v2Parts[i]) return 1
+    if (v1Parts[i] < v2Parts[i]) return -1
+  }
+  return 0
+}
+
+export const checkAppVersion = async (): Promise<void> => {
+  const currentVersion = getVersion()
+  const platform = Platform.OS
+
+  // Get latest version from info server
+  const updateInfo = infoServerData.rollup?.updateInfo
+  if (updateInfo == null || updateInfo[platform] == null) return
+  const { updateVersion, localeMessage } = updateInfo[platform]
+
+  const message = getLocaleOrDefaultString(localeMessage)
+
+  // Compare versions
+  if (compareVersions(updateVersion, currentVersion) > 0) {
+    // Show update modal
+    const updateRes = await Airship.show<'update' | undefined>(bridge => (
+      <ButtonsModal
+        bridge={bridge}
+        title={lstrings.update_available}
+        message={message}
+        buttons={{
+          update: {
+            label: lstrings.update_now,
+            type: 'primary'
+          }
+        }}
+      />
+    ))
+    if (updateRes === 'update') {
+      const url = Platform.OS === 'android' ? config.playStore : config.appStore
+      await Linking.openURL(url)
+    }
+  }
+}