From 95a03434ca4f1a9c00f670eb20dd37645a3973a9 Mon Sep 17 00:00:00 2001
From: JulianAlcala <julianalcala@savefamilygps.com>
Date: Wed, 15 Apr 2026 11:25:06 +0200
Subject: [PATCH] fix(antelop): route FCM pushes through SDK, per-flavor plist
 on iOS, unify applicationId

- Add AntelopAwareMessagingService so the Antelop SDK gets first dibs on every
  FCM push before delegating to firebase_messaging. Unblocks SCA wallet
  activation on Android, which was waiting forever for pushes that the
  FlutterFirebaseMessagingService was swallowing ever since Firebase was
  integrated. Remove the stock Antelop and firebase_messaging services via
  manifest-merge so only the wrapper handles MESSAGING_EVENT.
- Add Copy AntelopRelease Build Phase in Xcode to copy
  Runner/AntelopRelease-{flavor}.plist over the fixed AntelopRelease.plist
  inside the .app bundle based on CONFIGURATION. Without this the iOS SDK
  silently used the production plist on every flavor.
- Revert the six applicationId values (3 AndroidManifest + 3 AntelopRelease
  plist) to the sample id 4713640103500149457, which is the only one
  provisioned in Antelop's backend today. The four env+platform ids they
  provided all fail with 9999 / cryptography: Error while decrypting data.
  To be updated once Treezor confirms the real ids.
- Add packages/flutter_treezor_entrust_sdk_bridge/example as a pub workspace
  member and bump its Dart SDK and flutter_lints constraints so
  'melos bootstrap' stops failing with 'dependencies for
  flutter_treezor_entrust_sdk_bridge_example missing'.
---
 apps/mobile_app/android/app/build.gradle.kts  |   6 +
 .../app/src/development/AndroidManifest.xml   |   2 +-
 .../android/app/src/main/AndroidManifest.xml  |  22 +-
 .../app/AntelopAwareMessagingService.kt       |  33 ++
 .../app/src/production/AndroidManifest.xml    |   2 +-
 .../app/src/staging/AndroidManifest.xml       |   2 +-
 .../ios/Runner.xcodeproj/project.pbxproj      |  19 +
 .../Runner/AntelopRelease-development.plist   |   2 +-
 .../ios/Runner/AntelopRelease-staging.plist   |   2 +-
 .../ios/Runner/AntelopRelease.plist           |   2 +-
 .../ios/scripts/copy-antelop-release-plist.sh |  46 +++
 .../example/pubspec.lock                      | 331 ------------------
 .../example/pubspec.yaml                      |   5 +-
 pubspec.lock                                  |  31 ++
 pubspec.yaml                                  |   1 +
 15 files changed, 166 insertions(+), 340 deletions(-)
 create mode 100644 apps/mobile_app/android/app/src/main/kotlin/com/savefamily/app/AntelopAwareMessagingService.kt
 create mode 100755 apps/mobile_app/ios/scripts/copy-antelop-release-plist.sh
 delete mode 100644 packages/flutter_treezor_entrust_sdk_bridge/example/pubspec.lock

