Merge branch 'master' into add-claude-github-actions-1763458753833

Author: ovitrif

.github/workflows/e2e-tests.yml

@@ -40,11 +40,11 @@ jobs:
           # Clean any existing build artifacts
           rm -rf DerivedData
           rm -rf ~/Library/Developer/Xcode/DerivedData
-          
+
           # Clean Swift Package Manager caches
           rm -rf ~/Library/Caches/org.swift.swiftpm
           rm -rf ~/Library/org.swift.swiftpm
-          
+
           # Reset package caches
           xcodebuild -resolvePackageDependencies -workspace Bitkit.xcodeproj/project.xcworkspace -scheme Bitkit
 
@@ -55,6 +55,7 @@ jobs:
           CHATWOOT_API: ${{ secrets.CHATWOOT_API }}
           SIMULATOR_NAME: "iPhone 17"
           OS_VERSION: "latest"
+          GEO: false
         run: |
           echo "=== Building iOS app ==="
           echo "Using simulator: $SIMULATOR_NAME (iOS $OS_VERSION)"
@@ -107,7 +108,7 @@ jobs:
           # - { name: onchain_boost_receive_widgets, grep: "@onchain|@boost|@receive|@widgets" }
           # - { name: settings, grep: "@settings" }
           # - { name: security, grep: "@security" }
-          - { name: e2e, grep: '^(?!.*@settings_10)(@onboarding|@onchain_1|@numberpad|@widgets|@boost|@receive|@settings|@security)' }
+          - { name: e2e, grep: '^(?!.*@settings_10)(@onboarding|@onchain_1|@onchain_2|@numberpad|@widgets|@boost|@receive|@settings|@security)' }
 
     name: e2e-tests - ${{ matrix.shard.name }}
 
@@ -160,20 +161,18 @@ jobs:
       - name: Reset regtest environment
         working-directory: bitkit-e2e-tests
         continue-on-error: true
-        timeout-minutes: 10
         run: |
           cd docker && docker compose --verbose down -v -t 300
 
       - name: Run regtest setup
         working-directory: bitkit-e2e-tests
         run: |
           cd docker
-          mkdir lnd && chmod 777 lnd
+          mkdir -p lnd && chmod 777 lnd
           docker compose --verbose up --force-recreate -d
 
       - name: Wait for electrum server
         working-directory: bitkit-e2e-tests
-        timeout-minutes: 10
         run: |
           echo "Waiting for Electrum server..."
           while ! nc -z '127.0.0.1' 60001; do 
@@ -192,7 +191,8 @@ jobs:
         run: |
           echo "🔧 Shutting down all running iOS simulators..."
           xcrun simctl shutdown all || true
-          xcrun simctl erase all || true
+          echo "🔧 Erasing target simulator: iPhone 17..."
+          xcrun simctl erase "iPhone 17" || true
           echo "🔧 Disabling iOS Simulator notifications..."
           defaults write com.apple.iphonesimulator DisableAllNotifications -bool true
 

.github/workflows/integration-tests.yml

