diff --git a/android/app/build.gradle b/android/app/build.gradle index 0312239..435597e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -192,4 +192,4 @@ dependencies { } // code-push -apply from: "../../node_modules/react-native-code-push/android/codepush.gradle" +// apply from: "../../node_modules/react-native-code-push/android/codepush.gradle" diff --git a/android/app/src/main/java/com/minibits_wallet/MainApplication.kt b/android/app/src/main/java/com/minibits_wallet/MainApplication.kt index 7c77086..f3b0452 100644 --- a/android/app/src/main/java/com/minibits_wallet/MainApplication.kt +++ b/android/app/src/main/java/com/minibits_wallet/MainApplication.kt @@ -12,7 +12,7 @@ import com.facebook.react.defaults.DefaultReactNativeHost import com.facebook.react.soloader.OpenSourceMergedSoMapping import com.facebook.soloader.SoLoader import com.facebook.react.modules.network.OkHttpClientProvider -import com.microsoft.codepush.react.CodePush +// import com.microsoft.codepush.react.CodePush class MainApplication : Application(), ReactApplication { @@ -35,9 +35,9 @@ class MainApplication : Application(), ReactApplication { // 2. Override the getJSBundleFile method in order to let // the CodePush runtime determine where to get the JS // bundle location from on each app start - override fun getJSBundleFile(): String { - return CodePush.getJSBundleFile() - } + // override fun getJSBundleFile(): String { + // return CodePush.getJSBundleFile() + // } } override val reactHost: ReactHost diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 3869a19..a26fde8 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -1,4 +1,4 @@ Minibits - mockkey + diff --git a/ios/minibits_wallet_075/AppDelegate.swift b/ios/minibits_wallet_075/AppDelegate.swift index c5ff359..024313a 100644 --- a/ios/minibits_wallet_075/AppDelegate.swift +++ b/ios/minibits_wallet_075/AppDelegate.swift @@ -24,8 +24,7 @@ class AppDelegate: RCTAppDelegate { #if DEBUG RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index") #else - // Bundle.main.url(forResource: "main", withExtension: "jsbundle") - CodePush.bundleURL; + Bundle.main.url(forResource: "main", withExtension: "jsbundle") #endif } } diff --git a/ios/minibits_wallet_075/Info.plist b/ios/minibits_wallet_075/Info.plist index 45c9e68..ce13e9b 100644 --- a/ios/minibits_wallet_075/Info.plist +++ b/ios/minibits_wallet_075/Info.plist @@ -2,8 +2,6 @@ - CodePushDeploymentKey - 64rRBkOtdnI3ptGS03latjyfbv6lq4JobNidT CFBundleDevelopmentRegion en CFBundleDisplayName diff --git a/package.json b/package.json index fe4d468..a45442a 100644 --- a/package.json +++ b/package.json @@ -54,8 +54,7 @@ "react": "18.3.1", "react-native": "0.77.0", "react-native-animated-pagination-dots": "^0.1.73", - "react-native-camera-kit": "teslamotors/react-native-camera-kit#7e94541bbfa34f3a74756d7a1a1a7e3468e6a25c", - "react-native-code-push": "^9.0.1", + "react-native-camera-kit": "teslamotors/react-native-camera-kit#7e94541bbfa34f3a74756d7a1a1a7e3468e6a25c", "react-native-dotenv": "^3.4.11", "react-native-exit-app": "^2.0.0", "react-native-flash-message": "^0.4.2", diff --git a/src/App.tsx b/src/App.tsx index 10c3ad7..189699a 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -8,7 +8,7 @@ import { CODEPUSH_PRODUCTION_DEPLOYMENT_KEY, ANDROID_VERSION_NAME, } from '@env' -import codePush from 'react-native-code-push' +// import codePush from 'react-native-code-push' import FlashMessage from "react-native-flash-message" import { SafeAreaProvider, @@ -126,6 +126,7 @@ const $title: TextStyle = { color: 'white' } -const deploymentKey = APP_ENV === Env.PROD ? CODEPUSH_PRODUCTION_DEPLOYMENT_KEY : CODEPUSH_STAGING_DEPLOYMENT_KEY +/*const deploymentKey = APP_ENV === Env.PROD ? CODEPUSH_PRODUCTION_DEPLOYMENT_KEY : CODEPUSH_STAGING_DEPLOYMENT_KEY const codePushOptions = { deploymentKey, checkFrequency: codePush.CheckFrequency.MANUAL } -export default codePush(codePushOptions)(App) +export default codePush(codePushOptions)(App)*/ +export default App diff --git a/src/screens/SettingsScreen.tsx b/src/screens/SettingsScreen.tsx index 63900c6..f3e253d 100644 --- a/src/screens/SettingsScreen.tsx +++ b/src/screens/SettingsScreen.tsx @@ -8,7 +8,7 @@ import { CODEPUSH_STAGING_DEPLOYMENT_KEY, CODEPUSH_PRODUCTION_DEPLOYMENT_KEY, } from '@env' -import codePush, { RemotePackage } from 'react-native-code-push' +// import codePush, { RemotePackage } from 'react-native-code-push' import {ThemeCode, Themes, colors, spacing, useThemeColor} from '../theme' import {ListItem, Screen, Text, Card, NwcIcon, Button, BottomModal, InfoModal, Icon} from '../components' import {useHeader} from '../utils/useHeader' @@ -54,12 +54,12 @@ export const SettingsScreen = observer(function SettingsScreen({ route }: Props) useEffect(() => { const checkForUpdate = async () => { try { - const update = await codePush.checkForUpdate(deploymentKey, handleBinaryVersionMismatchCallback) + /*const update = await codePush.checkForUpdate(deploymentKey, handleBinaryVersionMismatchCallback) if (update && update.failedInstall !== true) { // do not announce update that failed to install before setUpdateDescription(update.description) setUpdateSize(`${round(update.packageSize * 0.000001, 2)}MB`) setIsUpdateAvailable(true) - } + }*/ } catch (e: any) { log.info(e.name, e.message) @@ -137,10 +137,10 @@ export const SettingsScreen = observer(function SettingsScreen({ route }: Props) setIsThemeModalVisible(previousState => !previousState) } - const handleBinaryVersionMismatchCallback = function(update: RemotePackage) { + /* const handleBinaryVersionMismatchCallback = function(update: RemotePackage) { // silent setIsNativeUpdateAvailable(true) - } + } */ const gotoMints = function() { navigation.navigate('Mints', {}) diff --git a/src/screens/UpdateScreen.tsx b/src/screens/UpdateScreen.tsx index c81b20b..a5897f3 100644 --- a/src/screens/UpdateScreen.tsx +++ b/src/screens/UpdateScreen.tsx @@ -6,7 +6,7 @@ import { CODEPUSH_STAGING_DEPLOYMENT_KEY, CODEPUSH_PRODUCTION_DEPLOYMENT_KEY, } from '@env' -import codePush from "react-native-code-push" +// import codePush from "react-native-code-push" import {colors, spacing, useThemeColor} from '../theme' import { Icon, @@ -78,7 +78,7 @@ export const UpdateScreen = observer(function UpdateScreen({ route }: Props) { const handleUpdate = function (): void { - try { + /*try { codePush.sync({ deploymentKey, rollbackRetryOptions: { @@ -102,7 +102,7 @@ export const UpdateScreen = observer(function UpdateScreen({ route }: Props) { }) } catch (e: any) { handleError(e) - } + }*/ } diff --git a/src/screens/WalletScreen.tsx b/src/screens/WalletScreen.tsx index 0c7a219..eb164a4 100644 --- a/src/screens/WalletScreen.tsx +++ b/src/screens/WalletScreen.tsx @@ -15,7 +15,7 @@ import { LayoutAnimation, AppStateStatus, } from 'react-native' -import codePush, { RemotePackage } from 'react-native-code-push' +// import codePush, { RemotePackage } from 'react-native-code-push' import {moderateScale, verticalScale} from '@gocodingnow/rn-size-matters' import { SvgXml } from 'react-native-svg' import { NavigationState, Route, TabBar, TabBarItemProps, TabBarProps, TabView } from 'react-native-tab-view' @@ -113,7 +113,7 @@ export const WalletScreen = observer(function WalletScreen({ route }: Props) { const [isNativeUpdateAvailable, setIsNativeUpdateAvailable] = useState(false) // On app start - useEffect(() => { + /* useEffect(() => { const checkForUpdate = async () => { try { const update = await codePush.checkForUpdate(deploymentKey, handleBinaryVersionMismatchCallback) @@ -140,15 +140,15 @@ export const WalletScreen = observer(function WalletScreen({ route }: Props) { checkForUpdate() }, 500) - }, []) + }, []) const handleBinaryVersionMismatchCallback = function(update: RemotePackage) { log.info('[handleBinaryVersionMismatchCallback] triggered', ANDROID_VERSION_NAME, update) setIsNativeUpdateAvailable(true) toggleUpdateModal() - } - + } */ + // On app start useEffect(() => { const getInitialData = async () => {