diff --git a/apps/mobile_app/android/app/build.gradle.kts b/apps/mobile_app/android/app/build.gradle.kts
index fe771d18..206fa5bc 100644
--- a/apps/mobile_app/android/app/build.gradle.kts
+++ b/apps/mobile_app/android/app/build.gradle.kts
@@ -101,4 +101,10 @@ flutter {
 
 dependencies {
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
+    // Required by AntelopAwareMessagingService to forward FCM pushes to the
+    // Antelop SDK. The Antelop AAR (com.entrust.antelop:antelop) is brought
+    // in transitively through the flutter_treezor_entrust_sdk_bridge plugin.
+    implementation(platform("com.google.firebase:firebase-bom:33.4.0"))
+    implementation("com.google.firebase:firebase-messaging")
+    implementation("com.entrust.antelop:antelop:2.6.4")
 }
diff --git a/apps/mobile_app/android/app/src/development/AndroidManifest.xml b/apps/mobile_app/android/app/src/development/AndroidManifest.xml
index 473d9979..667a552d 100644
--- a/apps/mobile_app/android/app/src/development/AndroidManifest.xml
+++ b/apps/mobile_app/android/app/src/development/AndroidManifest.xml
@@ -2,7 +2,7 @@
     <application>
         <meta-data
             android:name="fr.antelop.application_id"
-            android:value="3381448747424346509" />
+            android:value="4713640103500149457" />
         <meta-data
             android:name="fr.antelop.issuer_id"
             android:value="treezor" />
diff --git a/apps/mobile_app/android/app/src/main/AndroidManifest.xml b/apps/mobile_app/android/app/src/main/AndroidManifest.xml
index 787e42db..5038ec9b 100644
--- a/apps/mobile_app/android/app/src/main/AndroidManifest.xml
+++ b/apps/mobile_app/android/app/src/main/AndroidManifest.xml
@@ -1,4 +1,5 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">   
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CAMERA" /> 
@@ -34,6 +35,25 @@
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
+
+        <!-- Wrap FCM with Antelop SDK forwarding (see AntelopAwareMessagingService). -->
+        <service
+            android:name=".AntelopAwareMessagingService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
+
+        <!-- Disable Antelop's stock FCM service so AntelopAwareMessagingService is the only handler. -->
+        <service
+            android:name="fr.antelop.exposed.DefaultAntelopFirebaseMessagingService"
+            tools:node="remove" />
+
+        <!-- Disable the firebase_messaging plugin's FCM service so AntelopAwareMessagingService is the only handler. -->
+        <service
+            android:name="io.flutter.plugins.firebase.messaging.FlutterFirebaseMessagingService"
+            tools:node="remove" />
     </application>
 
     <!-- Required to query activities that can process text, see:
diff --git a/apps/mobile_app/android/app/src/main/kotlin/com/savefamily/app/AntelopAwareMessagingService.kt b/apps/mobile_app/android/app/src/main/kotlin/com/savefamily/app/AntelopAwareMessagingService.kt
new file mode 100644
index 00000000..e4000264
--- /dev/null
+++ b/apps/mobile_app/android/app/src/main/kotlin/com/savefamily/app/AntelopAwareMessagingService.kt
@@ -0,0 +1,33 @@
+package com.savefamily.app
+
+import com.google.firebase.messaging.RemoteMessage
+import fr.antelop.sdk.firebase.AntelopFirebaseMessagingUtil
+import io.flutter.plugins.firebase.messaging.FlutterFirebaseMessagingService
+
+/**
+ * FCM service that gives the Antelop SDK first dibs on every push, then
+ * delegates the rest to the firebase_messaging Flutter plugin so Dart still
+ * receives the notifications it expects.
+ *
+ * Without this, only one FirebaseMessagingService can win the
+ * com.google.firebase.MESSAGING_EVENT intent — and once we added the
+ * firebase_messaging plugin, its FlutterFirebaseMessagingService started
+ * winning over Antelop's DefaultAntelopFirebaseMessagingService, leaving the
+ * SDK forever waiting for activation pushes that never reached it.
+ */
+class AntelopAwareMessagingService : FlutterFirebaseMessagingService() {
+    override fun onMessageReceived(remoteMessage: RemoteMessage) {
+        val handled = AntelopFirebaseMessagingUtil.onMessageReceived(
+            applicationContext,
+            remoteMessage,
+        )
+        if (!handled) {
+            super.onMessageReceived(remoteMessage)
+        }
+    }
+
+    override fun onNewToken(token: String) {
+        super.onNewToken(token)
+        AntelopFirebaseMessagingUtil.onTokenRefresh(applicationContext)
+    }
+}
diff --git a/apps/mobile_app/android/app/src/production/AndroidManifest.xml b/apps/mobile_app/android/app/src/production/AndroidManifest.xml
index 64ee54d9..667a552d 100644
--- a/apps/mobile_app/android/app/src/production/AndroidManifest.xml
+++ b/apps/mobile_app/android/app/src/production/AndroidManifest.xml
@@ -2,7 +2,7 @@
     <application>
         <meta-data
             android:name="fr.antelop.application_id"
-            android:value="8632355012486459749" />
+            android:value="4713640103500149457" />
         <meta-data
             android:name="fr.antelop.issuer_id"
             android:value="treezor" />
diff --git a/apps/mobile_app/android/app/src/staging/AndroidManifest.xml b/apps/mobile_app/android/app/src/staging/AndroidManifest.xml
index 473d9979..667a552d 100644
--- a/apps/mobile_app/android/app/src/staging/AndroidManifest.xml
+++ b/apps/mobile_app/android/app/src/staging/AndroidManifest.xml
@@ -2,7 +2,7 @@
     <application>
         <meta-data
             android:name="fr.antelop.application_id"
-            android:value="3381448747424346509" />
+            android:value="4713640103500149457" />
         <meta-data
             android:name="fr.antelop.issuer_id"
             android:value="treezor" />
diff --git a/apps/mobile_app/ios/Runner.xcodeproj/project.pbxproj b/apps/mobile_app/ios/Runner.xcodeproj/project.pbxproj
index 1d36cdab..f1a87eab 100644
--- a/apps/mobile_app/ios/Runner.xcodeproj/project.pbxproj
+++ b/apps/mobile_app/ios/Runner.xcodeproj/project.pbxproj
@@ -256,6 +256,7 @@
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				F0758EB530B1A8787EB3F30B /* Copy GoogleService-Info */,
+				AA0000022345678900000001 /* Copy AntelopRelease */,
 				437F5EA1E5D92D7C421FD996 /* [CP] Embed Pods Frameworks */,
 				791C3CA41F1AAEE1267769C8 /* [CP] Copy Pods Resources */,
 				0F0F4E82D9AA0B3E11014E72 /* FlutterFire: "flutterfire upload-crashlytics-symbols" */,
@@ -479,6 +480,24 @@
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/scripts/copy-google-service-plist.sh\"";
 		};