@@ -0,0 +1,87 @@
+name: integration-tests
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+
+  test:
+    if: github.event.pull_request.draft == false
+    name: Run Integration Tests
+    runs-on: macos-15
+    timeout-minutes: 60
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Xcode
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: '16.4'
+
+      - name: Install xcbeautify
+        run: |
+          brew install xcbeautify
+
+      - name: Cache Swift Package Manager
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/Library/Caches/org.swift.swiftpm
+            ~/Library/org.swift.swiftpm
+            Bitkit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm
+          key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
+          restore-keys: |
+            ${{ runner.os }}-spm-
+
+      - name: Cache DerivedData
+        uses: actions/cache@v4
+        with:
+          path: ~/Library/Developer/Xcode/DerivedData
+          key: ${{ runner.os }}-deriveddata-${{ hashFiles('**/*.swift', '**/*.m', '**/*.h', 'Bitkit.xcodeproj/project.pbxproj') }}
+          restore-keys: |
+            ${{ runner.os }}-deriveddata-
+
+      - name: Install dependencies
+        run: |
+          echo "⏱️  Starting dependency resolution at $(date)"
+          xcodebuild -resolvePackageDependencies | xcbeautify
+          echo "✅ Dependencies resolved at $(date)"
+
+      - name: Pre-start simulator
+        run: |
+          echo "⏱️  Starting simulator at $(date)"
+          xcrun simctl boot "iPhone 16" || true
+          echo "✅ Simulator started at $(date)"
+
+      - name: Run integration tests
+        run: |
+          echo "⏱️  Starting integration tests at $(date)"
+          set -o pipefail && xcodebuild test \
+            -scheme Bitkit \
+            -destination 'platform=iOS Simulator,name=iPhone 16,OS=latest' \
+            -enableCodeCoverage NO \
+            -parallel-testing-enabled NO \
+            -only-testing:BitkitTests/TxBumpingTests \
+            -only-testing:BitkitTests/UtxoSelectionTests \
+            -only-testing:BitkitTests/BlocktankTests \
+            -only-testing:BitkitTests/PaymentFlowTests \
+            | xcbeautify --report junit
+          echo "✅ Integration tests completed at $(date)"
+
+      - name: Upload test results
+        uses: actions/upload-artifact@v4
+        if: success() || failure()
+        with:
+          name: integration-test-results
+          path: ~/Library/Developer/Xcode/DerivedData/**/Logs/Test/*.xcresult

.github/workflows/unit-tests.yml

@@ -32,15 +32,6 @@ jobs:
         run: |
           brew install xcbeautify
 
-      - name: List available simulators
-        run: |
-          echo "=== Full Simulator List ==="
-          xcrun simctl list
-          echo "\n=== Available Runtimes ==="
-          xcrun simctl list runtimes
-          echo "\n=== Device Pairs ==="
-          xcrun simctl list devicetypes
-
       - name: Cache Swift Package Manager
         uses: actions/cache@v4
         with:
@@ -56,26 +47,36 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/Library/Developer/Xcode/DerivedData
-          key: ${{ runner.os }}-deriveddata-${{ hashFiles('**/*.swift', '**/*.m', '**/*.h', '**/*.xcodeproj/**') }}
+          key: ${{ runner.os }}-deriveddata-${{ hashFiles('**/*.swift', '**/*.m', '**/*.h', 'Bitkit.xcodeproj/project.pbxproj') }}
           restore-keys: |
             ${{ runner.os }}-deriveddata-
 
       - name: Install dependencies
         run: |
+          echo "⏱️  Starting dependency resolution at $(date)"
           xcodebuild -resolvePackageDependencies | xcbeautify
+          echo "✅ Dependencies resolved at $(date)"
 
       - name: Pre-start simulator
         run: |
+          echo "⏱️  Starting simulator at $(date)"
           xcrun simctl boot "iPhone 16" || true
+          echo "✅ Simulator started at $(date)"
 
-      - name: Run tests
+      - name: Run unit tests
         run: |
+          echo "⏱️  Starting unit tests at $(date)"
           set -o pipefail && xcodebuild test \
             -scheme Bitkit \
             -destination 'platform=iOS Simulator,name=iPhone 16,OS=latest' \
             -enableCodeCoverage NO \
             -parallel-testing-enabled NO \
+            -skip-testing:BitkitTests/TxBumpingTests \
+            -skip-testing:BitkitTests/UtxoSelectionTests \
+            -skip-testing:BitkitTests/BlocktankTests \
+            -skip-testing:BitkitTests/PaymentFlowTests \
             | xcbeautify --report junit
+          echo "✅ Unit tests completed at $(date)"
 
       - name: Upload test results
         uses: actions/upload-artifact@v4

Bitkit.xcodeproj/project.pbxproj

@@ -89,6 +89,7 @@
 				Models/LnPeer.swift,
 				Models/Toast.swift,
 				Services/CoreService.swift,
