diff --git a/.prettierrc.js b/.prettierrc.js index e659438..0a64f2a 100644 --- a/.prettierrc.js +++ b/.prettierrc.js @@ -1,7 +1,5 @@ module.exports = { arrowParens: 'avoid', - bracketSameLine: true, - bracketSpacing: false, singleQuote: true, trailingComma: 'all', semi: false, diff --git a/android/app/build.gradle b/android/app/build.gradle index 068e669..7f4911c 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -95,8 +95,8 @@ android { applicationId "com.minibits_wallet" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 58039 - versionName "0.2.2" + versionCode 58040 + versionName "0.3.0" } splits { @@ -191,5 +191,3 @@ dependencies { }*/ } -// code-push -// 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 0a268aa..397bf39 100644 --- a/android/app/src/main/java/com/minibits_wallet/MainApplication.kt +++ b/android/app/src/main/java/com/minibits_wallet/MainApplication.kt @@ -4,15 +4,13 @@ import android.app.Application import com.facebook.react.PackageList import com.facebook.react.ReactApplication import com.facebook.react.ReactHost +import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative import com.facebook.react.ReactNativeHost import com.facebook.react.ReactPackage -import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load + import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost 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.hotupdater.HotUpdater class MainApplication : Application(), ReactApplication { @@ -49,13 +47,8 @@ class MainApplication : Application(), ReactApplication { override fun onCreate() { super.onCreate() - SoLoader.init(this, OpenSourceMergedSoMapping) - + OkHttpClientProvider.setOkHttpClientFactory(CorePlaneOkHttpClientFactory()) - - if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) { - // If you opted-in for the New Architecture, we load the native entry point for this app. - load() - } + loadReactNative(this) } } diff --git a/android/build.gradle b/android/build.gradle index 9a99bba..59b7722 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -5,7 +5,7 @@ buildscript { compileSdkVersion = 35 targetSdkVersion = 35 ndkVersion = "27.1.12297006" - kotlinVersion = "2.0.21" + kotlinVersion = "2.1.20" } repositories { google() diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 37f853b..002b867 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/android/gradlew b/android/gradlew index faf9300..23d15a9 100755 --- a/android/gradlew +++ b/android/gradlew @@ -114,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/android/gradlew.bat b/android/gradlew.bat index 9d21a21..a093b73 100644 --- a/android/gradlew.bat +++ b/android/gradlew.bat @@ -1,3 +1,8 @@ +@REM Copyright (c) Meta Platforms, Inc. and affiliates. +@REM +@REM This source code is licensed under the MIT license found in the +@REM LICENSE file in the root directory of this source tree. + @rem @rem Copyright 2015 the original author or authors. @rem @@ -70,11 +75,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/dist/BUNDLE_ID b/dist/BUNDLE_ID index 592e950..f0378dc 100644 --- a/dist/BUNDLE_ID +++ b/dist/BUNDLE_ID @@ -1 +1 @@ -0198586c-6212-732d-a2cb-cf9537d9aab3 \ No newline at end of file +01985bc3-3f8c-74ec-8e25-8b8e6655e955 \ No newline at end of file diff --git a/package.json b/package.json index 79d358c..8312733 100644 --- a/package.json +++ b/package.json @@ -22,26 +22,26 @@ }, "dependencies": { "@cashu/cashu-ts": "minibits-cash/cashu-ts#b3ba36757d84ec03f1064029db02308eb3a09cc4", - "@fortawesome/fontawesome-svg-core": "^6.7.2", - "@fortawesome/free-brands-svg-icons": "^6.7.2", - "@fortawesome/free-regular-svg-icons": "^6.7.2", - "@fortawesome/free-solid-svg-icons": "^6.7.2", + "@fortawesome/fontawesome-svg-core": "^7.0.0", + "@fortawesome/free-brands-svg-icons": "^7.0.0", + "@fortawesome/free-regular-svg-icons": "^7.0.0", + "@fortawesome/free-solid-svg-icons": "^7.0.0", "@fortawesome/react-native-fontawesome": "^0.3.2", "@gandlaf21/bc-ur": "^1.1.12", "@gandlaf21/bolt11-decode": "^3.1.1", "@gocodingnow/rn-size-matters": "^0.0.4", - "@hot-updater/react-native": "0.16.3", + "@hot-updater/react-native": "0.19.9", "@notifee/react-native": "^9.1.8", - "@react-native-clipboard/clipboard": "^1.16.2", + "@react-native-clipboard/clipboard": "^1.16.3", "@react-native-community/netinfo": "^11.4.1", - "@react-native-firebase/app": "^21.12.3", - "@react-native-firebase/messaging": "^21.12.3", - "@react-navigation/bottom-tabs": "^7.3.3", - "@react-navigation/native": "^7.0.19", - "@react-navigation/native-stack": "^7.3.3", - "@react-navigation/stack": "^7.1.1", - "@scure/bip39": "1.5.0", - "@sentry/react-native": "^6.10.0", + "@react-native-firebase/app": "^22.4.0", + "@react-native-firebase/messaging": "^22.4.0", + "@react-navigation/bottom-tabs": "^7.4.5", + "@react-navigation/native": "^7.1.17", + "@react-navigation/native-stack": "^7.3.24", + "@react-navigation/stack": "^7.4.5", + "@scure/bip39": "1.6.0", + "@sentry/react-native": "^6.19.0", "date-fns": "^4.1.0", "i18n-js": "^4.5.1", "js-lnurl": "^0.6.0", @@ -54,31 +54,31 @@ "nostr-tools": "minibits-cash/nostr-tools#2991f59d0150a0cb2c71e2f9a4cb6c8aca3b19d7", "numbro": "^2.5.0", "patch-package": "^8.0.0", - "react": "19.0.0", - "react-native": "0.79.0", + "react": "19.1.0", + "react-native": "0.80.2", "react-native-animated-pagination-dots": "^0.1.73", - "react-native-camera-kit": "14.2.0", + "react-native-camera-kit": "15.1.0", "react-native-dotenv": "^3.4.11", "react-native-exit-app": "^2.0.0", "react-native-fast-image": "^8.6.3", "react-native-flash-message": "^0.4.2", - "react-native-gesture-handler": "^2.24.0", + "react-native-gesture-handler": "^2.27.2", "react-native-json-tree": "^1.5.0", "react-native-keychain": "^10.0.0", - "react-native-localize": "^3.4.1", + "react-native-localize": "^3.5.1", "react-native-logs": "^5.3.0", - "react-native-mmkv": "^3.2.0", + "react-native-mmkv": "^3.3.0", "react-native-modal": "^14.0.0-rc.1", - "react-native-pager-view": "^6.7.0", + "react-native-pager-view": "^6.8.1", "react-native-qrcode-svg": "^6.3.15", - "react-native-quick-base64": "^2.1.2", - "react-native-quick-crypto": "^0.7.12", + "react-native-quick-base64": "^2.2.1", + "react-native-quick-crypto": "^0.7.16", "react-native-quick-sqlite": "8.2.7", - "react-native-reanimated": "^3.17.1", - "react-native-safe-area-context": "^5.3.0", - "react-native-screens": "^4.10.0", - "react-native-svg": "^15.11.2", - "react-native-tab-view": "^4.0.6", + "react-native-reanimated": "^4.0.1", + "react-native-safe-area-context": "^5.5.2", + "react-native-screens": "^4.13.1", + "react-native-svg": "^15.12.1", + "react-native-tab-view": "^4.1.2", "react-native-url-polyfill": "^2.0.0", "taskon": "^0.3.1", "text-encoding-polyfill": "^0.6.7", @@ -86,21 +86,21 @@ }, "devDependencies": { "@babel/core": "^7.25.2", - "@babel/plugin-proposal-export-namespace-from": "^7.18.9", "@babel/preset-env": "^7.25.3", "@babel/runtime": "^7.25.0", - "@hot-updater/firebase": "0.16.3", - "@hot-updater/metro": "0.16.3", - "@hot-updater/sentry-plugin": "^0.16.3", - "@react-native-community/cli": "18.0.0", + "@babel/plugin-proposal-export-namespace-from": "^7.18.9", + "@hot-updater/firebase": "0.19.9", + "@hot-updater/bare": "0.19.9", + "@hot-updater/sentry-plugin": "^0.19.9", + "@react-native-community/cli": "19.1.1", "@react-native-community/cli-platform-android": "18.0.0", "@react-native-community/cli-platform-ios": "18.0.0", - "@react-native/babel-preset": "0.79.0", - "@react-native/eslint-config": "0.79.0", - "@react-native/metro-config": "0.79.0", - "@react-native/typescript-config": "0.79.0", - "@sentry/cli": "^2.43.0", - "@tsconfig/react-native": "^3.0.0", + "@react-native/babel-preset": "0.80.2", + "@react-native/eslint-config": "0.80.2", + "@react-native/metro-config": "0.80.2", + "@react-native/typescript-config": "0.80.2", + "@sentry/cli": "^2.50.2", + "@tsconfig/react-native": "^3.0.6", "@types/jest": "^29.5.13", "@types/lodash.clonedeep": "^4.5.9", "@types/react": "^19.0.0", @@ -116,7 +116,7 @@ "metro-react-native-babel-preset": "0.76.7", "prettier": "2.8.8", "react-native-clean-project": "^4.0.3", - "react-test-renderer": "19.0.0", + "react-test-renderer": "19.1.0", "typescript": "5.0.4" }, "engines": { diff --git a/tsconfig.json b/tsconfig.json index b624059..6619a50 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,5 @@ { - // "extends": "@react-native/typescript-config/tsconfig.json", + "extends": "@react-native/typescript-config", "compilerOptions": { "jsx": "react", "typeRoots": ["./src/utils/envtypes"],