+		AA0000022345678900000001 /* Copy AntelopRelease */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Copy AntelopRelease";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/scripts/copy-antelop-release-plist.sh\"";
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
diff --git a/apps/mobile_app/ios/Runner/AntelopRelease-development.plist b/apps/mobile_app/ios/Runner/AntelopRelease-development.plist
index cf26e635..c5a5a583 100644
--- a/apps/mobile_app/ios/Runner/AntelopRelease-development.plist
+++ b/apps/mobile_app/ios/Runner/AntelopRelease-development.plist
@@ -9,7 +9,7 @@
 	<key>fr.antelop.initialConnectionTimeout</key>
 	<integer>60</integer>
 	<key>fr.antelop.application_id</key>
-	<integer>2940147927882003152</integer>
+	<integer>4713640103500149457</integer>
 	<key>fr.antelop.issuer_id</key>
 	<string>treezor</string>
 	<key>fr.antelop.teamIdentifier</key>
diff --git a/apps/mobile_app/ios/Runner/AntelopRelease-staging.plist b/apps/mobile_app/ios/Runner/AntelopRelease-staging.plist
index eff2cf27..ebeb26ea 100644
--- a/apps/mobile_app/ios/Runner/AntelopRelease-staging.plist
+++ b/apps/mobile_app/ios/Runner/AntelopRelease-staging.plist
@@ -9,7 +9,7 @@
 	<key>fr.antelop.initialConnectionTimeout</key>
 	<integer>60</integer>
 	<key>fr.antelop.application_id</key>
-	<integer>2940147927882003152</integer>
+	<integer>4713640103500149457</integer>
 	<key>fr.antelop.issuer_id</key>
 	<string>treezor</string>
 	<key>fr.antelop.teamIdentifier</key>
diff --git a/apps/mobile_app/ios/Runner/AntelopRelease.plist b/apps/mobile_app/ios/Runner/AntelopRelease.plist
index 311ee281..1bbec2ab 100644
--- a/apps/mobile_app/ios/Runner/AntelopRelease.plist
+++ b/apps/mobile_app/ios/Runner/AntelopRelease.plist
@@ -9,7 +9,7 @@
 	<key>fr.antelop.initialConnectionTimeout</key>
 	<integer>60</integer>
 	<key>fr.antelop.application_id</key>
-	<integer>5850886184402974206</integer>
+	<integer>4713640103500149457</integer>
 	<key>fr.antelop.issuer_id</key>
 	<string>treezor</string>
 	<key>fr.antelop.teamIdentifier</key>
