Merge remote-tracking branch 'upstream/staging' into release-1.6.0

Author: giorgikh93

.github/workflows/build-and-publish.yml

@@ -4,8 +4,12 @@ on:
   push:
     branches:
       - main
+      - dev
       - staging
 
+permissions:
+  contents: read
+  actions: write
 
 jobs:
   android:
@@ -39,7 +43,6 @@ jobs:
 
       - uses: actions/checkout@v6
         with:
-          submodules: true
           token: ${{ secrets.PAT_TOKEN }}          
 
       - uses: actions/setup-node@v4
@@ -192,25 +195,25 @@ jobs:
           path: ${{ steps.find_android.outputs.APK_PATH }}
           if-no-files-found: error
 
-      # - name: Submit to Google play via EAS
-      #   env:
-      #     EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
-      #     EXPO_GOOGLE_SERVICE_ACCOUNT_KEY_PATH: "${{ env.GITHUB_WORKSPACE }}/google-service-account.json"
-      #     CREDENTIALS_JSON: ${{ secrets.CREDENTIALS_JSON }}
-      #     GOOGLE_PLAY_KEYSTORE: ${{ secrets.GOOGLE_PLAY_KEYSTORE }}
-      #   run: |
-      #     if [ -n "${{ steps.find_android.outputs.AAB_PATH }}" ]; then
-      #       eas submit -p android --path ${{ steps.find_android.outputs.AAB_PATH }} --non-interactive
-      #     else
-      #       echo "No AAB found; skipping Android submit."
-      #     fi
+      - name: Submit to Google play via EAS
+        if: github.ref == 'refs/heads/dev'
+        env:
+          EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
+          EXPO_GOOGLE_SERVICE_ACCOUNT_KEY_PATH: "${{ env.GITHUB_WORKSPACE }}/google-service-account.json"
+          CREDENTIALS_JSON: ${{ secrets.CREDENTIALS_JSON }}
+          GOOGLE_PLAY_KEYSTORE: ${{ secrets.GOOGLE_PLAY_KEYSTORE }}
+        run: |
+          if [ -n "${{ steps.find_android.outputs.AAB_PATH }}" ]; then
+            eas submit -p android --path ${{ steps.find_android.outputs.AAB_PATH }} --non-interactive
+          else
+            echo "No AAB found; skipping Android submit."
+          fi
 
   ios:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v6
         with:
-          submodules: true
           token: ${{ secrets.PAT_TOKEN }}
 
       - uses: actions/setup-node@v4
@@ -305,28 +308,29 @@ jobs:
           path: ${{ steps.find_ipa.outputs.IPA_PATH }}
           if-no-files-found: error
 
-      # CHANGED: Submit to App Store only on main
-      # - name: Submit to Apple App Store via EAS
-      #   env:
-      #     EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
-      #     APPLE_APIKEY: ${{ secrets.APPLE_APIKEY }}
-      #     EXPO_ASC_API_KEY_PATH: "${{ env.GITHUB_WORKSPACE }}/apple-asc-api-key.p8"
-      #     EXPO_ASC_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
-      #     EXPO_ASC_API_ISSUER_ID: ${{ secrets.APPLE_API_ISSUER_ID }}
-      #     EXPO_APPLE_TEAM_ID: "43QFHSJ5QR"
-      #     EXPO_APPLE_TEAM_TYPE: "COMPANY_OR_ORGANIZATION"
-      #     CREDENTIALS_JSON: ${{ secrets.CREDENTIALS_JSON }}
-      #     APPLE_PROVISIONING_PROFILE: ${{ secrets.APPLE_PROVISIONING_PROFILE }}
-      #     APPLE_DISTRIBUTION_CERTIFICATE: ${{ secrets.APPLE_DISTRIBUTION_CERTIFICATE }}
-      #   run: |
-      #     echo $APPLE_APIKEY | base64 -d > apple-asc-api-key.p8
-      #     eas submit -p ios --path ${{ steps.find_ipa.outputs.IPA_PATH }} --non-interactive
+      - name: Submit to Apple App Store via EAS
+        if: github.ref == 'refs/heads/dev'
+        env:
+          EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
+          APPLE_APIKEY: ${{ secrets.APPLE_APIKEY }}
+          EXPO_ASC_API_KEY_PATH: "${{ env.GITHUB_WORKSPACE }}/apple-asc-api-key.p8"
+          EXPO_ASC_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
+          EXPO_ASC_API_ISSUER_ID: ${{ secrets.APPLE_API_ISSUER_ID }}
+          EXPO_APPLE_TEAM_ID: "43QFHSJ5QR"
+          EXPO_APPLE_TEAM_TYPE: "COMPANY_OR_ORGANIZATION"
+          CREDENTIALS_JSON: ${{ secrets.CREDENTIALS_JSON }}
+          APPLE_PROVISIONING_PROFILE: ${{ secrets.APPLE_PROVISIONING_PROFILE }}
+          APPLE_DISTRIBUTION_CERTIFICATE: ${{ secrets.APPLE_DISTRIBUTION_CERTIFICATE }}
+        run: |
+          echo $APPLE_APIKEY | base64 -d > apple-asc-api-key.p8
+          eas submit -p ios --path ${{ steps.find_ipa.outputs.IPA_PATH }} --non-interactive
 
   mobile_release:
     name: Create unified Mobile release (IPA & AAB)
     runs-on: ubuntu-latest
     permissions:
       contents: write
+      actions: read
     needs: [android, ios]
     if: github.ref == 'refs/heads/main'
     steps:
@@ -368,5 +372,4 @@ jobs:
             dist/**/*.aab
             dist/**/*.apk
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/lint.yml

@@ -27,4 +27,7 @@ jobs:
         run: npm install
 
       - name: Run ESLint
-        run: npm run lint
+        run: npm run lint
+
+      - name: Run TypeScript typecheck
+        run: npm run typecheck