+				Services/GeoService.swift,
 				Services/LightningService.swift,
 				Services/MigrationsService.swift,
 				Services/ServiceQueue.swift,
@@ -113,6 +114,7 @@
 				Models/ReceivedTxSheetDetails.swift,
 				Models/Toast.swift,
 				Services/CoreService.swift,
+				Services/GeoService.swift,
 				Services/LightningService.swift,
 				Services/ServiceQueue.swift,
 				Services/VssStoreIdProvider.swift,
@@ -591,7 +593,7 @@
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG CHECK_GEOBLOCK $(inherited)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 			};
 			name = Debug;
@@ -645,6 +647,7 @@
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "CHECK_GEOBLOCK $(inherited)";
 				SWIFT_COMPILATION_MODE = wholemodule;
 			};
 			name = Release;

Bitkit/Components/Activity/ActivityListFilter.swift

@@ -37,13 +37,15 @@ struct ActivityListFilter: View {
                     .onTapGesture {
                         showingTagSelector = true
                     }
+                    .accessibilityIdentifier("TagsPrompt")
                 Image("calendar")
                     .resizable()
                     .frame(width: 24, height: 24)
                     .foregroundColor(viewModel.startDate != nil ? .brandAccent : .white64)
                     .onTapGesture {
                         showingDateRange = true
                     }
+                    .accessibilityIdentifier("DatePicker")
             }
         }
         .frame(width: .infinity, height: 48)

Bitkit/Components/Activity/DateRangeSelectorSheet.swift

@@ -182,6 +182,7 @@ struct DateRangeSelectorSheet: View {
                         startDate = nil
                         endDate = nil
                         viewModel.clearDateRange()
+                        isPresented = false
                     }
                     .accessibilityIdentifier("CalendarClearButton")
 

Bitkit/Components/SegmentedControl.swift

@@ -55,6 +55,7 @@ struct SegmentedControl<T: Hashable & CustomStringConvertible>: View {
                     .contentShape(Rectangle())
                 }
                 .buttonStyle(PlainButtonStyle())
+                .accessibilityIdentifier("Tab-\(tabItem.tab.description.lowercased())")
             }
         }
         .frame(maxWidth: .infinity)

Bitkit/Components/SheetIntro.swift

@@ -91,15 +91,15 @@ struct SheetIntro: View {
                 ) {
                     onContinue()
                 }
-                .accessibilityIdentifier("\(baseTestID)-button-continue")
+                .accessibilityIdentifier("\(baseTestID)Continue")
             }
         } else {
             CustomButton(
                 title: continueText
             ) {
                 onContinue()
             }
-            .accessibilityIdentifier("\(baseTestID)-button-continue")
+            .accessibilityIdentifier("\(baseTestID)Continue")
         }
     }
 }

Bitkit/Components/Tag.swift

@@ -48,14 +48,15 @@ struct Tag: View {
         )
         .cornerRadius(8)
         .fixedSize(horizontal: true, vertical: false)
+        .accessibilityElement(children: .contain)
+        .accessibilityIdentifier("Tag-\(value)")
     }
 
     var body: some View {
         if let onPress {
             Button(action: onPress) {
                 tagContent
             }
-            .accessibilityIdentifier("Tag-\(value)")
             .buttonStyle(.plain) // Use plain button style to avoid default button appearance interfering
         } else {
             tagContent

Bitkit/Constants/Env.swift

@@ -16,6 +16,12 @@ enum Env {
     #endif
     static let dustLimit = 547
 
+    #if CHECK_GEOBLOCK
+        static let isGeoblockingEnabled = true
+    #else
+        static let isGeoblockingEnabled = ProcessInfo.processInfo.environment["GEO"] == "true"
+    #endif
+
     /// The current execution context of the app
     static var currentExecutionContext: ExecutionContext {
         return Bundle.main.bundleIdentifier?.lowercased().contains("notification") == true ? .pushNotificationExtension : .foregroundApp