diff --git a/apps/mobile_app/ios/scripts/copy-antelop-release-plist.sh b/apps/mobile_app/ios/scripts/copy-antelop-release-plist.sh
new file mode 100755
index 00000000..97328618
--- /dev/null
+++ b/apps/mobile_app/ios/scripts/copy-antelop-release-plist.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+#
+# Copies the correct AntelopRelease.plist into the .app bundle based on the
+# active build CONFIGURATION (Debug-development, Release-staging, etc.). The
+# Antelop SDK reads `AntelopRelease.plist` by a fixed name at runtime, so the
+# per-flavor variants (AntelopRelease-development.plist,
+# AntelopRelease-staging.plist) must be copied over that fixed name.
+#
+# Source layout: ios/Runner/AntelopRelease.plist (production),
+#                ios/Runner/AntelopRelease-development.plist,
+#                ios/Runner/AntelopRelease-staging.plist.
+
+set -e
+
+echo "Configuration: ${CONFIGURATION}"
+
+if [[ $CONFIGURATION =~ \-([^-]*)$ ]]; then
+  flavor=${BASH_REMATCH[1]}
+else
+  echo "warning: Could not extract flavor from CONFIGURATION='${CONFIGURATION}', defaulting to 'production'"
+  flavor="production"
+fi
+
+echo "Flavor: $flavor"
+
+case "$flavor" in
+  development|staging)
+    SRC="${PROJECT_DIR}/Runner/AntelopRelease-${flavor}.plist"
+    ;;
+  production)
+    SRC="${PROJECT_DIR}/Runner/AntelopRelease.plist"
+    ;;
+  *)
+    echo "warning: Unknown flavor '${flavor}', falling back to AntelopRelease.plist"
+    SRC="${PROJECT_DIR}/Runner/AntelopRelease.plist"
+    ;;
+esac
+
+if [ ! -f "$SRC" ]; then
+  echo "error: ${SRC} not found"
+  exit 1
+fi
+
+DEST="${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app/AntelopRelease.plist"
+echo "Copying ${SRC} -> ${DEST}"
+cp "${SRC}" "${DEST}"
diff --git a/packages/flutter_treezor_entrust_sdk_bridge/example/pubspec.lock b/packages/flutter_treezor_entrust_sdk_bridge/example/pubspec.lock
deleted file mode 100644
index 109e1b7d..00000000
--- a/packages/flutter_treezor_entrust_sdk_bridge/example/pubspec.lock
+++ /dev/null
@@ -1,331 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  async:
-    dependency: transitive
-    description:
-      name: async
-      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.11.0"
-  boolean_selector:
-    dependency: transitive
-    description:
-      name: boolean_selector
-      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
-  clock:
-    dependency: transitive
-    description:
-      name: clock
-      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.2"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.19.1"
-  crypto:
-    dependency: "direct main"
-    description:
-      name: crypto
-      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.6"
-  cupertino_icons:
-    dependency: "direct main"
-    description:
-      name: cupertino_icons
-      sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.8"
-  dio:
-    dependency: "direct main"
-    description:
-      name: dio
-      sha256: "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.7.0"
-  dio_web_adapter:
-    dependency: transitive
-    description:
-      name: dio_web_adapter
-      sha256: "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-  fake_async:
-    dependency: transitive
-    description:
-      name: fake_async
-      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.3"
-  file:
-    dependency: transitive
-    description:
-      name: file
-      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.0.0"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_driver:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_lints:
-    dependency: "direct dev"
-    description:
-      name: flutter_lints
-      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.0"
-  flutter_test:
-    dependency: "direct dev"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_treezor_entrust_sdk_bridge:
-    dependency: "direct main"
-    description:
-      path: ".."
-      relative: true
-    source: path
-    version: "1.0.2"
-  fuchsia_remote_debug_protocol:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  http_parser:
-    dependency: transitive
-    description:
-      name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.2"
-  integration_test:
-    dependency: "direct dev"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  leak_tracker:
-    dependency: transitive
-    description:
-      name: leak_tracker
-      sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
-      url: "https://pub.dev"
-    source: hosted
-    version: "11.0.2"
-  leak_tracker_flutter_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_flutter_testing
-      sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.10"
-  leak_tracker_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_testing
-      sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.2"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.0"
-  matcher:
-    dependency: transitive
-    description:
-      name: matcher
-      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.12.17"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.1"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.16.0"
-  path:
-    dependency: transitive
-    description:
-      name: path
-      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.9.1"
-  platform:
-    dependency: transitive
-    description:
-      name: platform
-      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.5"
-  plugin_platform_interface:
-    dependency: transitive
-    description:
-      name: plugin_platform_interface
-      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.8"
-  process:
-    dependency: transitive
-    description:
-      name: process
-      sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.2"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  source_span:
-    dependency: transitive
-    description:
-      name: source_span
-      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.10.0"
-  stack_trace:
-    dependency: transitive
-    description:
-      name: stack_trace
-      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.12.1"
-  stream_channel:
-    dependency: transitive
-    description:
-      name: stream_channel
-      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-  string_scanner:
-    dependency: transitive
-    description:
-      name: string_scanner
-      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  sync_http:
-    dependency: transitive
-    description:
-      name: sync_http
-      sha256: "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.1"
-  term_glyph:
-    dependency: transitive
-    description:
-      name: term_glyph
-      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.1"
-  test_api:
-    dependency: transitive
-    description:
-      name: test_api
-      sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.6"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.0"
-  vm_service:
-    dependency: transitive
-    description:
-      name: vm_service
-      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
-      url: "https://pub.dev"
-    source: hosted
-    version: "14.3.0"
-  web:
-    dependency: transitive
-    description:
-      name: web
-      sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
-  webdriver:
-    dependency: transitive
-    description:
-      name: webdriver
-      sha256: "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.4"
-sdks:
-  dart: ">=3.8.0-0 <4.0.0"
-  flutter: ">=3.18.0-18.0.pre.54"
diff --git a/packages/flutter_treezor_entrust_sdk_bridge/example/pubspec.yaml b/packages/flutter_treezor_entrust_sdk_bridge/example/pubspec.yaml
index 9754a2a6..f6a275ea 100644
--- a/packages/flutter_treezor_entrust_sdk_bridge/example/pubspec.yaml
+++ b/packages/flutter_treezor_entrust_sdk_bridge/example/pubspec.yaml
@@ -3,9 +3,10 @@ description: "Demonstrates how to use the flutter_treezor_entrust_sdk_bridge plu
 # The following line prevents the package from being accidentally published to
 # pub.dev using `flutter pub publish`. This is preferred for private packages.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
