Merge branch 'master' into Fix_passkeys_logout_issue

deriv-com · Jun 28, 2024 · 070255a · 070255a
2 parents fa5ce9a + 0ee339b
commit 070255a
Show file tree

Hide file tree

Showing 10 changed files with 244 additions and 11 deletions.
diff --git a/.github/workflows/check_versioning_pr.yml b/.github/workflows/check_versioning_pr.yml
@@ -0,0 +1,61 @@
+name: versioning_pr_exists
+
+on:
+  pull_request:
+    types: [opened, edited, reopened, synchronize]
+
+jobs:
+  check-version-pr:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+
+      - name: Set up Node.js
+        uses: actions/setup-node@eff380dfbcf941bf8832e4acb788cebe13dfd758
+        with:
+          node-version: "14"
+
+      - name: Check if PR with title chore(version) exists
+        id: check-pr
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea
+        with:
+          github-token: ${{ secrets.PAT }}
+          script: |
+            const { data: pullRequests } = await github.rest.pulls.list({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              state: 'open',
+              per_page: 100
+            });
+
+            const existingPR = pullRequests.find(pr => pr.title === 'chore(version): bump version and update changelog');
+
+            if (existingPR) {
+              core.setOutput("VERSIONING_PR_EXISTS", true);
+              console.log("Version bump pull request exists. Please merge that pr first to pass the check.: #${existingPR.number}");
+            } else {
+              core.setOutput("VERSIONING_PR_EXISTS", false);
+              console.log("No version bump pull request found.");
+            }
+
+      - name: Delete comment if exists
+        uses: izhangzhihao/delete-comment@d075704468e1cf74e60944d9f335351213c34d85
+        with:
+          github_token: ${{ secrets.PAT }}
+          delete_user_name: mobile-apps-deriv
+          issue_number: ${{ github.event.number }}
+
+      - name: Comment if versioning PR exists
+        if: ${{ contains(steps.check-pr.outputs.VERSIONING_PR_EXISTS, 'true') }}
+        uses: marocchino/sticky-pull-request-comment@4b7290acd5c5b99ef9995db30e52150e705d2475
+        with:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
+          message: |
+            **Merge Is BLOCKED : we still have a chore(version) pr open, please merge that pr first **
+
+      - name: Fail if versioning PR exists
+        if: ${{ contains(steps.check-pr.outputs.VERSIONING_PR_EXISTS, 'true') }}
+        run: |
+          echo "A PR with the title 'chore(version)' already exists. Exiting."
+          exit 1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,64 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 2024-06-28
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`analytics` - `v2.1.0`](#analytics---v210)
+ - [`deriv_auth` - `v6.7.6`](#deriv_auth---v676)
+ - [`deriv_passkeys` - `v0.0.2+8`](#deriv_passkeys---v0028)
+
+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.6`
+ - `deriv_passkeys` - `v0.0.2+8`
+
+---
+
+#### `analytics` - `v2.1.0`
+
+ - **FEAT**(analytics): ilya/DERG-2409/Add_tracking_to_real_account_sign_up_on_Deriv_Go ([#603](https://github.com/regentmarkets/flutter-deriv-packages/issues/603)). ([9ada725d](https://github.com/regentmarkets/flutter-deriv-packages/commit/9ada725ded271e2b94cffed622eff2e75539cb55))
+
+
+## 2024-06-27
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`deriv_passkeys` - `v0.0.2+7`](#deriv_passkeys---v0027)
+ - [`deriv_auth` - `v6.7.5`](#deriv_auth---v675)
+
+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.5`
+
+---
+
+#### `deriv_passkeys` - `v0.0.2+7`
+
+ - **FIX**(deriv_passkeys): Fix_logout_issue_by_fetching_refresh_token ([#630](https://github.com/regentmarkets/flutter-deriv-packages/issues/630)). ([282278ae](https://github.com/regentmarkets/flutter-deriv-packages/commit/282278aeb27256eaa37660f58eff704d27e92c93))
+
+
 ## 2024-06-26
 
 ### Changes

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ This repository contains private packages & plugins that are used by the company
 
 ## Using the packages
 
-Each package has been released as git tag with convention as **packageName-vVersionNumber**`(Example: deriv_auth-v6.7.4)`. 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.6)`. To use the package, add the following to your pubspec.yaml file:
 
 
 ```yaml
@@ -19,8 +19,8 @@ deriv_ui:
 
 | Name                                                                      | Description                                                                                                            | Version                                                           |
 | ------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------- |
-| [analytics](./packages/analytics)                                         | Used to collect and send analytical information to 'Firebase' and 'Segment'.                                           | [v2.0.0](./packages/analytics/CHANGELOG.md)                       |
-| [deriv_auth](./packages/deriv_auth)                                       | A Dart package that provides Authentication logic for Deriv applications.                                              | [v6.7.4 ](./packages/deriv_auth/CHANGELOG.md)                     |
+| [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.6 ](./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/analytics/CHANGELOG.md b/packages/analytics/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.0
+
+ - **FEAT**(analytics): ilya/DERG-2409/Add_tracking_to_real_account_sign_up_on_Deriv_Go ([#603](https://github.com/regentmarkets/flutter-deriv-packages/issues/603)). ([9ada725d](https://github.com/regentmarkets/flutter-deriv-packages/commit/9ada725ded271e2b94cffed622eff2e75539cb55))
+
 ## 2.0.0
 
 > Note: This release has breaking changes.

diff --git a/packages/analytics/lib/sdk/rudderstack/events/rudderstack_events.dart b/packages/analytics/lib/sdk/rudderstack/events/rudderstack_events.dart
@@ -20,7 +20,7 @@ class DerivRudderstackEvents {
       properties: <String, dynamic>{
         'action': 'open',
         'form_source': 'mobile_derivgo',
-        'form_name': 'virtual_signup_derivgo'
+        'form_name': 'common_events_derivgo'
       },
     );
   }
@@ -56,7 +56,7 @@ class DerivRudderstackEvents {
     DerivRudderstack().track(
       eventName: 'ce_virtual_signup_form',
       properties: <String, dynamic>{
-        'action': 'tab_referral_toggle',
+        'action': 'tap_referral_toggle',
         'form_source': 'mobile_derivgo',
         'form_name': 'virtual_signup_derivgo'
       },
@@ -182,4 +182,98 @@ class DerivRudderstackEvents {
       },
     );
   }
+
+  /// Tracks when the real signup form opened.
+  void logOpenRealSignUp() {
+    DerivRudderstack().track(
+      eventName: 'ce_real_account_signup_form',
+      properties: <String, dynamic>{
+        'action': 'open_real_sign_up',
+        'form_source': 'mobile_derivgo',
+        'form_name': 'real_signup_derivgo'
+      },
+    );
+  }
+
+  /// Tracks when the user presses the next button
+  /// and the step is successfully passed.
+  void logStepPassedRealSignUp(
+      [String? stepNum,
+      String? stepCodename,
+      Map<String, dynamic>? userChoice]) {
+    DerivRudderstack().track(
+      eventName: 'ce_real_account_signup_form',
+      properties: {
+        'action': 'step_passed',
+        'step_codename': stepCodename,
+        'step_num': stepNum,
+        'user_choice': userChoice,
+        'form_source': 'mobile_derivgo',
+        'form_name': 'real_signup_derivgo'
+      },
+    );
+  }
+
+  /// Tracks when user tap the 'previous' button and go to previous screen.
+  void logStepBackRealSignUp(String stepCodeName) {
+    DerivRudderstack().track(
+      eventName: 'ce_real_account_signup_form',
+      properties: <String, dynamic>{
+        'action': 'step_back',
+        'form_source': 'mobile_derivgo',
+        'form_name': 'real_signup_derivgo'
+      },
+    );
+  }
+
+  /// Tracks if the user presses the close button on the signup form.
+  void logCloseRealSignUp() {
+    DerivRudderstack().track(
+      eventName: 'ce_real_account_signup_form',
+      properties: <String, dynamic>{
+        'action': 'close',
+        'form_source': 'mobile_derivgo',
+        'form_name': 'real_signup_derivgo'
+      },
+    );
+  }
+
+  /// Tracks if any logical error has happened on the form,
+  /// validation error for instance.
+  void logValidationErrorDuringRealSignUp() {
+    DerivRudderstack().track(
+      eventName: 'ce_real_account_signup_form',
+      properties: <String, dynamic>{
+        'action': 'real_signup_error',
+        'form_source': 'mobile_derivgo',
+        'form_name': 'real_signup_derivgo'
+      },
+    );
+  }
+
+  /// Tracks system error has happened,
+  /// like no connection to the server and etc.
+  void logError(String error) {
+    DerivRudderstack().track(
+      eventName: 'ce_real_account_signup_form',
+      properties: <String, dynamic>{
+        'action': 'other_error',
+        'error_message': error,
+        'form_source': 'mobile_derivgo',
+        'form_name': 'common_events_derivgo'
+      },
+    );
+  }
+
+  /// Tracks when the signup flow is finished.
+  void logRealSignUpFinished() {
+    DerivRudderstack().track(
+      eventName: 'ce_real_account_signup_form',
+      properties: <String, dynamic>{
+        'action': 'real_signup_finished',
+        'form_source': 'mobile_derivgo',
+        'form_name': 'real_signup_derivgo'
+      },
+    );
+  }
 }
diff --git a/packages/analytics/pubspec.yaml b/packages/analytics/pubspec.yaml
@@ -1,6 +1,6 @@
 name: analytics
 description: A new Flutter package for collecting and sending analytical information from the app.
-version: 2.0.0
+version: 2.1.0
 
 homepage: https://deriv.com/
 publish_to: "none"

diff --git a/packages/deriv_auth/CHANGELOG.md b/packages/deriv_auth/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 6.7.6
+
+ - Update a dependency to the latest release.
+
+## 6.7.5
+
+ - Update a dependency to the latest release.
+
 ## 6.7.4
 
  - Update a dependency to the latest release.

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.4
+version: 6.7.6
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
@@ -16,7 +16,7 @@ dependencies:
     git:
       url: [email protected]:regentmarkets/flutter-deriv-packages.git
       path: packages/analytics
-      ref: analytics-v2.0.0
+      ref: analytics-v2.1.0
 
   deriv_theme:
     git:
@@ -57,7 +57,7 @@ dependencies:
     git:
       url: [email protected]:regentmarkets/flutter-deriv-packages.git
       path: packages/deriv_passkeys
-      ref: deriv_passkeys-v0.0.2+6
+      ref: deriv_passkeys-v0.0.2+8
 
   deriv_language_selector:
     git:

diff --git a/packages/deriv_passkeys/CHANGELOG.md b/packages/deriv_passkeys/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 0.0.2+8
+
+ - Update a dependency to the latest release.
+
+## 0.0.2+7
+
+ - **FIX**(deriv_passkeys): Fix_logout_issue_by_fetching_refresh_token ([#630](https://github.com/regentmarkets/flutter-deriv-packages/issues/630)). ([282278ae](https://github.com/regentmarkets/flutter-deriv-packages/commit/282278aeb27256eaa37660f58eff704d27e92c93))
+
 ## 0.0.2+6
 
  - Update a dependency to the latest release.

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+6
+version: 0.0.2+8
 publish_to: "none"
 
 environment:
@@ -14,7 +14,7 @@ dependencies:
     git:
       url: [email protected]:regentmarkets/flutter-deriv-packages.git
       path: packages/analytics
-      ref: analytics-v2.0.0
+      ref: analytics-v2.1.0
 
   deriv_theme:
     git: