Merge remote-tracking branch 'refs/remotes/upstream/master' into fix/…

…add-keys-to-passkeys # Conflicts: # packages/deriv_passkeys/lib/src/presentation/pages/effortless_passkeys_login_page.dart
deriv-com · Jul 11, 2024 · 84c4380 · 84c4380
2 parents ae036f0 + 66d50d5
commit 84c4380
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 2024-07-10
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`deriv_passkeys` - `v0.0.3`](#deriv_passkeys---v003)
+ - [`deriv_auth` - `v6.7.12`](#deriv_auth---v6712)
+
+Packages with dependency updates only:
+
+> Packages listed below depend on other packages in this workspace that have had changes. Their versions have been incremented to bump the minimum dependency versions of the packages they depend upon in this project.
+
+ - `deriv_auth` - `v6.7.12`
+
+---
+
+#### `deriv_passkeys` - `v0.0.3`
+
+ - **FEAT**(deriv_passkeys): [P2PS-3072] add keys to deriv passkey package effortless passkeys login page ([#677](https://github.com/regentmarkets/flutter-deriv-packages/issues/677)). ([39472704](https://github.com/regentmarkets/flutter-deriv-packages/commit/39472704a3d264bc5f64ba2ae75e29134f890590))
+
+
 ## 2024-07-04
 
 ### Changes

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ cp $HOME/Downloads/commit-msg $HOME/.git/hooks/commit-msg \
 
 ## Using the packages
 
-Each package has been released as git tag with convention as **packageName-vVersionNumber**`(Example: deriv_auth-v6.7.10)`. To use the package, add the following to your pubspec.yaml file:
+Each package has been released as git tag with convention as **packageName-vVersionNumber**`(Example: deriv_auth-v6.7.12)`. To use the package, add the following to your pubspec.yaml file:
 
 ```yaml
 deriv_ui:
@@ -30,7 +30,7 @@ deriv_ui:
 | Name                                                                      | Description                                                                                                            | Version                                                           |
 | ------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------- |
 | [analytics](./packages/analytics)                                         | Used to collect and send analytical information to 'Firebase' and 'Segment'.                                           | [v2.1.0](./packages/analytics/CHANGELOG.md)                       |
-| [deriv_auth](./packages/deriv_auth)                                       | A Dart package that provides Authentication logic for Deriv applications.                                              | [v6.7.11 ](./packages/deriv_auth/CHANGELOG.md)                     |
+| [deriv_auth](./packages/deriv_auth)                                       | A Dart package that provides Authentication logic for Deriv applications.                                              | [v6.7.12 ](./packages/deriv_auth/CHANGELOG.md)                     |
 | [deriv_banner](./packages/deriv_banner)                                   | A widget to show banner in apps.                                                                                       | [v0.0.1+1](./packages/deriv_banner/CHANGELOG.md)                  |
 | [deriv_bloc_manager](./packages/deriv_bloc_manager)                       | Provides some tools to manage blocs.                                                                                   | [v0.0.1](./packages/deriv_bloc_manager/CHANGELOG.md)              |
 | [deriv_datadog](./packages/deriv_datadog)                                 | A package that helps you monitor the performance and user interactions of your Flutter app by sending data to Datadog. | [v0.0.1](./packages/deriv_datadog/CHANGELOG.md)                   |

diff --git a/packages/deriv_auth/CHANGELOG.md b/packages/deriv_auth/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 6.7.12
+
+ - Update a dependency to the latest release.
+
 ## 6.7.10
 
  - **FIX**(deriv_auth): minor change in readme file ([#669](https://github.com/regentmarkets/flutter-deriv-packages/issues/669)). ([b29d222c](https://github.com/regentmarkets/flutter-deriv-packages/commit/b29d222ce219d0664e3cafb6c302cd1041749905))

diff --git a/packages/deriv_auth/pubspec.yaml b/packages/deriv_auth/pubspec.yaml
@@ -1,6 +1,6 @@
 name: deriv_auth
 description: Provides deriv authentication functionalities for dart/flutter apps.
-version: 6.7.11
+version: 6.7.12
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
@@ -57,7 +57,7 @@ dependencies:
     git:
       url: [email protected]:regentmarkets/flutter-deriv-packages.git
       path: packages/deriv_passkeys
-      ref: deriv_passkeys-v0.0.2+9
+      ref: deriv_passkeys-v0.0.3
 
   deriv_language_selector:
     git:

diff --git a/packages/deriv_passkeys/CHANGELOG.md b/packages/deriv_passkeys/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.3
+
+ - **FEAT**(deriv_passkeys): [P2PS-3072] add keys to deriv passkey package effortless passkeys login page ([#677](https://github.com/regentmarkets/flutter-deriv-packages/issues/677)). ([39472704](https://github.com/regentmarkets/flutter-deriv-packages/commit/39472704a3d264bc5f64ba2ae75e29134f890590))
+
 ## 0.0.2+9
 
  - **REFACTOR**(deriv_passkeys): update deriv api dependency ([#656](https://github.com/regentmarkets/flutter-deriv-packages/issues/656)). ([3425078b](https://github.com/regentmarkets/flutter-deriv-packages/commit/3425078b52baac4f387504c9d41063bda1dba249))

diff --git a/packages/deriv_passkeys/lib/src/presentation/pages/effortless_passkeys_login_page.dart b/packages/deriv_passkeys/lib/src/presentation/pages/effortless_passkeys_login_page.dart
@@ -21,6 +21,7 @@ class EffortlessPasskeysPage extends StatelessWidget
     required this.onPageClosed,
     required this.addMorePasskeysNavigationCallback,
     required this.continueTradingNavigationCallback,
+    this.effortlessPasskeysPageKeys,
     super.key,
   }) {
     trackOpenEffortlessLoginPage();
@@ -38,6 +39,9 @@ class EffortlessPasskeysPage extends StatelessWidget
   /// Callback to be called when the flow is complete.
   final void Function(BuildContext context) onPageClosed;
 
+  /// Pass an object of keys to assign to specific widget in this page.
+  final EffortlessPasskeysPageKeys? effortlessPasskeysPageKeys;
+
   @override
   Widget build(BuildContext context) => WillPopScope(
         onWillPop: () async {
@@ -91,8 +95,8 @@ class EffortlessPasskeysPage extends StatelessWidget
                                   child: Padding(
                                     padding: const EdgeInsets.all(16),
                                     child: TextButton(
-                                      key: const ValueKey<String>(
-                                          'passkey_login_maybe_later'),
+                                      key: effortlessPasskeysPageKeys
+                                          ?.maybeLaterTextButtonKey,
                                       onPressed: () {
                                         trackMaybeLater();
                                         onPageClosed(context);
@@ -180,6 +184,8 @@ class EffortlessPasskeysPage extends StatelessWidget
                                                       PlaceholderAlignment
                                                           .middle,
                                                   child: InkWell(
+                                                    key: effortlessPasskeysPageKeys
+                                                        ?.hyperlinkInkWellKey,
                                                     onTap: () {
                                                       Navigator.push(
                                                         context,
@@ -231,8 +237,8 @@ class EffortlessPasskeysPage extends StatelessWidget
                                   child: Padding(
                                     padding: const EdgeInsets.all(16),
                                     child: PrimaryButton(
-                                      key: const ValueKey<String>(
-                                          'passkey_login_create_button'),
+                                      key: effortlessPasskeysPageKeys
+                                          ?.createPasskeyButtonKey,
                                       onPressed: () {
                                         trackCreatePasskey();
                                         context.read<DerivPasskeysBloc>().add(
@@ -258,3 +264,22 @@ class EffortlessPasskeysPage extends StatelessWidget
         ),
       );
 }
+
+/// A class that allows users to pass keys to [EffortlessPasskeysPage].
+class EffortlessPasskeysPageKeys {
+  /// Constructs [EffortlessPasskeysPageKeys].
+  EffortlessPasskeysPageKeys({
+    this.createPasskeyButtonKey,
+    this.hyperlinkInkWellKey,
+    this.maybeLaterTextButtonKey,
+  });
+
+  /// Key for create passkey button widget.
+  final Key? createPasskeyButtonKey;
+
+  /// Key for hyper link ink well widget.
+  final Key? hyperlinkInkWellKey;
+
+  /// Key for maybe later text button widget.
+  final Key? maybeLaterTextButtonKey;
+}
diff --git a/packages/deriv_passkeys/pubspec.yaml b/packages/deriv_passkeys/pubspec.yaml
@@ -1,6 +1,6 @@
 name: deriv_passkeys
 description: Deriv Passkeys Flutter Plugin
-version: 0.0.2+9
+version: 0.0.3
 publish_to: "none"
 
 environment: