App polish for 2.9 rd1 (#1359)

* add useSafeBottomPadding

* add bottom padding to dev screen

* use safe bottom padding

* skip uploading if building android bundle locally

* fix tests

* cache fix script

* clean up country picker, fix font color

* sort package jsons, add watcher for mobile sdk

* formatting

* only bump versions for successfull builds

* move all css

* cleaner script

* kill watchers before starting new one

Author: transphorm

.gitguardian.yml

@@ -52,41 +52,40 @@ secrets-ignore:
   - "RSA Private Key" # For mock RSA keys
   - "EC Private Key" # For mock EC keys
 
-
 secret:
   ignored_matches:
-  - match: 2036b4e50ad3042969b290e354d9864465107a14de6f5a36d49f81ea8290def8
-    name: prebuilt-ios-arm64-apple-ios.private.swiftinterface
+    - match: 2036b4e50ad3042969b290e354d9864465107a14de6f5a36d49f81ea8290def8
+      name: prebuilt-ios-arm64-apple-ios.private.swiftinterface
   ignored_paths:
-  - '**/*.swiftinterface'
-  - '**/*.xcframework/**'
-  - '**/packages/mobile-sdk-alpha/ios/Frameworks/**'
-  - '**/OpenSSL.xcframework/**'
-  - '**/demo-app/**/mock/**'
-  - common/src/mock_certificates/aadhaar/mockAadhaarCert.ts
-  - '**/NFCPassportReader.xcframework/**'
-  - common/src/utils/passports/genMockIdDoc.ts
-  - '**/tests/**/*.crt'
-  - '**/mock_certificates/**/*.crt'
-  - '**/mock_certificates/**/*.key'
-  - '**/demo-app/**/test-data/**'
-  - '**/generated/**/*.key'
-  - '**/SelfSDK.xcframework/**'
-  - '**/mock/**/*.crt'
-  - '**/generated/**/*.crt'
-  - '**/test/**/*.key'
-  - '**/mock/**/*.key'
-  - '**/test/**/*.crt'
-  - '**/test/**/*.pem'
-  - '**/constants/mockCertificates.ts'
-  - '**/mock/**/*.pem'
-  - '**/mock_certificates/**/*.pem'
-  - '**/mock-data/**'
-  - '**/packages/mobile-sdk-alpha/ios/SelfSDK/**'
-  - '**/tests/**/*.key'
-  - '**/generated/**/*.pem'
-  - '**/tests/**/*.pem'
-  - '**/test-data/**'
-  - common/src/mock_certificates/**
-  - '**/*.xcframework'
+    - "**/*.swiftinterface"
+    - "**/*.xcframework/**"
+    - "**/packages/mobile-sdk-alpha/ios/Frameworks/**"
+    - "**/OpenSSL.xcframework/**"
+    - "**/demo-app/**/mock/**"
+    - common/src/mock_certificates/aadhaar/mockAadhaarCert.ts
+    - "**/NFCPassportReader.xcframework/**"
+    - common/src/utils/passports/genMockIdDoc.ts
+    - "**/tests/**/*.crt"
+    - "**/mock_certificates/**/*.crt"
+    - "**/mock_certificates/**/*.key"
+    - "**/demo-app/**/test-data/**"
+    - "**/generated/**/*.key"
+    - "**/SelfSDK.xcframework/**"
+    - "**/mock/**/*.crt"
+    - "**/generated/**/*.crt"
+    - "**/test/**/*.key"
+    - "**/mock/**/*.key"
+    - "**/test/**/*.crt"
+    - "**/test/**/*.pem"
+    - "**/constants/mockCertificates.ts"
+    - "**/mock/**/*.pem"
+    - "**/mock_certificates/**/*.pem"
+    - "**/mock-data/**"
+    - "**/packages/mobile-sdk-alpha/ios/SelfSDK/**"
+    - "**/tests/**/*.key"
+    - "**/generated/**/*.pem"
+    - "**/tests/**/*.pem"
+    - "**/test-data/**"
+    - common/src/mock_certificates/**
+    - "**/*.xcframework"
 version: 2

.github/workflows/mobile-ci.yml

@@ -76,7 +76,7 @@ jobs:
         with:
           cache-version: ${{ env.GH_CACHE_VERSION }}-${{ env.NODE_VERSION_SANITIZED }}
       - name: Build dependencies (cache miss)
-      # Temporarily disabled due to `yarn types` failures when cache is used.
+        # Temporarily disabled due to `yarn types` failures when cache is used.
         # if: steps.built-deps.outputs.cache-hit != 'true'
         run: |
           echo "Cache miss for built dependencies. Building now..."

.github/workflows/mobile-deploy.yml

@@ -1276,17 +1276,21 @@ jobs:
             const version = JSON.parse(fs.readFileSync('version.json', 'utf8'));
             const timestamp = new Date().toISOString();
 
-            version.ios.build = $IOS_BUILD;
-            version.android.build = $ANDROID_BUILD;
-
-            // Update lastDeployed timestamp for successful builds
+            // Only bump build numbers for successful builds
             if ('$IOS_SUCCESS' === 'success') {
+              version.ios.build = $IOS_BUILD;
               version.ios.lastDeployed = timestamp;
-              console.log('✅ Updated iOS lastDeployed timestamp');
+              console.log('✅ Updated iOS build number to $IOS_BUILD and lastDeployed timestamp');
+            } else {
+              console.log('⏭️  Skipped iOS build number bump (build did not succeed)');
             }
+
             if ('$ANDROID_SUCCESS' === 'success') {
+              version.android.build = $ANDROID_BUILD;
               version.android.lastDeployed = timestamp;
-              console.log('✅ Updated Android lastDeployed timestamp');
+              console.log('✅ Updated Android build number to $ANDROID_BUILD and lastDeployed timestamp');
+            } else {
+              console.log('⏭️  Skipped Android build number bump (build did not succeed)');
             }
 
             fs.writeFileSync('version.json', JSON.stringify(version, null, 2) + '\n');

.github/workflows/mobile-sdk-demo-e2e.yml

@@ -319,7 +319,8 @@ jobs:
               echo "::add-mask::${SELFXYZ_INTERNAL_REPO_PAT}"
             fi
             cd packages/mobile-sdk-demo/ios
-            pod install
+            echo "📦 Installing pods via cache-fix script…"
+            bash scripts/pod-install-with-cache-fix.sh
         env:
           SELFXYZ_INTERNAL_REPO_PAT: ${{ secrets.SELFXYZ_INTERNAL_REPO_PAT }}
           GIT_TERMINAL_PROMPT: 0

.github/workflows/npm-publish.yml

@@ -8,7 +8,7 @@ on:
       - "sdk/core/package.json"
       - "sdk/qrcode/package.json"
       - "common/package.json"
-      - 'packages/mobile-sdk-alpha/package.json'
+      - "packages/mobile-sdk-alpha/package.json"
       - "sdk/qrcode-angular/package.json"
       - "contracts/package.json"
   workflow_dispatch:

app/Gemfile.lock

@@ -25,7 +25,7 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1179.0)
+    aws-partitions (1.1181.0)
     aws-sdk-core (3.236.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
@@ -37,7 +37,7 @@ GEM
     aws-sdk-kms (1.116.0)
       aws-sdk-core (~> 3, >= 3.234.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.202.0)
+    aws-sdk-s3 (1.203.0)
       aws-sdk-core (~> 3, >= 3.234.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)

app/fastlane/Fastfile

@@ -306,6 +306,14 @@ platform :android do
     skip_upload = options[:skip_upload] == true || options[:skip_upload] == "true"
     version_bump = options[:version_bump] || "build"
 
+    # Automatically skip uploads in local development (no local permissions for Play Store)
+    # Uploads must be done by CI/CD machines with proper authentication
+    if local_development && !skip_upload
+      skip_upload = true
+      UI.important("🏠 LOCAL DEVELOPMENT: Automatically skipping Play Store upload")
+      UI.important("   Uploads require CI/CD machine permissions and will be handled automatically")
+    end
+
     if local_development
       if ENV["ANDROID_KEYSTORE_PATH"].nil?
         ENV["ANDROID_KEYSTORE_PATH"] = Fastlane::Helpers.android_create_keystore(android_keystore_path)

app/jest.config.cjs

@@ -30,6 +30,8 @@ module.exports = {
       '<rootDir>/../packages/mobile-sdk-alpha/dist/cjs/index.cjs',
     '^@selfxyz/mobile-sdk-alpha/components$':
       '<rootDir>/../packages/mobile-sdk-alpha/dist/cjs/components/index.cjs',
+    '^@selfxyz/mobile-sdk-alpha/hooks$':
+      '<rootDir>/../packages/mobile-sdk-alpha/dist/cjs/hooks/index.cjs',
     '^@selfxyz/mobile-sdk-alpha/onboarding/(.*)$':
       '<rootDir>/../packages/mobile-sdk-alpha/dist/cjs/flows/onboarding/$1.cjs',
     '^@selfxyz/mobile-sdk-alpha/disclosing/(.*)$':

app/package.json

@@ -50,8 +50,8 @@
     "release:patch": "./scripts/release.sh patch",
     "setup": "yarn clean:build && yarn install && yarn build:deps && yarn setup:android-deps && cd ios && bundle install && bundle exec pod install --repo-update && cd .. && yarn clean:xcode-env-local",
     "setup:android-deps": "node scripts/setup-private-modules.cjs",
-    "start": "watchman watch-del-all && react-native start",
-    "start:clean": "watchman watch-del-all && cd android && ./gradlew clean && cd .. && react-native start --reset-cache",
+    "start": "watchman watch-del-all && yarn watch:sdk & react-native start",
+    "start:clean": "watchman watch-del-all && cd android && ./gradlew clean && cd .. && yarn watch:sdk & react-native start --reset-cache",
     "sync-versions": "bundle exec fastlane ios sync_version && bundle exec fastlane android sync_version",
     "tag:release": "node scripts/tag.cjs release",
     "tag:remove": "node scripts/tag.cjs remove",
@@ -66,6 +66,7 @@
     "test:tree-shaking": "node ./scripts/test-tree-shaking.cjs",
     "test:web-build": "jest tests/web-build-render.test.ts --testTimeout=180000",
     "types": "tsc --noEmit",
+    "watch:sdk": "yarn workspace @selfxyz/mobile-sdk-alpha watch",
     "web": "vite",
     "web:build": "yarn build:deps && vite build",
     "web:preview": "vite preview"

app/src/screens/dev/DevSettingsScreen.tsx

@@ -17,6 +17,8 @@ import { useNavigation } from '@react-navigation/native';
 import type { NativeStackScreenProps } from '@react-navigation/native-stack';
 import { Check, ChevronDown, ChevronRight } from '@tamagui/lucide-icons';
 
+import { useSafeBottomPadding } from '@selfxyz/mobile-sdk-alpha/hooks';
+
 import BugIcon from '@/images/icons/bug_icon.svg';
 import IdIcon from '@/images/icons/id_icon.svg';
 import WarningIcon from '@/images/icons/warning.svg';
@@ -295,6 +297,7 @@ const DevSettingsScreen: React.FC<DevSettingsScreenProps> = ({}) => {
   const subscribedTopics = useSettingStore(state => state.subscribedTopics);
   const [hasNotificationPermission, setHasNotificationPermission] =
     useState(false);
+  const paddingBottom = useSafeBottomPadding(20);
 
   // Check notification permissions on mount
   useEffect(() => {
@@ -466,6 +469,7 @@ const DevSettingsScreen: React.FC<DevSettingsScreenProps> = ({}) => {
         flex={1}
         paddingHorizontal="$4"
         paddingTop="$4"
+        paddingBottom={paddingBottom}
       >
         <ParameterSection
           icon={<IdIcon />}