merge dev into main

.github/actions/mobile-setup/action.yml

@@ -35,7 +35,7 @@ runs:
         sudo update-locale LANG=en_US.UTF-8
 
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Setup Ruby environment
       uses: ruby/setup-ruby@v1

.github/workflows/action.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     environment: development
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # Circom installation from https://github.com/erhant/circomkit/blob/main/.github/workflows/tests.yml
       - name: Install dependencies

.github/workflows/mobile-deploy.yml

@@ -44,6 +44,8 @@ on:
 
 jobs:
   build-ios:
+    # disable for now, will fix soon
+    if: false
     runs-on: macos-latest
     steps:
       - name: Set up Xcode
@@ -309,41 +311,41 @@ jobs:
       - name: Remove project.pbxproj updates we don't want to commit
         run: |
           PBXPROJ_FILE="app/ios/Self.xcodeproj/project.pbxproj"
-          
+
           # Create a temporary file to store version info
           echo "Extracting version information..."
           rm -f versions.txt
           grep -E 'CURRENT_PROJECT_VERSION = [0-9]+;|MARKETING_VERSION = [0-9]+\.[0-9]+\.[0-9]+;' "${PBXPROJ_FILE}" > versions.txt
-          
+
           # Check if we have version information
           if [ -s versions.txt ]; then
             echo "Found version information. Resetting file and re-applying versions..."
-            
+
             # Store the version values
             CURRENT_VERSION=$(grep 'CURRENT_PROJECT_VERSION' versions.txt | head -1 | sed 's/.*CURRENT_PROJECT_VERSION = \([0-9]*\);.*/\1/')
             MARKETING_VERSION=$(grep 'MARKETING_VERSION' versions.txt | head -1 | sed 's/.*MARKETING_VERSION = \([0-9]*\.[0-9]*\.[0-9]*\);.*/\1/')
-            
+
             echo "Current version: $CURRENT_VERSION"
             echo "Marketing version: $MARKETING_VERSION"
-            
+
             # Reset the file to HEAD
             git checkout HEAD -- "${PBXPROJ_FILE}"
-            
+
             # Update the versions if they exist
             if [ ! -z "$CURRENT_VERSION" ]; then
               sed -i '' "s/\(CURRENT_PROJECT_VERSION = \)[0-9]*;/\1$CURRENT_VERSION;/g" "${PBXPROJ_FILE}"
             fi
-            
+
             if [ ! -z "$MARKETING_VERSION" ]; then
               sed -i '' "s/\(MARKETING_VERSION = \)[0-9]*\.[0-9]*\.[0-9]*;/\1$MARKETING_VERSION;/g" "${PBXPROJ_FILE}"
             fi
-            
+
             echo "Version information successfully applied."
           else
             echo "No version information found. Resetting file..."
             git checkout HEAD -- "${PBXPROJ_FILE}"
           fi
-          
+
           # Clean up
           rm -f versions.txt
 
@@ -353,13 +355,16 @@ jobs:
           app_path: ${{ env.APP_PATH }}
 
       - name: Commit updated build number
-        if: ${{ !env.ACT }}
+        # disable for now, commit doesn't work as expected
+        if: false #${{ !env.ACT }}
         uses: ./.github/actions/push-changes
         with:
           commit_message: "incrementing ios build number for version ${{ env.VERSION }}"
           commit_paths: "./app/ios/OpenPassport/Info.plist ./app/ios/Self.xcodeproj/project.pbxproj"
 
   build-android:
+    # disable for now, will fix soon
+    if: false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -479,7 +484,8 @@ jobs:
           app_path: ${{ env.APP_PATH }}
 
       - name: Commit updated build version
-        if: ${{ !env.ACT }}
+        # disable for now, commit doesn't work as expected
+        if: false #${{ !env.ACT }}
         uses: ./.github/actions/push-changes
         with:
           commit_message: "incrementing android build version for version ${{ env.VERSION }}"

.github/workflows/npm-publish.yml

