Merge remote-tracking branch 'upstream/master' into Anas/enable-disab…

…le-showing-forgot-pass-and-create-account # Conflicts: # .github/GIT_RULES.md # .github/workflows/all_packages.yaml # .github/workflows/pr_title.yaml # .github/workflows/version.yaml # CHANGELOG.md # packages/deriv_auth_ui/CHANGELOG.md # packages/deriv_auth_ui/lib/src/features/login/layouts/deriv_login_layout.dart # packages/deriv_auth_ui/pubspec.yaml # packages/deriv_date_range_picker/CHANGELOG.md # packages/deriv_date_range_picker/pubspec.yaml # packages/deriv_env/CHANGELOG.md # packages/deriv_env/pubspec.yaml # packages/deriv_expandable_bottom_sheet/CHANGELOG.md # packages/deriv_expandable_bottom_sheet/pubspec.yaml # packages/deriv_numpad/CHANGELOG.md # packages/deriv_numpad/pubspec.yaml # packages/deriv_theme/CHANGELOG.md # packages/deriv_theme/pubspec.yaml # packages/deriv_ui/CHANGELOG.md # packages/deriv_ui/pubspec.yaml
deriv-com · Dec 15, 2023 · e644487 · e644487
2 parents 7603506 + 7cc0f14
commit e644487
Show file tree

Hide file tree