+resolution: workspace
 
 environment:
-  sdk: ^3.5.3
+  sdk: ^3.9.2
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions
@@ -42,7 +43,7 @@ dev_dependencies:
   # activated in the `analysis_options.yaml` file located at the root of your
   # package. See that file for information about deactivating specific lint
   # rules and activating additional ones.
-  flutter_lints: ^4.0.0
+  flutter_lints: ^5.0.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
diff --git a/pubspec.lock b/pubspec.lock
index ebccb7c8..77bcd2be 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -638,6 +638,11 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.9+2"
+  flutter_driver:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   flutter_launcher_icons:
     dependency: transitive
     description:
@@ -813,6 +818,11 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.0"
+  fuchsia_remote_debug_protocol:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   get_it:
     dependency: transitive
     description:
@@ -973,6 +983,11 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.2.2"
+  integration_test:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   intl:
     dependency: transitive
     description:
@@ -1690,6 +1705,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.4.1"
+  sync_http:
+    dependency: transitive
+    description:
+      name: sync_http
+      sha256: "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.1"
   term_glyph:
     dependency: transitive
     description:
@@ -1914,6 +1937,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.3"
+  webdriver:
+    dependency: transitive
+    description:
+      name: webdriver
+      sha256: "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.0"
   webkit_inspection_protocol:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index a533d838..69ed1442 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -26,6 +26,7 @@ workspace:
   - modules/legacy/packages/legacy_shared
   - packages/design_system
   - packages/flutter_treezor_entrust_sdk_bridge
+  - packages/flutter_treezor_entrust_sdk_bridge/example
   - packages/fonts
   - packages/navigation
   - packages/payments