@@ -15,7 +15,7 @@ jobs:
       core_changed: ${{ steps.check-version.outputs.core_changed }}
       qrcode_changed: ${{ steps.check-version.outputs.qrcode_changed }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 2
 
@@ -38,7 +38,7 @@ jobs:
     if: needs.detect-changes.outputs.core_changed == 'true'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Node.js
         uses: actions/setup-node@v3
@@ -70,7 +70,7 @@ jobs:
     if: needs.detect-changes.outputs.qrcode_changed == 'true'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Node.js
         uses: actions/setup-node@v3
@@ -95,4 +95,4 @@ jobs:
           cd sdk/qrcode
           npm publish --access public
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.prettierrc

@@ -0,0 +1,12 @@
+{
+  "arrowParens": "avoid",
+  "bracketSameLine": false,
+  "bracketSpacing": true,
+  "singleQuote": true,
+  "trailingComma": "all",
+  "tabWidth": 2,
+  "useTabs": false,
+  "semi": true,
+  "endOfLine": "auto",
+  "parser": "typescript"
+}

.vscode/settings.json

@@ -0,0 +1,70 @@
+{
+  // Formatting & Linting
+  "editor.formatOnSave": false,
+  "editor.formatOnPaste": false,
+
+  // Path-specific formatting
+  "[**/app/**]": {
+    "editor.formatOnSave": true
+  },
+
+  // ESLint Configuration
+  "eslint.run": "onType",
+  "eslint.format.enable": true,
+  "eslint.lintTask.enable": true,
+  "eslint.quiet": false,
+  "eslint.validate": [
+    "javascript",
+    "javascriptreact",
+    "typescript",
+    "typescriptreact"
+  ],
+  "eslint.probe": [
+    "javascript",
+    "javascriptreact",
+    "typescript",
+    "typescriptreact"
+  ],
+
+  // Auto-fix Actions
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "always",
+  },
+
+  // TypeScript Specific Rules
+  "typescript.format.enable": false,  // Disable VS Code's built-in formatter for TypeScript
+  "[typescript]": {
+    "editor.defaultFormatter": null  // Let ESLint handle TypeScript formatting
+  },
+  "[typescriptreact]": {
+    "editor.defaultFormatter": null  // Let ESLint handle TypeScript React formatting
+  },
+
+  // Indentation & Whitespace
+  "editor.tabSize": 2,
+  "editor.insertSpaces": true,
+  "editor.indentSize": "tabSize",
+  "editor.detectIndentation": true,
+  "editor.useTabStops": true,
+  "editor.stickyTabStops": true,
+  "editor.trimAutoWhitespace": true,
+  "files.trimTrailingWhitespace": true,
+  "files.insertFinalNewline": true,
+  "files.trimFinalNewlines": true,
+  "javascript.format.insertSpaceAfterOpeningAndBeforeClosingEmptyBraces": false,
+  "typescript.format.insertSpaceAfterOpeningAndBeforeClosingEmptyBraces": false,
+
+  // Editor Visual Aids
+  "editor.renderWhitespace": "selection",
+  "editor.renderControlCharacters": true,
+  "editor.rulers": [100],
+  "editor.wordWrap": "off",
+  "editor.wrappingIndent": "none",
+
+  // Editor suggestions
+  "editor.quickSuggestions": {
+    "other": true,
+    "comments": false,
+    "strings": false
+  }
+}

app/.eslintrc.js

@@ -1,9 +1,29 @@
 module.exports = {
   root: true,
-  extends: '@react-native',
+  extends: ['@react-native', 'plugin:prettier/recommended'],
+  plugins: ['simple-import-sort', 'prettier'],
   ignorePatterns: ['ios/', 'android/', 'deployments/', 'node_modules/'],
   rules: {
+    // Import sorting rules
+    'simple-import-sort/imports': 'warn',
+    'simple-import-sort/exports': 'warn',
+
+    // Add prettier rule to show prettier errors as ESLint errors
+    'prettier/prettier': [
+      'warn',
+      {
+        // Fix for TypeScript union types indentation
+        typescriptBracketSpacing: true,
+        typeAssertionStyle: 'as',
+      },
+      { usePrettierrc: true },
+    ],
+
+    // Preserve project-specific rule exemptions
     'react-native/no-inline-styles': 'off',
     'react-hooks/exhaustive-deps': 'off',
+
+    // Override any ESLint rules that conflict with the TypeScript union type formatting
+    '@typescript-eslint/indent': 'off',
   },
 };

app/.prettierrc

@@ -0,0 +1,11 @@
+{
+  "arrowParens": "avoid",
+  "bracketSameLine": false,
+  "bracketSpacing": true,
+  "singleQuote": true,
+  "trailingComma": "all",
+  "tabWidth": 2,
+  "useTabs": false,
+  "semi": true,
+  "endOfLine": "auto"
+}

app/App.tsx

@@ -1,33 +1,33 @@
-import React from 'react';
 import 'react-native-get-random-values';
 
 import { Buffer } from 'buffer';
+import React from 'react';
 import { YStack } from 'tamagui';
 
-import AppNavigation from './src/Navigation';
+import ErrorBoundary from './src/components/ErrorBoundary';
+import AppNavigation from './src/navigation';
 import { initSentry, wrapWithSentry } from './src/Sentry';
-import { AppProvider } from './src/stores/appProvider';
 import { AuthProvider } from './src/stores/authProvider';
+import { DatabaseProvider } from './src/stores/databaseProvider';
 import { PassportProvider } from './src/stores/passportDataProvider';
-import { ProofProvider } from './src/stores/proofProvider';
 
 initSentry();
 
 global.Buffer = Buffer;
 
 function App(): React.JSX.Element {
   return (
-    <YStack f={1} h="100%" w="100%">
-      <AuthProvider>
-        <PassportProvider>
-          <AppProvider>
-            <ProofProvider>
+    <ErrorBoundary>
+      <YStack f={1} h="100%" w="100%">
+        <AuthProvider>
+          <PassportProvider>
+            <DatabaseProvider>
               <AppNavigation />
-            </ProofProvider>
-          </AppProvider>
-        </PassportProvider>
-      </AuthProvider>
-    </YStack>
+            </DatabaseProvider>
+          </PassportProvider>
+        </AuthProvider>
+      </YStack>
+    </ErrorBoundary>
   );
 }
 

app/Gemfile.lock

@@ -25,17 +25,18 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.2)
-    aws-partitions (1.1069.0)
-    aws-sdk-core (3.220.1)
+    aws-partitions (1.1088.0)
+    aws-sdk-core (3.222.2)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
       jmespath (~> 1, >= 1.6.1)
+      logger
     aws-sdk-kms (1.99.0)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.182.0)
+    aws-sdk-s3 (1.183.0)
       aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -129,7 +130,7 @@ GEM
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fastimage (2.4.0)
-    fastlane (2.227.0)
+    fastlane (2.227.1)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -169,7 +170,7 @@ GEM
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.4.0)
+      xcpretty (~> 0.4.1)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
     fastlane-plugin-increment_version_code (0.4.3)
     fastlane-plugin-versioning_android (0.1.1)
@@ -292,7 +293,7 @@ GEM
       colored2 (~> 3.1)
       nanaimo (~> 0.4.0)
       rexml (>= 3.3.6, < 4.0)
-    xcpretty (0.4.0)
+    xcpretty (0.4.1)
       rouge (~> 3.28.0)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)

app/android/android-passport-reader/app/build.gradle

@@ -73,7 +73,7 @@ dependencies {
     implementation 'commons-codec:commons-codec:1.13'
 
     //Camera
-    implementation 'io.fotoapparat:fotoapparat:2.7.0'
+    implementation "com.github.RedApparat:Fotoapparat:2.7.0"
 
     implementation 'androidx.multidex:multidex:2.0.1'