Showing 133 changed files with 3,688 additions and 284 deletions.
diff --git a/.github/GIT_RULES.md b/.github/GIT_RULES.md
@@ -1,5 +1,4 @@
-## Commit Rules:
-
+## <span style="color:DarkGoldenRod">Commit Rules:</span>
 This commits rules is set to ensure all the developers follows a uniform way of writing commits so that it is easy to read the changes made and also automate versioning.
 The commits are based on [conventional commit](https://www.conventionalcommits.org/en/v1.0.0/) which is a widely followed convention for commits. While writing a commit message to any changes made to code base, make sure it reflects the changes and follows the conventions i.e:
 
@@ -30,12 +29,7 @@ feat(deriv_auth): add UI for sign in page
 - add bloc for sign in logic implementation
 - add google services for authentication
 ```
-### Breaking Changes Indicator
-Breaking changes should be indicated by an `!` before the `:` in the subject line e.g. `feat(api)!: remove status endpoint`
-* Is an **optional** part of the format
-
-More changes types:
-
+<b>More changes types:</b>
 | Changes Types | Meaning                    | Description                                                                                                   |
 | ------------- | -------------------------- | ------------------------------------------------------------------------------------------------------------- |
 | feat          | Features                   | A new feature                                                                                                 |
@@ -94,7 +88,53 @@ Optional: If you would like to pre populate your commit box with the commit temp
 * ```
   style: remove empty line
   ```
-## PR Rules:
+### <span style="color:Crimson">Breaking Changes Indicator</span>
+Breaking changes should be indicated by an 
+<span style="color:red;font-size:2em"> ! </span> 
+before the `:` in the subject line e.g. `feat(api)!: remove status endpoint`
+* Is an **optional** part of the format
+
+
+<p>&nbsp;</p>
+
+## <span style="color:DarkGoldenRod">Semantic versioning:
+<center><span style="color:lime; font-size: 4em;">1 . 4 . 3 + 2</span></center>
+<center><span style="color:green; font-size: 2em;">Major . Minor . Patch + build</span></center>
+<p>&nbsp;</p>
+
+<b><span style="color:orange">Major Release:</span></b>
+If a ```“breaking change”``` is introduced, the major release number must be increased
+
+```
+feat(api)!: remove status endpoint
+fix!: bug fix with breaking change
+```
+
+<b><span style="color:orange">Minor Release:</span></b>
+New features have been introduced, which are backwards compatible ```no “breaking changes”```
+
+
+```
+feat: new feature
+```
+
+<b><span style="color:orange">Patch Release: </span></b>
+Bug fixes ```no “breaking changes”```</br>
+```
+fix: something in code
+refactor: code changes that doesn't fix or add anything
+```
+
+<b><span style="color:orange">Build:</span></b> This number is optional and can be used to differentiate between different builds of the same version.
+</br>
+
+<b>no change <span style="color:orange">| | </span>build bump:</b>
+```
+build, chore, ci, docs, style, perf, test
+```
+<p>&nbsp;</p>
+
+## <span style="color:DarkGoldenRod">PR Rules:</span>
 
 This Rules is set to create a uniform way of submitting Pull requests where all the necessary information for the changes are listed in the title, or description. There is a standard template for creating PR. When you are creating a PR to any repo always make sure:
 

diff --git a/.github/workflows/all_packages.yaml b/.github/workflows/all_packages.yaml
@@ -18,22 +18,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Git Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
 
       - name: Setup Flutter
-        uses: subosito/flutter-action@v2
+        uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa
         with:
           channel: "stable"
           flutter-version: "3.10.2"
           cache: true
 
       - name: Set SSH Key
-        uses: webfactory/ssh-agent@v0.8.0
+        uses: webfactory/ssh-agent@fd34b8dee206fe74b288a5e61bc95fba2f1911eb
         with:
           ssh-private-key: ${{secrets.SSH_PRIVATE_KEY}}
 
       - name: Install Melos and run pub get
-        uses: bluefireteam/melos-action@v1
+        uses: bluefireteam/melos-action@dd3c344d731938d2ab2567a261f54a19a68b5f6a
         with:
           melos-version: "3.0.1"
 

diff --git a/.github/workflows/pr_title.yaml b/.github/workflows/pr_title.yaml
@@ -14,6 +14,6 @@ jobs:
   validate:
     runs-on: ubuntu-latest
     steps:
-      - uses: amannn/action-semantic-pull-request@v5
+      - uses: amannn/action-semantic-pull-request@e9fabac35e210fea40ca5b14c0da95a099eff26f
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/version.yaml b/.github/workflows/version.yaml
@@ -5,51 +5,44 @@ on:
     types:
       - closed
     branches:
-      - dev
-
-permissions:
-  contents: write
-  pull-requests: write
+      - master
 
 jobs:
   version_and_tag:
     runs-on: ubuntu-latest
     if: github.event.pull_request.merged == true && !contains(github.event.pull_request.title, 'chore(version)')
     steps:
       - name: Git Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
         with:
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
           fetch-depth: 0
 
       - name: Setup Git User
-        uses: fregante/setup-git-user@v2
+        uses: fregante/setup-git-user@77c1b5542f14ab6db4b8462d6857e31deb988b09
 
       - name: Setup Flutter
-        uses: subosito/flutter-action@v2
+        uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa
         with:
           channel: "stable"
           flutter-version: "3.10.2"
           cache: true
 
       - name: Setup Melos
-        uses: bluefireteam/melos-action@v3
+        uses: bluefireteam/melos-action@dd3c344d731938d2ab2567a261f54a19a68b5f6a
         with:
           melos-version: "3.2.0"
           run-bootstrap: false
 
       - name: Create git tag based on version
-        # only consider changes from the commit mentioned below
         run: melos version --all --yes
 
       - name: Push tag
         run: git push --tags
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create Pull Request on updated changelog and pubspec file.
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@76c6f5c20e2111bfee3cd30fae52a25e410f5efc
         with:
           token: ${{ secrets.PAT }}
           title: "chore(version): bump version and update changelog"
-          base: dev
+          base: master
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,168 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 2023-12-13
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`analytics` - `v1.0.2`](#analytics---v102)
+ - [`deriv_auth` - `v1.2.0`](#deriv_auth---v120)
+ - [`deriv_auth_ui` - `v0.0.2`](#deriv_auth_ui---v002)
+ - [`deriv_date_range_picker` - `v0.0.1+2`](#deriv_date_range_picker---v0012)
+ - [`deriv_dependency_injector` - `v1.0.2`](#deriv_dependency_injector---v102)
+ - [`deriv_env` - `v0.0.1+2`](#deriv_env---v0012)
+ - [`deriv_numpad` - `v1.0.2`](#deriv_numpad---v102)
+ - [`deriv_theme` - `v2.2.0`](#deriv_theme---v220)
+ - [`deriv_ui` - `v0.0.2`](#deriv_ui---v002)
+ - [`deriv_expandable_bottom_sheet` - `v0.0.1+2`](#deriv_expandable_bottom_sheet---v0012)
+
+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_expandable_bottom_sheet` - `v0.0.1+2`
+
+---
+
+#### `analytics` - `v1.0.2`
+
+ - **REVERT**(analytics): versioning and CHANGELOG. ([81a3a0df](https://github.com/regentmarkets/flutter-deriv-packages/commit/81a3a0df27208bd200009415855c6cb944d016e3))
+ - **REFACTOR**(analytics): [MOBC-546] Creating unified analytics package. ([#315](https://github.com/regentmarkets/flutter-deriv-packages/issues/315)). ([fd1d8ed3](https://github.com/regentmarkets/flutter-deriv-packages/commit/fd1d8ed345d4ecf91c5f6c1463c5196b40abcbf6))
+
+#### `deriv_auth` - `v1.2.0`
+
+ - **FEAT**(deriv_auth): [DERG-1299] add user agent to login ([#341](https://github.com/regentmarkets/flutter-deriv-packages/issues/341)). ([37f5b763](https://github.com/regentmarkets/flutter-deriv-packages/commit/37f5b763d8a679ff1d458fc4e9b82578f4eecf83))
+
+#### `deriv_auth_ui` - `v0.0.2`
+
+ - **REFACTOR**(deriv_auth_ui): [MOBC-629] Adding semantics to UI components ([#321](https://github.com/regentmarkets/flutter-deriv-packages/issues/321)). ([36a0c1fa](https://github.com/regentmarkets/flutter-deriv-packages/commit/36a0c1faa0b47d4f735a79daf67c9e2c0089938e))
+ - **REFACTOR**: deriv country selection cubit. ([5b0d5f0c](https://github.com/regentmarkets/flutter-deriv-packages/commit/5b0d5f0c37ecd732739204d2a41c334779803945))
+ - **REFACTOR**: deriv country selection cubit. ([e88f6332](https://github.com/regentmarkets/flutter-deriv-packages/commit/e88f6332844433953a63ff5933612ea2e115b045))
+ - **REFACTOR**: make countries non-nullable. ([e65d7587](https://github.com/regentmarkets/flutter-deriv-packages/commit/e65d7587e334e82486f6510a50015784adf6fddd))
+ - **REFACTOR**: add eof and remove deprecated lint. ([c2c7a80a](https://github.com/regentmarkets/flutter-deriv-packages/commit/c2c7a80a5fe39f747897a8a6be09701d125716e9))
+ - **REFACTOR**: auth state handler. ([84e2099d](https://github.com/regentmarkets/flutter-deriv-packages/commit/84e2099d65abe8585c64773254fca99059b3b4cb))
+ - **REFACTOR**: auth state handling in signup and set password page. ([05c12d53](https://github.com/regentmarkets/flutter-deriv-packages/commit/05c12d53906de229d316fdbcf18396e4b34aed1f))
+ - **FIX**: spacing after social flag. ([d782c86a](https://github.com/regentmarkets/flutter-deriv-packages/commit/d782c86a69eae3489e261060c7eacf63eb2da9d0))
+ - **FIX**: add missing ok label in referal dialog. ([086fc636](https://github.com/regentmarkets/flutter-deriv-packages/commit/086fc636bdae24da873a9931e7b053b50e6b1a73))
+ - **FIX**: reset password button alignment. ([411b2115](https://github.com/regentmarkets/flutter-deriv-packages/commit/411b2115d0f891b61036e601c5f26045e3a861f3))
+ - **FIX**: change color to general. ([cac78e49](https://github.com/regentmarkets/flutter-deriv-packages/commit/cac78e49f1650fe1ba5f7698b97ce7a5adaa1308))
+ - **FEAT**: [MOBC-608] auth ui setting page ([#320](https://github.com/regentmarkets/flutter-deriv-packages/issues/320)). ([ce8d202b](https://github.com/regentmarkets/flutter-deriv-packages/commit/ce8d202bc1636f29ca99475d645d99aead663e57))
+ - **FEAT**: add flag for social login. ([016f3902](https://github.com/regentmarkets/flutter-deriv-packages/commit/016f3902d6d110f76446a0cc4ce0edfa2f35dd8a))
+ - **FEAT**: reset pass success page. ([afb19891](https://github.com/regentmarkets/flutter-deriv-packages/commit/afb1989104a02fc3e8c03a55e1b35216500be422))
+ - **FEAT**: add gesture detector in get started layout. ([185928c6](https://github.com/regentmarkets/flutter-deriv-packages/commit/185928c6d8489d8edf3732a58cf05d91b0cac71b))
+ - **FEAT**: country consent added in country_selection_layout. ([7cc23945](https://github.com/regentmarkets/flutter-deriv-packages/commit/7cc239455f1169777f8c11d78487f1e39e35e76b))
+ - **FEAT**: add social button flag. ([f8f95171](https://github.com/regentmarkets/flutter-deriv-packages/commit/f8f9517127a5cda26eed12c290f702c8623826e9))
+ - **FEAT**: add auth error state handler in set password page. ([737ed84a](https://github.com/regentmarkets/flutter-deriv-packages/commit/737ed84a282869bce1bbde00794309e9e9fc2b34))
+ - **FEAT**: add auth error state handler in sign up page. ([b7910157](https://github.com/regentmarkets/flutter-deriv-packages/commit/b79101574ac82790c8acb3fb5cda93dfb6274500))
+ - **FEAT**: add deriv auth error state handler. ([6818ff32](https://github.com/regentmarkets/flutter-deriv-packages/commit/6818ff321b0875a039013e339e55cabba683a4fb))
+ - **DOCS**: update documentation based on latest changes. ([4ba23ea9](https://github.com/regentmarkets/flutter-deriv-packages/commit/4ba23ea9b791d5d1d6aaf54fd4562ba1232e4259))
+
+#### `deriv_date_range_picker` - `v0.0.1+2`
+
+ - **FIX**: change color to general. ([cac78e49](https://github.com/regentmarkets/flutter-deriv-packages/commit/cac78e49f1650fe1ba5f7698b97ce7a5adaa1308))
+
+#### `deriv_dependency_injector` - `v1.0.2`
+
+ - **REFACTOR**(deriv_dependency_injector): [MOBC-534] deprecate deriv dependency injector ([#347](https://github.com/regentmarkets/flutter-deriv-packages/issues/347)). ([92426f15](https://github.com/regentmarkets/flutter-deriv-packages/commit/92426f15eaa5caa529724590e006fd0f65d6800e))
+
+#### `deriv_env` - `v0.0.1+2`
+
+ - **REFACTOR**(deriv_env): make package independent of env file ([#318](https://github.com/regentmarkets/flutter-deriv-packages/issues/318)). ([a7242c81](https://github.com/regentmarkets/flutter-deriv-packages/commit/a7242c81b97fda70a622d7bbbb97fe997067117a))
+
+#### `deriv_numpad` - `v1.0.2`
+
+ - **FIX**: change color to general. ([cac78e49](https://github.com/regentmarkets/flutter-deriv-packages/commit/cac78e49f1650fe1ba5f7698b97ce7a5adaa1308))
+
+#### `deriv_theme` - `v2.2.0`
+
+ - **FEAT**: Ayaan/Added margins 112 and 164 ([#319](https://github.com/regentmarkets/flutter-deriv-packages/issues/319)). ([bf625820](https://github.com/regentmarkets/flutter-deriv-packages/commit/bf6258206b4bb4cbdd1ef6744e07e2adb8d0d5ee))
+
+#### `deriv_ui` - `v0.0.2`
+
+ - **REFACTOR**(deriv_auth_ui): [MOBC-629] Adding semantics to UI components ([#321](https://github.com/regentmarkets/flutter-deriv-packages/issues/321)). ([36a0c1fa](https://github.com/regentmarkets/flutter-deriv-packages/commit/36a0c1faa0b47d4f735a79daf67c9e2c0089938e))
+ - **FIX**: change color to general. ([cac78e49](https://github.com/regentmarkets/flutter-deriv-packages/commit/cac78e49f1650fe1ba5f7698b97ce7a5adaa1308))
+ - **FEAT**: country consent added in country_selection_layout. ([7cc23945](https://github.com/regentmarkets/flutter-deriv-packages/commit/7cc239455f1169777f8c11d78487f1e39e35e76b))
+
+
+## 2023-12-12
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`deriv_dependency_injector` - `v1.0.1`](#deriv_dependency_injector---v101)
+
+---
+
+#### `deriv_dependency_injector` - `v1.0.1`
+
+ - **REFACTOR**(deriv_dependency_injector): [MOBC-534] deprecate deriv dependency injector ([#347](https://github.com/regentmarkets/flutter-deriv-packages/issues/347)). ([92426f15](https://github.com/regentmarkets/flutter-deriv-packages/commit/92426f15eaa5caa529724590e006fd0f65d6800e))
+
+
+## 2023-12-08
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`analytics` - `v1.0.1`](#analytics---v101)
+
+---
+
+#### `analytics` - `v1.0.1`
+
+ - **REVERT**(analytics): versioning and CHANGELOG. ([81a3a0df](https://github.com/regentmarkets/flutter-deriv-packages/commit/81a3a0df27208bd200009415855c6cb944d016e3))
+ - **REFACTOR**(analytics): [MOBC-546] Creating unified analytics package. ([#315](https://github.com/regentmarkets/flutter-deriv-packages/issues/315)). ([fd1d8ed3](https://github.com/regentmarkets/flutter-deriv-packages/commit/fd1d8ed345d4ecf91c5f6c1463c5196b40abcbf6))
+
+
+## 2023-12-04
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`deriv_auth` - `v1.1.0`](#deriv_auth---v110)
+ - [`deriv_auth_ui` - `v0.0.1+3`](#deriv_auth_ui---v0013)
+
+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_ui` - `v0.0.1+3`
+
+---
+
+#### `deriv_auth` - `v1.1.0`
+
+ - **FEAT**(deriv_auth): [DERG-1299] add user agent to login ([#341](https://github.com/regentmarkets/flutter-deriv-packages/issues/341)). ([37f5b763](https://github.com/regentmarkets/flutter-deriv-packages/commit/37f5b763d8a679ff1d458fc4e9b82578f4eecf83))
+
+
 ## 2023-11-29
 
 ### Changes

diff --git a/packages/analytics/CHANGELOG.md b/packages/analytics/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 1.0.2
+
+ - **REVERT**(analytics): versioning and CHANGELOG. ([81a3a0df](https://github.com/regentmarkets/flutter-deriv-packages/commit/81a3a0df27208bd200009415855c6cb944d016e3))
+ - **REFACTOR**(analytics): [MOBC-546] Creating unified analytics package. ([#315](https://github.com/regentmarkets/flutter-deriv-packages/issues/315)). ([fd1d8ed3](https://github.com/regentmarkets/flutter-deriv-packages/commit/fd1d8ed345d4ecf91c5f6c1463c5196b40abcbf6))
+
+## 1.0.1
+
+ - **REVERT**(analytics): versioning and CHANGELOG. ([81a3a0df](https://github.com/regentmarkets/flutter-deriv-packages/commit/81a3a0df27208bd200009415855c6cb944d016e3))
+ - **REFACTOR**(analytics): [MOBC-546] Creating unified analytics package. ([#315](https://github.com/regentmarkets/flutter-deriv-packages/issues/315)). ([fd1d8ed3](https://github.com/regentmarkets/flutter-deriv-packages/commit/fd1d8ed345d4ecf91c5f6c1463c5196b40abcbf6))
+
 ## [1.0.0]
 - Migrated the package to null safety.