diff --git a/app/.gitignore b/app/.gitignore index 551d42df3..4301b3d06 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -34,6 +34,8 @@ local.properties .cxx/ *.keystore !debug.keystore +# debug bundled builds +android/app/src/main/ # node.js # diff --git a/app/android/app/build.gradle b/app/android/app/build.gradle index e6849cef2..4c0209a15 100644 --- a/app/android/app/build.gradle +++ b/app/android/app/build.gradle @@ -85,8 +85,8 @@ android { applicationId "com.proofofpassportapp" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 19 - versionName "1.8" + versionCode 21 + versionName "2.2.3" externalNativeBuild { cmake { cppFlags += "-fexceptions -frtti -std=c++11" diff --git a/app/ios/OpenPassport.xcodeproj/project.pbxproj b/app/ios/OpenPassport.xcodeproj/project.pbxproj index 99eac55c8..22c495524 100644 --- a/app/ios/OpenPassport.xcodeproj/project.pbxproj +++ b/app/ios/OpenPassport.xcodeproj/project.pbxproj @@ -546,7 +546,7 @@ CODE_SIGN_ENTITLEMENTS = OpenPassport/OpenPassportDebug.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 72; + CURRENT_PROJECT_VERSION = 80; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 5B29R5LYHQ; ENABLE_BITCODE = NO; @@ -661,7 +661,7 @@ "$(PROJECT_DIR)", "$(PROJECT_DIR)/MoproKit/Libs", ); - MARKETING_VERSION = 2.0.6; + MARKETING_VERSION = 2.2.3; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -684,7 +684,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = OpenPassport/OpenPassport.entitlements; - CURRENT_PROJECT_VERSION = 72; + CURRENT_PROJECT_VERSION = 80; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 5B29R5LYHQ; FRAMEWORK_SEARCH_PATHS = ( @@ -798,7 +798,7 @@ "$(PROJECT_DIR)", "$(PROJECT_DIR)/MoproKit/Libs", ); - MARKETING_VERSION = 2.0.6; + MARKETING_VERSION = 2.2.3; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/app/ios/OpenPassport/Info.plist b/app/ios/OpenPassport/Info.plist index df09433ad..5783da454 100644 --- a/app/ios/OpenPassport/Info.plist +++ b/app/ios/OpenPassport/Info.plist @@ -9,7 +9,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleGetInfoString - + CFBundleIconName AppIcon CFBundleIdentifier @@ -27,26 +27,26 @@ CFBundleVersion $(CURRENT_PROJECT_VERSION) LSApplicationCategoryType - + LSRequiresIPhoneOS - + NFCReaderUsageDescription Need NFC to read Passport NSAppTransportSecurity - + NSAllowsArbitraryLoads - + NSAllowsLocalNetworking - + NSCameraUsageDescription Needed to scan the passport MRZ. NSFaceIDUsageDescription Needed to secure the secret NSHumanReadableCopyright - + NSLocationWhenInUseUsageDescription - + NSPhotoLibraryUsageDescription We need access to your photo library to allow you to choose passport photos or save generated QR codes. UILaunchStoryboardName @@ -62,7 +62,7 @@ UIInterfaceOrientationLandscapeRight UIViewControllerBasedStatusBarAppearance - + com.apple.developer.nfc.readersession.iso7816.select-identifiers A0000002471001 diff --git a/app/package.json b/app/package.json index c4443a497..c432ae929 100644 --- a/app/package.json +++ b/app/package.json @@ -1,11 +1,13 @@ { "name": "openpassport", - "version": "0.0.1", + "version": "2.2.2", "private": true, "scripts": { "analyze-android": "react-native-bundle-visualizer --platform android --dev", "analyze-ios": "react-native-bundle-visualizer --platform ios --dev", "android": "react-native run-android", + "android:build-debug": "cd ./android && yarn android:build-debug-bundle && ./gradlew clean assembleDebug && cd ..", + "android:build-debug-bundle": "yarn react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/", "clean": "watchman watch-del-all && rm -rf node_modules ios/Pods ios/build android/app/build android/build .yarn/cache ios/.xcode.env.local", "clean:xcode-env-local": "rm -f ios/.xcode.env.local", "fmt": "prettier --check .", @@ -16,6 +18,7 @@ "lint": "eslint .", "lint:fix": "eslint --fix .", "nice": "yarn fmt:fix && yarn lint:fix", + "reinstall": "yarn clean && yarn install && yarn install-app", "start": "watchman watch-del-all && react-native start", "test": "jest --passWithNoTests" }, diff --git a/app/src/Navigation.tsx b/app/src/Navigation.tsx index 40e907342..e238fd014 100644 --- a/app/src/Navigation.tsx +++ b/app/src/Navigation.tsx @@ -281,7 +281,6 @@ const AppNavigation = createNativeStackNavigator({ DevSettings: { screen: DevSettingsScreen, options: { - if: () => __DEV__, title: 'Developer Settings', headerStyle: { backgroundColor: white, diff --git a/app/src/screens/SplashScreen.tsx b/app/src/screens/SplashScreen.tsx index 4ee1c6830..a6669a51d 100644 --- a/app/src/screens/SplashScreen.tsx +++ b/app/src/screens/SplashScreen.tsx @@ -12,7 +12,7 @@ import { impactLight } from '../utils/haptic'; const SplashScreen: React.FC = ({}) => { const navigation = useNavigation(); const { userLoaded, passportData } = useUserStore(); - // TODO: Uncomment when we are done testing + const redirect = useCallback(() => { if (userLoaded && passportData) { navigation.navigate('Home');