From 5147c12bd6b49aed82dd4e3036f63de79816edba Mon Sep 17 00:00:00 2001 From: sahani-deriv <125638269+sahani-deriv@users.noreply.github.com> Date: Tue, 23 Jan 2024 15:37:39 +0800 Subject: [PATCH 01/13] refactor(update_checker): increase package info plus version (#407) --- packages/update_checker/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/update_checker/pubspec.yaml b/packages/update_checker/pubspec.yaml index 383a18a47..6bc3d8895 100644 --- a/packages/update_checker/pubspec.yaml +++ b/packages/update_checker/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: flutter: sdk: flutter flutter_bloc: ^8.1.2 - package_info_plus: ^3.0.3 + package_info_plus: ^4.2.0 firebase_remote_config: ^4.3.6 dev_dependencies: From aab92f3dfdba1e87a470309f0a534fd6a9747c0f Mon Sep 17 00:00:00 2001 From: mobile-apps-deriv <134251399+mobile-apps-deriv@users.noreply.github.com> Date: Tue, 23 Jan 2024 15:39:16 +0800 Subject: [PATCH 02/13] chore(version): bump version and update changelog (#408) * chore(release): publish packages - update_checker@1.2.1 * [create-pull-request] automated change --------- Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: sahani-deriv --- CHANGELOG.md | 21 +++++++++++++++++++++ README.md | 2 +- packages/update_checker/CHANGELOG.md | 4 ++++ packages/update_checker/pubspec.yaml | 2 +- 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27a7afd92..54d80e2f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,27 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## 2024-01-23 + +### Changes + +--- + +Packages with breaking changes: + + - There are no breaking changes in this release. + +Packages with other changes: + + - [`update_checker` - `v1.2.1`](#update_checker---v121) + +--- + +#### `update_checker` - `v1.2.1` + + - **REFACTOR**(update_checker): increase package info plus version ([#407](https://github.com/regentmarkets/flutter-deriv-packages/issues/407)). ([5147c12b](https://github.com/regentmarkets/flutter-deriv-packages/commit/5147c12bd6b49aed82dd4e3036f63de79816edba)) + + ## 2024-01-23 ### Changes diff --git a/README.md b/README.md index 36a71054a..78064a751 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ deriv_ui: | [deriv_websocket](./packages/deriv_web_socket_client) | A package that provides a easy to use websocket client. | [v1.0.1](./packages/deriv_web_socket_client/CHANGELOG.md) | | [deriv_web_view](./packages/deriv_web_view) | Deriv web view package. | [v0.0.1+1](./packages/deriv_web_view/CHANGELOG.md) | | [form_builder](./packages/form_builder) | A simpler and cleaner way to create, validate and submit forms. | [v1.0.0+1](./packages/form_builder/CHANGELOG.md) | -| [update_checker](./packages/update_checker) | Check and retrieve update information from the server for the given package. | [v1.2.0](./packages/update_checker/CHANGELOG.md) | +| [update_checker](./packages/update_checker) | Check and retrieve update information from the server for the given package. | [v1.2.1](./packages/update_checker/CHANGELOG.md) | | [deriv_feature_flag](./packages/deriv_feature_flag) | A package to provide feature flag functionality for apps. | [v0.0.1](./packages/deriv_feature_flag/CHANGELOG.md) | ## Environment Setup diff --git a/packages/update_checker/CHANGELOG.md b/packages/update_checker/CHANGELOG.md index 7037dec39..ffeb39270 100644 --- a/packages/update_checker/CHANGELOG.md +++ b/packages/update_checker/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.2.1 + + - **REFACTOR**(update_checker): increase package info plus version ([#407](https://github.com/regentmarkets/flutter-deriv-packages/issues/407)). ([5147c12b](https://github.com/regentmarkets/flutter-deriv-packages/commit/5147c12bd6b49aed82dd4e3036f63de79816edba)) + ## [1.1.0] - Migrated to Null Safety diff --git a/packages/update_checker/pubspec.yaml b/packages/update_checker/pubspec.yaml index 6bc3d8895..0dcd96789 100644 --- a/packages/update_checker/pubspec.yaml +++ b/packages/update_checker/pubspec.yaml @@ -1,6 +1,6 @@ name: update_checker description: Check and retrieve update information from the server for the given package. -version: 1.2.0 +version: 1.2.1 homepage: https://deriv.com/ publish_to: "none" From 9c19b5b45aaa40897a7b9884794ab9cbb29fe4ff Mon Sep 17 00:00:00 2001 From: Bassam El Obeid <127500305+bassam-deriv@users.noreply.github.com> Date: Tue, 23 Jan 2024 12:40:25 +0400 Subject: [PATCH 03/13] refactor(deriv_banner): updated kotlin version (#399) --- packages/deriv_banner/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/deriv_banner/android/build.gradle b/packages/deriv_banner/android/build.gradle index c7aee8bfb..ab64b958e 100644 --- a/packages/deriv_banner/android/build.gradle +++ b/packages/deriv_banner/android/build.gradle @@ -2,7 +2,7 @@ group 'com.deriv.app.deriv_banner' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.5.20' repositories { google() mavenCentral() From ad9d72e10186e695a72d022d3b3f6ebdd5120666 Mon Sep 17 00:00:00 2001 From: Bassam El Obeid <127500305+bassam-deriv@users.noreply.github.com> Date: Tue, 23 Jan 2024 12:41:17 +0400 Subject: [PATCH 04/13] refactor(deriv_store_launcher): udpated kotlin and gradle version (#400) --- packages/deriv_store_launcher/android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/deriv_store_launcher/android/build.gradle b/packages/deriv_store_launcher/android/build.gradle index a85aad2db..a0a7ee049 100644 --- a/packages/deriv_store_launcher/android/build.gradle +++ b/packages/deriv_store_launcher/android/build.gradle @@ -2,14 +2,14 @@ group 'com.deriv.app.deriv_store_launcher' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.5.20' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.0' + classpath 'com.android.tools.build:gradle:7.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } From c764cc2d49912e5f8c47490a8c2c5a54265a4776 Mon Sep 17 00:00:00 2001 From: mobile-apps-deriv <134251399+mobile-apps-deriv@users.noreply.github.com> Date: Tue, 23 Jan 2024 16:42:49 +0800 Subject: [PATCH 05/13] chore(version): bump version and update changelog (#409) * chore(release): publish packages - deriv_banner@0.0.1+1 - deriv_store_launcher@0.0.1+1 * [create-pull-request] automated change --------- Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: sahani-deriv --- CHANGELOG.md | 26 ++++++++++++++++++++++ README.md | 4 ++-- packages/deriv_banner/CHANGELOG.md | 4 ++++ packages/deriv_banner/pubspec.yaml | 2 +- packages/deriv_store_launcher/CHANGELOG.md | 4 ++++ packages/deriv_store_launcher/pubspec.yaml | 2 +- 6 files changed, 38 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54d80e2f7..29a5db57c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,32 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## 2024-01-23 + +### Changes + +--- + +Packages with breaking changes: + + - There are no breaking changes in this release. + +Packages with other changes: + + - [`deriv_banner` - `v0.0.1+1`](#deriv_banner---v0011) + - [`deriv_store_launcher` - `v0.0.1+1`](#deriv_store_launcher---v0011) + +--- + +#### `deriv_banner` - `v0.0.1+1` + + - **REFACTOR**(deriv_banner): updated kotlin version ([#399](https://github.com/regentmarkets/flutter-deriv-packages/issues/399)). ([9c19b5b4](https://github.com/regentmarkets/flutter-deriv-packages/commit/9c19b5b45aaa40897a7b9884794ab9cbb29fe4ff)) + +#### `deriv_store_launcher` - `v0.0.1+1` + + - **REFACTOR**(deriv_store_launcher): udpated kotlin and gradle version ([#400](https://github.com/regentmarkets/flutter-deriv-packages/issues/400)). ([ad9d72e1](https://github.com/regentmarkets/flutter-deriv-packages/commit/ad9d72e10186e695a72d022d3b3f6ebdd5120666)) + + ## 2024-01-23 ### Changes diff --git a/README.md b/README.md index 78064a751..fc26894be 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ deriv_ui: | ------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------- | | [analytics](./packages/analytics) | Used to collect and send analytical information to 'Firebase' and 'Segment'. | [v1.0.2](./packages/analytics/CHANGELOG.md) | | [deriv_auth](./packages/deriv_auth) | A Dart package that provides Authentication logic for Deriv applications. | [v2.0.2 ](./packages/deriv_auth/CHANGELOG.md) | -| [deriv_banner](./packages/deriv_banner) | A widget to show banner in apps. | [v0.0.1](./packages/deriv_banner/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) | | [deriv_date_range_picker](./packages/deriv_date_range_picker) | Provides a widget that allows users to select a date range either by calendar mode or input mode. | [v0.0.1+2](./packages/deriv_date_range_picker/CHANGELOG.md) | @@ -33,7 +33,7 @@ deriv_ui: | [deriv_localizations](./packages/deriv_localizations) | A Package that contains the localization arb(coming from Crowdin) and dart generated files for flutter_deriv_packages. | | [deriv_numpad](./packages/deriv_numpad) | Number Pad Widget for number input. | [v1.1.0](./packages/deriv_numpad/CHANGELOG.md) | | [deriv_rudderstack](./packages/deriv_rudderstack) | A plugin that add RudderStack SDK support to Flutter. | [v1.1.0](./packages/deriv_rudderstack/CHANGELOG.md) | -| [deriv_store_launcher](./packages/deriv_store_launcher) | A plugin to launch app stores base on platform and manufacturer. | [v0.0.1](./packages/deriv_store_launcher/CHANGELOG.md) | +| [deriv_store_launcher](./packages/deriv_store_launcher) | A plugin to launch app stores base on platform and manufacturer. | [v0.0.1+1](./packages/deriv_store_launcher/CHANGELOG.md) | | [deriv_technical_analysis](./packages/deriv_technical_analysis) | A Dart package for Technical Analysis. | [v0.0.1](./packages/deriv_technical_analysis/CHANGELOG.md) | | [deriv_theme](./packages/deriv_theme) | A package that contains the theme used by Deriv products. | [v2.2.0](./packages/deriv_theme/CHANGELOG.md) | | [deriv_ui](./packages/deriv_ui) | A package that contains the UI components used by Deriv products. | [v0.0.2+1](./packages/deriv_ui/CHANGELOG.md) | diff --git a/packages/deriv_banner/CHANGELOG.md b/packages/deriv_banner/CHANGELOG.md index 761894f12..4047204d7 100644 --- a/packages/deriv_banner/CHANGELOG.md +++ b/packages/deriv_banner/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.0.1+1 + + - **REFACTOR**(deriv_banner): updated kotlin version ([#399](https://github.com/regentmarkets/flutter-deriv-packages/issues/399)). ([9c19b5b4](https://github.com/regentmarkets/flutter-deriv-packages/commit/9c19b5b45aaa40897a7b9884794ab9cbb29fe4ff)) + ## 0.0.1 - initial release. diff --git a/packages/deriv_banner/pubspec.yaml b/packages/deriv_banner/pubspec.yaml index dc7b16cb3..2bb0cf0f5 100644 --- a/packages/deriv_banner/pubspec.yaml +++ b/packages/deriv_banner/pubspec.yaml @@ -1,7 +1,7 @@ name: deriv_banner description: A new flutter plugin project. -version: 0.0.1 +version: 0.0.1+1 homepage: https://deriv.com/ publish_to: "none" diff --git a/packages/deriv_store_launcher/CHANGELOG.md b/packages/deriv_store_launcher/CHANGELOG.md index 761894f12..b4ad12281 100644 --- a/packages/deriv_store_launcher/CHANGELOG.md +++ b/packages/deriv_store_launcher/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.0.1+1 + + - **REFACTOR**(deriv_store_launcher): udpated kotlin and gradle version ([#400](https://github.com/regentmarkets/flutter-deriv-packages/issues/400)). ([ad9d72e1](https://github.com/regentmarkets/flutter-deriv-packages/commit/ad9d72e10186e695a72d022d3b3f6ebdd5120666)) + ## 0.0.1 - initial release. diff --git a/packages/deriv_store_launcher/pubspec.yaml b/packages/deriv_store_launcher/pubspec.yaml index 76666e1a2..a122fcdba 100644 --- a/packages/deriv_store_launcher/pubspec.yaml +++ b/packages/deriv_store_launcher/pubspec.yaml @@ -1,7 +1,7 @@ name: deriv_store_launcher description: A plugin to lunch app stores base on platform and manufacturer. -version: 0.0.1 +version: 0.0.1+1 homepage: https://deriv.com/ publish_to: "none" From 2289efcbfe3b7de160e0c4cee58b72a347d78eb9 Mon Sep 17 00:00:00 2001 From: Bassam El Obeid <127500305+bassam-deriv@users.noreply.github.com> Date: Tue, 23 Jan 2024 12:54:47 +0400 Subject: [PATCH 06/13] refactor(deriv_ui): updated flutter_svg (#411) --- packages/deriv_ui/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/deriv_ui/pubspec.yaml b/packages/deriv_ui/pubspec.yaml index e90bfc4ca..6a2aedbe4 100644 --- a/packages/deriv_ui/pubspec.yaml +++ b/packages/deriv_ui/pubspec.yaml @@ -23,7 +23,7 @@ dependencies: path: packages/deriv_web_view ref: deriv_web_view-v0.0.1+1 - flutter_svg: ^1.0.3 + flutter_svg: ^2.0.7 dev_dependencies: flutter_test: From 779cbe3b75c123b4d5dffd920480fa01ef1364a8 Mon Sep 17 00:00:00 2001 From: mobile-apps-deriv <134251399+mobile-apps-deriv@users.noreply.github.com> Date: Tue, 23 Jan 2024 16:57:51 +0800 Subject: [PATCH 07/13] chore(version): bump version and update changelog (#412) * chore(release): publish packages - deriv_ui@0.0.2+2 - deriv_auth@2.0.3 * [create-pull-request] automated change --------- Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: sahani-deriv --- CHANGELOG.md | 28 ++++++++++++++++++++++++++++ README.md | 8 ++++---- packages/deriv_auth/CHANGELOG.md | 4 ++++ packages/deriv_auth/pubspec.yaml | 4 ++-- packages/deriv_ui/CHANGELOG.md | 4 ++++ packages/deriv_ui/pubspec.yaml | 2 +- 6 files changed, 43 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29a5db57c..d7bd2764e 100644 --- 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-01-23 + +### Changes + +--- + +Packages with breaking changes: + + - There are no breaking changes in this release. + +Packages with other changes: + + - [`deriv_ui` - `v0.0.2+2`](#deriv_ui---v0022) + - [`deriv_auth` - `v2.0.3`](#deriv_auth---v203) + +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` - `v2.0.3` + +--- + +#### `deriv_ui` - `v0.0.2+2` + + - **REFACTOR**(deriv_ui): updated flutter_svg ([#411](https://github.com/regentmarkets/flutter-deriv-packages/issues/411)). ([2289efcb](https://github.com/regentmarkets/flutter-deriv-packages/commit/2289efcbfe3b7de160e0c4cee58b72a347d78eb9)) + + ## 2024-01-23 ### Changes diff --git a/README.md b/README.md index fc26894be..f52e566ba 100644 --- a/README.md +++ b/README.md @@ -4,14 +4,14 @@ 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-v2.0.2)`. 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-v2.0.3)`. To use the package, add the following to your pubspec.yaml file: ```yaml deriv_ui: git: url: git@github.com:regentmarkets/flutter-deriv-packages.git path: packages/deriv_ui - ref: deriv_ui-v0.0.2+1 #your prefered version + ref: deriv_ui-v0.0.2+2 #your prefered version ``` ## Packages @@ -19,7 +19,7 @@ deriv_ui: | Name | Description | Version | | ------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------- | | [analytics](./packages/analytics) | Used to collect and send analytical information to 'Firebase' and 'Segment'. | [v1.0.2](./packages/analytics/CHANGELOG.md) | -| [deriv_auth](./packages/deriv_auth) | A Dart package that provides Authentication logic for Deriv applications. | [v2.0.2 ](./packages/deriv_auth/CHANGELOG.md) | +| [deriv_auth](./packages/deriv_auth) | A Dart package that provides Authentication logic for Deriv applications. | [v2.0.3 ](./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) | @@ -36,7 +36,7 @@ deriv_ui: | [deriv_store_launcher](./packages/deriv_store_launcher) | A plugin to launch app stores base on platform and manufacturer. | [v0.0.1+1](./packages/deriv_store_launcher/CHANGELOG.md) | | [deriv_technical_analysis](./packages/deriv_technical_analysis) | A Dart package for Technical Analysis. | [v0.0.1](./packages/deriv_technical_analysis/CHANGELOG.md) | | [deriv_theme](./packages/deriv_theme) | A package that contains the theme used by Deriv products. | [v2.2.0](./packages/deriv_theme/CHANGELOG.md) | -| [deriv_ui](./packages/deriv_ui) | A package that contains the UI components used by Deriv products. | [v0.0.2+1](./packages/deriv_ui/CHANGELOG.md) | +| [deriv_ui](./packages/deriv_ui) | A package that contains the UI components used by Deriv products. | [v0.0.2+2](./packages/deriv_ui/CHANGELOG.md) | | [deriv_utilities](./packages/deriv_utilities) | A package that contains the utilities including helper functions, mixins, and extensions. | [v1.0.0](./packages/deriv_utilities/CHANGELOG.md) | | [deriv_websocket](./packages/deriv_web_socket_client) | A package that provides a easy to use websocket client. | [v1.0.1](./packages/deriv_web_socket_client/CHANGELOG.md) | | [deriv_web_view](./packages/deriv_web_view) | Deriv web view package. | [v0.0.1+1](./packages/deriv_web_view/CHANGELOG.md) | diff --git a/packages/deriv_auth/CHANGELOG.md b/packages/deriv_auth/CHANGELOG.md index 1b44551a7..98dfaa731 100644 --- a/packages/deriv_auth/CHANGELOG.md +++ b/packages/deriv_auth/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.3 + + - Update a dependency to the latest release. + ## 2.0.2 - **FIX**(deriv_auth): fix overflow issue in change password layout ([#404](https://github.com/regentmarkets/flutter-deriv-packages/issues/404)). ([abd05684](https://github.com/regentmarkets/flutter-deriv-packages/commit/abd056841f774ffb806e76569b60701d2fa74808)) diff --git a/packages/deriv_auth/pubspec.yaml b/packages/deriv_auth/pubspec.yaml index 0239e05a7..0aaa24c40 100644 --- 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: 2.0.2 +version: 2.0.3 environment: sdk: ">=3.0.0 <4.0.0" @@ -21,7 +21,7 @@ dependencies: git: url: git@github.com:regentmarkets/flutter-deriv-packages.git path: packages/deriv_ui - ref: deriv_ui-v0.0.2 + ref: deriv_ui-v0.0.2+2 deriv_http_client: git: diff --git a/packages/deriv_ui/CHANGELOG.md b/packages/deriv_ui/CHANGELOG.md index f69636545..8126ade19 100644 --- a/packages/deriv_ui/CHANGELOG.md +++ b/packages/deriv_ui/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.0.2+2 + + - **REFACTOR**(deriv_ui): updated flutter_svg ([#411](https://github.com/regentmarkets/flutter-deriv-packages/issues/411)). ([2289efcb](https://github.com/regentmarkets/flutter-deriv-packages/commit/2289efcbfe3b7de160e0c4cee58b72a347d78eb9)) + ## 0.0.2+1 - Update a dependency to the latest release. diff --git a/packages/deriv_ui/pubspec.yaml b/packages/deriv_ui/pubspec.yaml index 6a2aedbe4..2e2657def 100644 --- a/packages/deriv_ui/pubspec.yaml +++ b/packages/deriv_ui/pubspec.yaml @@ -1,6 +1,6 @@ name: deriv_ui description: A new Flutter package project. -version: 0.0.2+1 +version: 0.0.2+2 publish_to: none environment: From e2e717f36e93039cadc706cc29b12b48a7c1b411 Mon Sep 17 00:00:00 2001 From: Bassam El Obeid <127500305+bassam-deriv@users.noreply.github.com> Date: Tue, 23 Jan 2024 13:01:56 +0400 Subject: [PATCH 08/13] refactor(deriv_auth): Update package info plus deriv auth (#410) * refactor(deriv_auth): updated package_info_plus * refactor(deriv_auth): updated flutter_svg --- packages/deriv_auth/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/deriv_auth/pubspec.yaml b/packages/deriv_auth/pubspec.yaml index 0aaa24c40..4ab2f4f08 100644 --- a/packages/deriv_auth/pubspec.yaml +++ b/packages/deriv_auth/pubspec.yaml @@ -30,7 +30,7 @@ dependencies: ref: deriv_http_client-v1.0.0 flutter_bloc: ^8.1.3 - flutter_svg: ^1.1.6 + flutter_svg: ^2.0.7 smooth_page_indicator: ^1.1.0 intl_utils: ^2.8.3 intl: ^0.18.0 From b625fbce37e7acfd9454ba16b908207aee3c9a86 Mon Sep 17 00:00:00 2001 From: Bassam El Obeid <127500305+bassam-deriv@users.noreply.github.com> Date: Tue, 23 Jan 2024 14:50:56 +0400 Subject: [PATCH 09/13] refactor(deriv_auth): renamed localization getter in ContextExtension (#414) * refactor(deriv_auth): renamed localization getter in ContextExtension * refactor(deriv_auth): Update localization labels in deriv_auth package --- .../core/extensions/context_extension.dart | 3 +- .../helpers/country_selection_helper.dart | 2 +- .../deriv_unavailable_country_layout.dart | 9 ++-- .../core/states/auth_error_state_handler.dart | 48 +++++++++---------- .../layouts/deriv_get_started_layout.dart | 4 +- .../layouts/deriv_2fa_layout.dart | 12 ++--- .../layouts/deriv_login_layout.dart | 20 ++++---- .../layouts/deriv_choose_new_pass_layout.dart | 10 ++-- .../layouts/deriv_reset_pass_layout.dart | 16 +++---- .../deriv_success_pass_change_layout.dart | 6 +-- .../layouts/deriv_setting_layout.dart | 14 +++--- .../deriv_country_selection_layout.dart | 8 ++-- .../deriv_email_not_received_layout.dart | 12 ++--- .../layouts/deriv_set_password_layout.dart | 8 ++-- .../layouts/deriv_signup_layout.dart | 29 +++++------ .../deriv_verification_done_layout.dart | 8 ++-- .../layouts/deriv_verify_email_layout.dart | 8 ++-- .../country_selection_list_widget.dart | 4 +- .../password_policy_checker_widget.dart | 11 +++-- 19 files changed, 118 insertions(+), 114 deletions(-) diff --git a/packages/deriv_auth/lib/core/extensions/context_extension.dart b/packages/deriv_auth/lib/core/extensions/context_extension.dart index d3caeff30..653b70552 100644 --- a/packages/deriv_auth/lib/core/extensions/context_extension.dart +++ b/packages/deriv_auth/lib/core/extensions/context_extension.dart @@ -4,5 +4,6 @@ import 'package:flutter/material.dart'; /// Extension methods for [BuildContext]. extension ContextExtension on BuildContext { /// Gets [DerivAuthUILocalization]. - DerivAuthLocalization get localization => DerivAuthLocalization.of(this); + DerivAuthLocalization get derivAuthLocalization => + DerivAuthLocalization.of(this); } diff --git a/packages/deriv_auth/lib/core/helpers/country_selection_helper.dart b/packages/deriv_auth/lib/core/helpers/country_selection_helper.dart index cf08bdf6a..06664331c 100644 --- a/packages/deriv_auth/lib/core/helpers/country_selection_helper.dart +++ b/packages/deriv_auth/lib/core/helpers/country_selection_helper.dart @@ -32,7 +32,7 @@ String getCountryConsentMessage( } final Map consentMessages = { - 'br': context.localization.labelCountryConsentBrazil, + 'br': context.derivAuthLocalization.labelCountryConsentBrazil, // Add more countries and consent messages here. }; diff --git a/packages/deriv_auth/lib/core/layouts/deriv_unavailable_country_layout.dart b/packages/deriv_auth/lib/core/layouts/deriv_unavailable_country_layout.dart index 70f660892..b00eedf59 100644 --- a/packages/deriv_auth/lib/core/layouts/deriv_unavailable_country_layout.dart +++ b/packages/deriv_auth/lib/core/layouts/deriv_unavailable_country_layout.dart @@ -28,7 +28,7 @@ class DerivUnavailableCountryLayout extends StatelessWidget { Widget build(BuildContext context) => Scaffold( appBar: AppBar( elevation: ThemeProvider.zeroMargin, - title: Text(context.localization.labelNotAvailable), + title: Text(context.derivAuthLocalization.labelNotAvailable), ), body: Container( padding: @@ -50,14 +50,15 @@ class DerivUnavailableCountryLayout extends StatelessWidget { children: [ const SizedBox(height: ThemeProvider.margin16), Text( - context.localization.warnNotAvailableCountriesTitle(appName), + context.derivAuthLocalization + .warnNotAvailableCountriesTitle(appName), style: TextStyles.title, textAlign: TextAlign.center, ), const SizedBox(height: ThemeProvider.margin08), RichText( text: TextSpan( - text: context.localization.warnNotAvailableCountries, + text: context.derivAuthLocalization.warnNotAvailableCountries, style: context.theme.textStyle( textStyle: TextStyles.body1, color: context.theme.colors.general, @@ -65,7 +66,7 @@ class DerivUnavailableCountryLayout extends StatelessWidget { children: [ buildTextSpanHyperlink( context: context, - label: context.localization.labelLiveChat, + label: context.derivAuthLocalization.labelLiveChat, onTap: onLiveChatPressed, style: context.theme.textStyle( textStyle: TextStyles.body1Bold, diff --git a/packages/deriv_auth/lib/core/states/auth_error_state_handler.dart b/packages/deriv_auth/lib/core/states/auth_error_state_handler.dart index 4b82a278c..d07081992 100644 --- a/packages/deriv_auth/lib/core/states/auth_error_state_handler.dart +++ b/packages/deriv_auth/lib/core/states/auth_error_state_handler.dart @@ -20,8 +20,8 @@ base class AuthErrorStateHandler { void invalid2faCode(DerivAuthErrorState state) { showErrorDialog( context: context, - errorMessage: context.localization.informInvalid2FACode, - actionLabel: context.localization.actionTryAgain, + errorMessage: context.derivAuthLocalization.informInvalid2FACode, + actionLabel: context.derivAuthLocalization.actionTryAgain, ); } @@ -29,8 +29,8 @@ base class AuthErrorStateHandler { void onAccountUnavailable(DerivAuthErrorState state) { showErrorDialog( context: context, - errorMessage: context.localization.informDeactivatedAccount, - actionLabel: context.localization.actionTryAgain, + errorMessage: context.derivAuthLocalization.informDeactivatedAccount, + actionLabel: context.derivAuthLocalization.actionTryAgain, ); } @@ -38,8 +38,8 @@ base class AuthErrorStateHandler { void onExpiredAccount(DerivAuthErrorState state) { showErrorDialog( context: context, - errorMessage: context.localization.informExpiredAccount, - actionLabel: context.localization.actionTryAgain, + errorMessage: context.derivAuthLocalization.informExpiredAccount, + actionLabel: context.derivAuthLocalization.actionTryAgain, ); } @@ -47,8 +47,8 @@ base class AuthErrorStateHandler { void onFailedAuthorization(DerivAuthErrorState state) { showErrorDialog( context: context, - errorMessage: context.localization.informFailedAuthorization, - actionLabel: context.localization.actionTryAgain, + errorMessage: context.derivAuthLocalization.informFailedAuthorization, + actionLabel: context.derivAuthLocalization.actionTryAgain, ); } @@ -56,8 +56,8 @@ base class AuthErrorStateHandler { void onInavlidResidence(DerivAuthErrorState state) { showErrorDialog( context: context, - errorMessage: context.localization.informInvalidResidence, - actionLabel: context.localization.actionTryAgain, + errorMessage: context.derivAuthLocalization.informInvalidResidence, + actionLabel: context.derivAuthLocalization.actionTryAgain, ); } @@ -65,8 +65,8 @@ base class AuthErrorStateHandler { void onInvalidCredentials(DerivAuthErrorState state) { showErrorDialog( context: context, - errorMessage: context.localization.informInvalidCredentials, - actionLabel: context.localization.actionTryAgain, + errorMessage: context.derivAuthLocalization.informInvalidCredentials, + actionLabel: context.derivAuthLocalization.actionTryAgain, ); } @@ -74,8 +74,8 @@ base class AuthErrorStateHandler { void onMissingOtp(DerivAuthErrorState state) { showErrorDialog( context: context, - errorMessage: context.localization.informMissingOtp, - actionLabel: context.localization.actionTryAgain, + errorMessage: context.derivAuthLocalization.informMissingOtp, + actionLabel: context.derivAuthLocalization.actionTryAgain, ); } @@ -83,8 +83,8 @@ base class AuthErrorStateHandler { void onSelfClosed(DerivAuthErrorState state) { showErrorDialog( context: context, - errorMessage: context.localization.informSelfClosed, - actionLabel: context.localization.actionTryAgain, + errorMessage: context.derivAuthLocalization.informSelfClosed, + actionLabel: context.derivAuthLocalization.actionTryAgain, ); } @@ -92,8 +92,8 @@ base class AuthErrorStateHandler { void onUnexpectedError(DerivAuthErrorState state) { showErrorDialog( context: context, - errorMessage: context.localization.informUnexpectedError, - actionLabel: context.localization.actionTryAgain, + errorMessage: context.derivAuthLocalization.informUnexpectedError, + actionLabel: context.derivAuthLocalization.actionTryAgain, ); } @@ -101,8 +101,8 @@ base class AuthErrorStateHandler { void onUnsupportedCountry(DerivAuthErrorState state) { showErrorDialog( context: context, - errorMessage: context.localization.informUnsupportedCountry, - actionLabel: context.localization.actionTryAgain, + errorMessage: context.derivAuthLocalization.informUnsupportedCountry, + actionLabel: context.derivAuthLocalization.actionTryAgain, ); } @@ -110,8 +110,8 @@ base class AuthErrorStateHandler { void onConnectionError(DerivAuthErrorState state) { showErrorDialog( context: context, - errorMessage: context.localization.informConnectionError, - actionLabel: context.localization.actionTryAgain, + errorMessage: context.derivAuthLocalization.informConnectionError, + actionLabel: context.derivAuthLocalization.actionTryAgain, ); } @@ -119,8 +119,8 @@ base class AuthErrorStateHandler { void onSwitchAccountError(DerivAuthErrorState state) { showErrorDialog( context: context, - errorMessage: context.localization.informSwitchAccountError, - actionLabel: context.localization.actionTryAgain, + errorMessage: context.derivAuthLocalization.informSwitchAccountError, + actionLabel: context.derivAuthLocalization.actionTryAgain, ); } } diff --git a/packages/deriv_auth/lib/features/get_started/presentation/layouts/deriv_get_started_layout.dart b/packages/deriv_auth/lib/features/get_started/presentation/layouts/deriv_get_started_layout.dart index 4e06af088..4543a1ce9 100644 --- a/packages/deriv_auth/lib/features/get_started/presentation/layouts/deriv_get_started_layout.dart +++ b/packages/deriv_auth/lib/features/get_started/presentation/layouts/deriv_get_started_layout.dart @@ -147,7 +147,7 @@ class _DerivGetStartedLayoutState extends State { onPressed: widget.onSignupTapped, child: Center( child: Text( - context.localization.actionGetAFreeAccount, + context.derivAuthLocalization.actionGetAFreeAccount, style: context.theme.textStyle( textStyle: TextStyles.body2, color: context.theme.colors.prominent, @@ -163,7 +163,7 @@ class _DerivGetStartedLayoutState extends State { onPressed: widget.onLoginTapped, child: Center( child: Text( - context.localization.actionLogin, + context.derivAuthLocalization.actionLogin, style: context.theme.textStyle( textStyle: TextStyles.body2, color: context.theme.colors.prominent, diff --git a/packages/deriv_auth/lib/features/login/presentation/layouts/deriv_2fa_layout.dart b/packages/deriv_auth/lib/features/login/presentation/layouts/deriv_2fa_layout.dart index eda8a4412..045deadb1 100644 --- a/packages/deriv_auth/lib/features/login/presentation/layouts/deriv_2fa_layout.dart +++ b/packages/deriv_auth/lib/features/login/presentation/layouts/deriv_2fa_layout.dart @@ -38,7 +38,7 @@ class _Deriv2FALayoutState extends State { appBar: AppBar( elevation: ThemeProvider.zeroMargin, title: Text( - context.localization.labelLogIn, + context.derivAuthLocalization.labelLogIn, style: TextStyles.title, ), ), @@ -53,13 +53,13 @@ class _Deriv2FALayoutState extends State { children: [ SvgPicture.asset(Assets.twoFactorAuthIcon), Text( - context.localization.labelTwoFactorAuth, + context.derivAuthLocalization.labelTwoFactorAuth, style: context.theme.textStyle(textStyle: TextStyles.title), textAlign: TextAlign.center, ), const SizedBox(height: ThemeProvider.margin08), Text( - context.localization.informEnterTwoFactorAuthCode, + context.derivAuthLocalization.informEnterTwoFactorAuthCode, style: context.theme.textStyle( textStyle: TextStyles.body1, color: context.theme.colors.general, @@ -69,8 +69,8 @@ class _Deriv2FALayoutState extends State { const SizedBox(height: ThemeProvider.margin24), BaseTextField( controller: _otpController, - labelText: - context.localization.labelTwoFactorAuthenticationCode, + labelText: context + .derivAuthLocalization.labelTwoFactorAuthenticationCode, labelColor: context.theme.colors.disabled, focusNode: _otpFocusNode, enabled: !_isLoading(), @@ -100,7 +100,7 @@ class _Deriv2FALayoutState extends State { width: ThemeProvider.iconSize16, ) : Text( - context.localization.actionProceed, + context.derivAuthLocalization.actionProceed, style: TextStyles.body2.copyWith( color: context.theme.colors.prominent, ), diff --git a/packages/deriv_auth/lib/features/login/presentation/layouts/deriv_login_layout.dart b/packages/deriv_auth/lib/features/login/presentation/layouts/deriv_login_layout.dart index da7845066..4376b4e07 100644 --- a/packages/deriv_auth/lib/features/login/presentation/layouts/deriv_login_layout.dart +++ b/packages/deriv_auth/lib/features/login/presentation/layouts/deriv_login_layout.dart @@ -93,7 +93,7 @@ class _DerivLoginLayoutState extends State { appBar: AppBar( elevation: ThemeProvider.zeroMargin, title: Text( - context.localization.labelLogIn, + context.derivAuthLocalization.labelLogIn, style: TextStyles.title, ), backgroundColor: context.theme.colors.secondary, @@ -126,7 +126,7 @@ class _DerivLoginLayoutState extends State { _buildLoginButton(), const SizedBox(height: ThemeProvider.margin24), DerivSocialAuthDivider( - label: context.localization.informLoginOptions, + label: context.derivAuthLocalization.informLoginOptions, isVisible: widget.isSocialAuthEnabled, ), if (widget.isSocialAuthEnabled) @@ -173,7 +173,7 @@ class _DerivLoginLayoutState extends State { semanticLabel: SemanticsLabels.loginEmailFieldSemantic, controller: _emailController, focusNode: _emailFocusNode, - labelText: context.localization.labelEmail, + labelText: context.derivAuthLocalization.labelEmail, borderColor: context.theme.colors.hover, focusedBorderColor: context.theme.colors.blue, keyboardType: TextInputType.emailAddress, @@ -188,7 +188,7 @@ class _DerivLoginLayoutState extends State { semanticLabel: SemanticsLabels.loginPasswordFieldSemantic, controller: _passwordController, focusNode: _passwordFocusNode, - labelText: context.localization.labelPassword, + labelText: context.derivAuthLocalization.labelPassword, obscureText: !_isPasswordVisible, enabled: isEnabled, suffixIcon: IconButton( @@ -214,7 +214,7 @@ class _DerivLoginLayoutState extends State { child: InkWell( onTap: widget.onResetPassTapped, child: Text( - context.localization.actionForgotPassword, + context.derivAuthLocalization.actionForgotPassword, style: context.theme.textStyle( textStyle: TextStyles.body2, color: context.theme.colors.coral, @@ -247,7 +247,7 @@ class _DerivLoginLayoutState extends State { width: ThemeProvider.iconSize16, ) : Text( - context.localization.actionLogin, + context.derivAuthLocalization.actionLogin, style: context.theme.textStyle( textStyle: TextStyles.body2, color: context.theme.colors.prominent.withOpacity( @@ -264,7 +264,7 @@ class _DerivLoginLayoutState extends State { mainAxisSize: MainAxisSize.min, children: [ Text( - context.localization.labelDontHaveAnAccountYet, + context.derivAuthLocalization.labelDontHaveAnAccountYet, style: context.theme.textStyle( textStyle: TextStyles.body1, color: context.theme.colors.general, @@ -275,7 +275,7 @@ class _DerivLoginLayoutState extends State { child: Padding( padding: const EdgeInsets.all(ThemeProvider.margin04), child: Text( - context.localization.actionCreateANewAccount, + context.derivAuthLocalization.actionCreateANewAccount, style: context.theme.textStyle( textStyle: TextStyles.body2, color: context.theme.colors.coral, @@ -312,7 +312,7 @@ class _DerivLoginLayoutState extends State { return null; } - return context.localization.informInvalidEmailFormat; + return context.derivAuthLocalization.informInvalidEmailFormat; } String? _passwordValidator(String? input) { @@ -320,7 +320,7 @@ class _DerivLoginLayoutState extends State { return null; } - return context.localization.warnPasswordLength; + return context.derivAuthLocalization.warnPasswordLength; } Future _onLoginTapped() async { diff --git a/packages/deriv_auth/lib/features/reset_password/presentation/layouts/deriv_choose_new_pass_layout.dart b/packages/deriv_auth/lib/features/reset_password/presentation/layouts/deriv_choose_new_pass_layout.dart index 9b0e84b1b..73f04ed02 100644 --- a/packages/deriv_auth/lib/features/reset_password/presentation/layouts/deriv_choose_new_pass_layout.dart +++ b/packages/deriv_auth/lib/features/reset_password/presentation/layouts/deriv_choose_new_pass_layout.dart @@ -46,7 +46,7 @@ class _DerivChooseNewPassLayoutState extends State { appBar: AppBar( elevation: ThemeProvider.zeroMargin, title: Text( - context.localization.labelResetPassword, + context.derivAuthLocalization.labelResetPassword, style: TextStyles.title, ), ), @@ -103,14 +103,14 @@ class _DerivChooseNewPassLayoutState extends State { ), const SizedBox(height: ThemeProvider.margin48), Text( - context.localization.labelChooseNewPass, + context.derivAuthLocalization.labelChooseNewPass, style: TextStyles.title, ), const SizedBox(height: ThemeProvider.margin24), BaseTextField( controller: _passController, focusNode: _passFocusNode, - labelText: context.localization.labelCreatePass, + labelText: context.derivAuthLocalization.labelCreatePass, obscureText: !_isPasswordVisible, suffixIcon: IconButton( icon: Icon( @@ -155,7 +155,7 @@ class _DerivChooseNewPassLayoutState extends State { width: ThemeProvider.iconSize16, ) : Text( - context.localization.actionResetPass, + context.derivAuthLocalization.actionResetPass, style: context.theme.textStyle( textStyle: TextStyles.body2, color: context.theme.colors.prominent.withOpacity( @@ -186,7 +186,7 @@ class _DerivChooseNewPassLayoutState extends State { return null; } - return context.localization.informInvalidPasswordFormat; + return context.derivAuthLocalization.informInvalidPasswordFormat; } bool isFormValid() => _passwordValidator(_passController.text) == null; diff --git a/packages/deriv_auth/lib/features/reset_password/presentation/layouts/deriv_reset_pass_layout.dart b/packages/deriv_auth/lib/features/reset_password/presentation/layouts/deriv_reset_pass_layout.dart index b6e47a884..2b8f1d5b7 100644 --- a/packages/deriv_auth/lib/features/reset_password/presentation/layouts/deriv_reset_pass_layout.dart +++ b/packages/deriv_auth/lib/features/reset_password/presentation/layouts/deriv_reset_pass_layout.dart @@ -44,7 +44,7 @@ class _DerivResetPassLayoutState extends State { appBar: AppBar( elevation: ThemeProvider.zeroMargin, title: Text( - context.localization.labelResetPassword, + context.derivAuthLocalization.labelResetPassword, style: TextStyles.title, ), ), @@ -84,12 +84,12 @@ class _DerivResetPassLayoutState extends State { ), const SizedBox(height: ThemeProvider.margin24), Text( - context.localization.labelCheckEmail, + context.derivAuthLocalization.labelCheckEmail, style: TextStyles.title, ), const SizedBox(height: ThemeProvider.margin08), Text( - context.localization + context.derivAuthLocalization .informSendResetPasswordEmail(_emailController.text), textAlign: TextAlign.center, style: context.theme.textStyle( @@ -118,14 +118,14 @@ class _DerivResetPassLayoutState extends State { ), const SizedBox(height: ThemeProvider.margin16), Text( - context.localization.labelResetPassword, + context.derivAuthLocalization.labelResetPassword, style: TextStyles.title, textAlign: TextAlign.center, ), const SizedBox(height: ThemeProvider.margin08), Center( child: Text( - context.localization.informResetPassByEmail, + context.derivAuthLocalization.informResetPassByEmail, style: context.theme.textStyle( textStyle: TextStyles.body1, color: context.theme.colors.general, @@ -137,7 +137,7 @@ class _DerivResetPassLayoutState extends State { semanticLabel: SemanticsLabels.resetPasswordEmailFieldSemantic, controller: _emailController, focusNode: _emailFocusNode, - labelText: context.localization.labelEmail, + labelText: context.derivAuthLocalization.labelEmail, keyboardType: TextInputType.emailAddress, borderColor: context.theme.colors.hover, validator: _emailValidator, @@ -173,7 +173,7 @@ class _DerivResetPassLayoutState extends State { width: ThemeProvider.margin16, ) : Text( - context.localization.actionResetPass, + context.derivAuthLocalization.actionResetPass, style: context.theme.textStyle( textStyle: TextStyles.body2, color: context.theme.colors.prominent.withOpacity( @@ -209,7 +209,7 @@ class _DerivResetPassLayoutState extends State { return null; } - return context.localization.informInvalidEmailFormat; + return context.derivAuthLocalization.informInvalidEmailFormat; } String _getEmailValue() => _emailController.text.trim(); diff --git a/packages/deriv_auth/lib/features/reset_password/presentation/layouts/deriv_success_pass_change_layout.dart b/packages/deriv_auth/lib/features/reset_password/presentation/layouts/deriv_success_pass_change_layout.dart index d0b2b4050..6bf684972 100644 --- a/packages/deriv_auth/lib/features/reset_password/presentation/layouts/deriv_success_pass_change_layout.dart +++ b/packages/deriv_auth/lib/features/reset_password/presentation/layouts/deriv_success_pass_change_layout.dart @@ -14,7 +14,7 @@ class DerivSuccessPassChangeLayout extends StatelessWidget { appBar: AppBar( elevation: ThemeProvider.zeroMargin, title: Text( - context.localization.labelResetPassword, + context.derivAuthLocalization.labelResetPassword, style: TextStyles.title, ), ), @@ -37,14 +37,14 @@ class DerivSuccessPassChangeLayout extends StatelessWidget { height: ThemeProvider.margin16, ), Text( - context.localization.informYourPassHasBeenReset, + context.derivAuthLocalization.informYourPassHasBeenReset, style: TextStyles.title, ), const SizedBox( height: ThemeProvider.margin08, ), Text( - context.localization.informRedirectLogin, + context.derivAuthLocalization.informRedirectLogin, textAlign: TextAlign.center, style: context.theme.textStyle( textStyle: TextStyles.body1, diff --git a/packages/deriv_auth/lib/features/setting_page/presentation/layouts/deriv_setting_layout.dart b/packages/deriv_auth/lib/features/setting_page/presentation/layouts/deriv_setting_layout.dart index 50c3d9276..9d00ee918 100644 --- a/packages/deriv_auth/lib/features/setting_page/presentation/layouts/deriv_setting_layout.dart +++ b/packages/deriv_auth/lib/features/setting_page/presentation/layouts/deriv_setting_layout.dart @@ -153,7 +153,7 @@ class _SettingsPageState extends State { top: ThemeProvider.margin24, ), child: Text( - context.localization.labelDeveloper, + context.derivAuthLocalization.labelDeveloper, style: context.theme.textStyle( textStyle: TextStyles.body1Bold, color: context.theme.colors.coral, @@ -162,21 +162,21 @@ class _SettingsPageState extends State { ); Widget get _endpoint => _buildTextInputField( - label: context.localization.labelEndpoint, - semantic: context.localization.semanticEndpoint, + label: context.derivAuthLocalization.labelEndpoint, + semantic: context.derivAuthLocalization.semanticEndpoint, controller: _endpointController, validator: (String? value) => hasOnlySmallLettersAndNumberInput(value!) ? null - : context.localization.warnInvalidEndpoint, + : context.derivAuthLocalization.warnInvalidEndpoint, ); Widget get _appId => _buildTextInputField( - label: context.localization.labelApplicationID, - semantic: context.localization.semanticApplicationID, + label: context.derivAuthLocalization.labelApplicationID, + semantic: context.derivAuthLocalization.semanticApplicationID, controller: _appIdController, validator: (String? value) => hasOnlyNumberInput(value!) ? null - : context.localization.warnInvalidApplicationID, + : context.derivAuthLocalization.warnInvalidApplicationID, ); Widget _buildTextInputField({ diff --git a/packages/deriv_auth/lib/features/signup/presentation/layouts/deriv_country_selection_layout.dart b/packages/deriv_auth/lib/features/signup/presentation/layouts/deriv_country_selection_layout.dart index b1c5c9d81..60c564e59 100644 --- a/packages/deriv_auth/lib/features/signup/presentation/layouts/deriv_country_selection_layout.dart +++ b/packages/deriv_auth/lib/features/signup/presentation/layouts/deriv_country_selection_layout.dart @@ -100,7 +100,7 @@ class _DerivCountrySelectionLayoutState SvgPicture.asset(Assets.locationIcon, package: 'deriv_auth'), const SizedBox(height: ThemeProvider.margin16), Text( - context.localization.labelSelectCountry, + context.derivAuthLocalization.labelSelectCountry, style: TextStyles.title, ), const SizedBox(height: ThemeProvider.margin24), @@ -127,7 +127,7 @@ class _DerivCountrySelectionLayoutState key: _formKey, child: BaseTextField( controller: _textController, - labelText: context.localization.labelChooseCountry, + labelText: context.derivAuthLocalization.labelChooseCountry, labelColor: context.theme.colors.disabled, focusNode: _focusNode, focusedLabelColor: context.theme.colors.blue, @@ -157,7 +157,7 @@ class _DerivCountrySelectionLayoutState onPressed: widget.onNextPressed, child: Center( child: Text( - context.localization.actionNext, + context.derivAuthLocalization.actionNext, style: TextStyles.button .copyWith(color: context.theme.colors.prominent), ), @@ -225,7 +225,7 @@ class _DerivCountrySelectionLayoutState DerivResidenceModel? selectedCountry, }) { if (selectedCountry != null && selectedCountry.isDisabled) { - return context.localization.warnCountryNotAvailable; + return context.derivAuthLocalization.warnCountryNotAvailable; } return null; diff --git a/packages/deriv_auth/lib/features/signup/presentation/layouts/deriv_email_not_received_layout.dart b/packages/deriv_auth/lib/features/signup/presentation/layouts/deriv_email_not_received_layout.dart index 2da5b9eff..115beb538 100644 --- a/packages/deriv_auth/lib/features/signup/presentation/layouts/deriv_email_not_received_layout.dart +++ b/packages/deriv_auth/lib/features/signup/presentation/layouts/deriv_email_not_received_layout.dart @@ -42,7 +42,7 @@ class DerivEmailNotReceivedLayout extends StatelessWidget { child: Column( children: [ Text( - context.localization.labelEmailIssueHeader, + context.derivAuthLocalization.labelEmailIssueHeader, style: context.theme.textStyle( textStyle: TextStyles.body2, color: context.theme.colors.general, @@ -55,7 +55,7 @@ class DerivEmailNotReceivedLayout extends StatelessWidget { const SizedBox(width: ThemeProvider.margin24), Flexible( child: Text( - context.localization.labelEmailIssueSpam, + context.derivAuthLocalization.labelEmailIssueSpam, style: context.theme.textStyle( textStyle: TextStyles.body1, color: context.theme.colors.general, @@ -71,7 +71,7 @@ class DerivEmailNotReceivedLayout extends StatelessWidget { const SizedBox(width: ThemeProvider.margin24), Flexible( child: Text( - context.localization.labelEmailIssueWrongEmail, + context.derivAuthLocalization.labelEmailIssueWrongEmail, style: context.theme.textStyle( textStyle: TextStyles.body1, color: context.theme.colors.general, @@ -87,7 +87,7 @@ class DerivEmailNotReceivedLayout extends StatelessWidget { const SizedBox(width: ThemeProvider.margin24), Flexible( child: Text( - context.localization.labelEmailIssueTypo, + context.derivAuthLocalization.labelEmailIssueTypo, style: context.theme.textStyle( textStyle: TextStyles.body1, color: context.theme.colors.general, @@ -103,7 +103,7 @@ class DerivEmailNotReceivedLayout extends StatelessWidget { const SizedBox(width: ThemeProvider.margin24), Flexible( child: Text( - context.localization.labelEmailIssueFirewall, + context.derivAuthLocalization.labelEmailIssueFirewall, style: context.theme.textStyle( textStyle: TextStyles.body1, color: context.theme.colors.general, @@ -127,7 +127,7 @@ class DerivEmailNotReceivedLayout extends StatelessWidget { onPressed: onReEnterEmailPressed, child: Center( child: Text( - context.localization.actionReenterEmail, + context.derivAuthLocalization.actionReenterEmail, style: context.theme.textStyle( textStyle: TextStyles.button .copyWith(color: context.theme.colors.prominent), diff --git a/packages/deriv_auth/lib/features/signup/presentation/layouts/deriv_set_password_layout.dart b/packages/deriv_auth/lib/features/signup/presentation/layouts/deriv_set_password_layout.dart index 301e0944b..b08f83c61 100644 --- a/packages/deriv_auth/lib/features/signup/presentation/layouts/deriv_set_password_layout.dart +++ b/packages/deriv_auth/lib/features/signup/presentation/layouts/deriv_set_password_layout.dart @@ -99,7 +99,7 @@ class _DerivSetPasswordLayoutState extends State { SvgPicture.asset(Assets.passwordIcon, package: 'deriv_auth'), const SizedBox(height: ThemeProvider.margin16), Text( - context.localization.labelKeepPassword, + context.derivAuthLocalization.labelKeepPassword, style: TextStyles.title, textAlign: TextAlign.center, ), @@ -142,7 +142,7 @@ class _DerivSetPasswordLayoutState extends State { focusNode: _passwordFocusNode, controller: _passwordTextController, obscureText: !_isPasswordVisible, - labelText: context.localization.labelCreatePassword, + labelText: context.derivAuthLocalization.labelCreatePassword, labelColor: context.theme.colors.disabled, focusedLabelColor: context.theme.colors.blue, suffixIcon: IconButton( @@ -168,7 +168,7 @@ class _DerivSetPasswordLayoutState extends State { strokeWidth: 3, ) : Text( - context.localization.actionStartTrading, + context.derivAuthLocalization.actionStartTrading, style: TextStyles.button .copyWith(color: context.theme.colors.prominent), ), @@ -183,7 +183,7 @@ class _DerivSetPasswordLayoutState extends State { onPressed: widget.onPreviousPressed, child: Center( child: Text( - context.localization.actionPrevious, + context.derivAuthLocalization.actionPrevious, style: context.theme.textStyle( textStyle: TextStyles.button, ), diff --git a/packages/deriv_auth/lib/features/signup/presentation/layouts/deriv_signup_layout.dart b/packages/deriv_auth/lib/features/signup/presentation/layouts/deriv_signup_layout.dart index 7c3bcfe08..20910ea93 100644 --- a/packages/deriv_auth/lib/features/signup/presentation/layouts/deriv_signup_layout.dart +++ b/packages/deriv_auth/lib/features/signup/presentation/layouts/deriv_signup_layout.dart @@ -87,8 +87,8 @@ class _DerivSignupLayoutState extends State { backgroundColor: context.theme.colors.primary, appBar: AppBar( elevation: ThemeProvider.zeroMargin, - title: - Text(context.localization.labelSignUp, style: TextStyles.title), + title: Text(context.derivAuthLocalization.labelSignUp, + style: TextStyles.title), backgroundColor: context.theme.colors.secondary, ), body: DerivAuthStateListener( @@ -116,7 +116,7 @@ class _DerivSignupLayoutState extends State { _buildSignUpButton(), const SizedBox(height: ThemeProvider.margin24), DerivSocialAuthDivider( - label: context.localization.labelOrSignUpWith, + label: context.derivAuthLocalization.labelOrSignUpWith, isVisible: widget.isSocialAuthEnabled, ), if (widget.isSocialAuthEnabled) @@ -155,16 +155,17 @@ class _DerivSignupLayoutState extends State { Row( children: [ InfoIconButton( - dialogTitle: context.localization.labelReferralInfoTitle, + dialogTitle: + context.derivAuthLocalization.labelReferralInfoTitle, dialogDescription: - context.localization.infoReferralInfoDescription, - positiveActionLabel: context.localization.actionOk, + context.derivAuthLocalization.infoReferralInfoDescription, + positiveActionLabel: context.derivAuthLocalization.actionOk, iconSize: ThemeProvider.iconSize24, ), const SizedBox(width: ThemeProvider.margin08), Expanded( child: Text( - context.localization.labelGotReferralCode, + context.derivAuthLocalization.labelGotReferralCode, style: context.theme.textStyle( textStyle: TextStyles.body1, color: context.theme.colors.prominent, @@ -219,7 +220,7 @@ class _DerivSignupLayoutState extends State { } }, focusNode: referralFocusNode, - labelText: context.localization.labelReferralCode, + labelText: context.derivAuthLocalization.labelReferralCode, borderColor: context.theme.colors.hover, focusedBorderColor: context.theme.colors.blue, textInputAction: TextInputAction.done, @@ -252,7 +253,7 @@ class _DerivSignupLayoutState extends State { mainAxisSize: MainAxisSize.min, children: [ Text( - context.localization.labelHaveAccount, + context.derivAuthLocalization.labelHaveAccount, style: context.theme.textStyle( textStyle: TextStyles.body1, color: context.theme.colors.general, @@ -263,7 +264,7 @@ class _DerivSignupLayoutState extends State { child: Padding( padding: const EdgeInsets.all(ThemeProvider.margin04), child: Text( - context.localization.actionLogin, + context.derivAuthLocalization.actionLogin, style: context.theme.textStyle( textStyle: TextStyles.body2, color: context.theme.colors.coral, @@ -279,7 +280,7 @@ class _DerivSignupLayoutState extends State { semanticLabel: SemanticsLabels.signupEmailFieldSemantic, controller: emailController, focusNode: emailFocusNode, - labelText: context.localization.labelEmail, + labelText: context.derivAuthLocalization.labelEmail, borderColor: context.theme.colors.hover, focusedBorderColor: context.theme.colors.blue, keyboardType: TextInputType.emailAddress, @@ -307,7 +308,7 @@ class _DerivSignupLayoutState extends State { width: ThemeProvider.iconSize16, ) : Text( - context.localization.actionCreateAccount, + context.derivAuthLocalization.actionCreateAccount, style: context.theme.textStyle( textStyle: TextStyles.body2, color: context.theme.colors.prominent, @@ -337,7 +338,7 @@ class _DerivSignupLayoutState extends State { return null; } - return context.localization.informInvalidEmailFormat; + return context.derivAuthLocalization.informInvalidEmailFormat; } String? _referralValidator(String? input) { @@ -345,7 +346,7 @@ class _DerivSignupLayoutState extends State { return null; } - return context.localization.informInvalidReferralCode; + return context.derivAuthLocalization.informInvalidReferralCode; } Future _onSignupTapped() async { diff --git a/packages/deriv_auth/lib/features/signup/presentation/layouts/deriv_verification_done_layout.dart b/packages/deriv_auth/lib/features/signup/presentation/layouts/deriv_verification_done_layout.dart index 672539fe8..1e30b4649 100644 --- a/packages/deriv_auth/lib/features/signup/presentation/layouts/deriv_verification_done_layout.dart +++ b/packages/deriv_auth/lib/features/signup/presentation/layouts/deriv_verification_done_layout.dart @@ -29,7 +29,7 @@ class DerivVerificationDoneLayout extends StatelessWidget { backgroundColor: context.theme.colors.primary, appBar: AppBar( elevation: ThemeProvider.zeroMargin, - title: Text(context.localization.labelVerifyYourEmail), + title: Text(context.derivAuthLocalization.labelVerifyYourEmail), ), body: SafeArea( child: Column( @@ -56,12 +56,12 @@ class DerivVerificationDoneLayout extends StatelessWidget { ), const SizedBox(height: ThemeProvider.margin16), Text( - context.localization.labelThanksEmail, + context.derivAuthLocalization.labelThanksEmail, style: TextStyles.title, ), const SizedBox(height: ThemeProvider.margin08), Text( - context.localization.informLetsContinue, + context.derivAuthLocalization.informLetsContinue, style: context.theme.textStyle( textStyle: TextStyles.body1, color: context.theme.colors.general, @@ -80,7 +80,7 @@ class DerivVerificationDoneLayout extends StatelessWidget { onPressed: onContinuePressed, child: Center( child: Text( - context.localization.actionContinue, + context.derivAuthLocalization.actionContinue, style: context.theme.textStyle( textStyle: TextStyles.button .copyWith(color: context.theme.colors.prominent), diff --git a/packages/deriv_auth/lib/features/signup/presentation/layouts/deriv_verify_email_layout.dart b/packages/deriv_auth/lib/features/signup/presentation/layouts/deriv_verify_email_layout.dart index facf31332..eb2996d7d 100644 --- a/packages/deriv_auth/lib/features/signup/presentation/layouts/deriv_verify_email_layout.dart +++ b/packages/deriv_auth/lib/features/signup/presentation/layouts/deriv_verify_email_layout.dart @@ -26,7 +26,7 @@ class DerivVerifyEmailLayout extends StatelessWidget { appBar: AppBar( elevation: ThemeProvider.zeroMargin, title: Text( - context.localization.labelVerifyYourEmail, + context.derivAuthLocalization.labelVerifyYourEmail, style: TextStyles.title, ), backgroundColor: context.theme.colors.secondary, @@ -56,12 +56,12 @@ class DerivVerifyEmailLayout extends StatelessWidget { ), const SizedBox(height: ThemeProvider.margin16), Text( - context.localization.labelCheckEmail, + context.derivAuthLocalization.labelCheckEmail, style: TextStyles.title, ), const SizedBox(height: ThemeProvider.margin08), Text( - context.localization.informVerificationEmailSent(email!), + context.derivAuthLocalization.informVerificationEmailSent(email!), style: context.theme.textStyle( textStyle: TextStyles.body1, color: context.theme.colors.general, @@ -81,7 +81,7 @@ class DerivVerifyEmailLayout extends StatelessWidget { onPressed: onEmailNotReceivedPressed, child: Center( child: Text( - context.localization.actionEmailNotReceived, + context.derivAuthLocalization.actionEmailNotReceived, style: context.theme.textStyle( textStyle: TextStyles.button, ), diff --git a/packages/deriv_auth/lib/features/signup/presentation/widgets/country_selection_list_widget.dart b/packages/deriv_auth/lib/features/signup/presentation/widgets/country_selection_list_widget.dart index 11e0c5f75..5b72f3fc0 100644 --- a/packages/deriv_auth/lib/features/signup/presentation/widgets/country_selection_list_widget.dart +++ b/packages/deriv_auth/lib/features/signup/presentation/widgets/country_selection_list_widget.dart @@ -102,7 +102,7 @@ class _CountrySelectionListWidgetState children: [ const SizedBox(width: ThemeProvider.margin48), Text( - context.localization.labelChooseCountry, + context.derivAuthLocalization.labelChooseCountry, style: TextStyles.subheading, ), ], @@ -128,7 +128,7 @@ class _CountrySelectionListWidgetState onPressed: () => _searchController.clear(), ), contentPadding: const EdgeInsets.only(top: ThemeProvider.margin08), - hintText: context.localization.labelSearchCountry, + hintText: context.derivAuthLocalization.labelSearchCountry, hintStyle: context.theme.textStyle( textStyle: TextStyles.subheading, color: context.theme.colors.active, diff --git a/packages/deriv_auth/lib/features/signup/presentation/widgets/password_policy_checker_widget.dart b/packages/deriv_auth/lib/features/signup/presentation/widgets/password_policy_checker_widget.dart index dddddde12..2bb6c1b5b 100644 --- a/packages/deriv_auth/lib/features/signup/presentation/widgets/password_policy_checker_widget.dart +++ b/packages/deriv_auth/lib/features/signup/presentation/widgets/password_policy_checker_widget.dart @@ -40,19 +40,20 @@ class PasswordPolicyCheckerWidget extends StatelessWidget { BuildContext context) => [ DerivPasswordPolicyModel( - description: context.localization.informPasswordPolicyLength, + description: context.derivAuthLocalization.informPasswordPolicyLength, regex: validPasswordLengthRegex, ), DerivPasswordPolicyModel( - description: context.localization.informPasswordPolicyLowerAndUpper, + description: + context.derivAuthLocalization.informPasswordPolicyLowerAndUpper, regex: validPasswordWithUppercaseRegex, ), DerivPasswordPolicyModel( - description: context.localization.informPasswordPolicyNumber, + description: context.derivAuthLocalization.informPasswordPolicyNumber, regex: validPasswordWithNumberRegex, ), DerivPasswordPolicyModel( - description: context.localization.warnPasswordContainsSymbol, + description: context.derivAuthLocalization.warnPasswordContainsSymbol, regex: validPasswordWithSymbols, isOptional: true, ), @@ -66,7 +67,7 @@ class PasswordPolicyCheckerWidget extends StatelessWidget { mainAxisSize: MainAxisSize.min, children: [ Text( - context.localization.informPasswordPolicy, + context.derivAuthLocalization.informPasswordPolicy, style: context.theme.textStyle( textStyle: TextStyles.body1, color: context.theme.colors.general, From 24a6bf70071be3644b5c5f0d2a406c3bd14d203b Mon Sep 17 00:00:00 2001 From: mobile-apps-deriv <134251399+mobile-apps-deriv@users.noreply.github.com> Date: Tue, 23 Jan 2024 18:53:50 +0800 Subject: [PATCH 10/13] chore(release): publish packages (#413) - deriv_auth@2.0.4 Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> --- CHANGELOG.md | 22 ++++++++++++++++++++++ packages/deriv_auth/CHANGELOG.md | 5 +++++ packages/deriv_auth/pubspec.yaml | 2 +- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7bd2764e..04ca2dc37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,28 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## 2024-01-23 + +### Changes + +--- + +Packages with breaking changes: + + - There are no breaking changes in this release. + +Packages with other changes: + + - [`deriv_auth` - `v2.0.4`](#deriv_auth---v204) + +--- + +#### `deriv_auth` - `v2.0.4` + + - **REFACTOR**(deriv_auth): renamed localization getter in ContextExtension ([#414](https://github.com/regentmarkets/flutter-deriv-packages/issues/414)). ([b625fbce](https://github.com/regentmarkets/flutter-deriv-packages/commit/b625fbce37e7acfd9454ba16b908207aee3c9a86)) + - **REFACTOR**(deriv_auth): Update package info plus deriv auth ([#410](https://github.com/regentmarkets/flutter-deriv-packages/issues/410)). ([e2e717f3](https://github.com/regentmarkets/flutter-deriv-packages/commit/e2e717f36e93039cadc706cc29b12b48a7c1b411)) + + ## 2024-01-23 ### Changes diff --git a/packages/deriv_auth/CHANGELOG.md b/packages/deriv_auth/CHANGELOG.md index 98dfaa731..08d42d620 100644 --- a/packages/deriv_auth/CHANGELOG.md +++ b/packages/deriv_auth/CHANGELOG.md @@ -1,3 +1,8 @@ +## 2.0.4 + + - **REFACTOR**(deriv_auth): renamed localization getter in ContextExtension ([#414](https://github.com/regentmarkets/flutter-deriv-packages/issues/414)). ([b625fbce](https://github.com/regentmarkets/flutter-deriv-packages/commit/b625fbce37e7acfd9454ba16b908207aee3c9a86)) + - **REFACTOR**(deriv_auth): Update package info plus deriv auth ([#410](https://github.com/regentmarkets/flutter-deriv-packages/issues/410)). ([e2e717f3](https://github.com/regentmarkets/flutter-deriv-packages/commit/e2e717f36e93039cadc706cc29b12b48a7c1b411)) + ## 2.0.3 - Update a dependency to the latest release. diff --git a/packages/deriv_auth/pubspec.yaml b/packages/deriv_auth/pubspec.yaml index 4ab2f4f08..447232db3 100644 --- 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: 2.0.3 +version: 2.0.4 environment: sdk: ">=3.0.0 <4.0.0" From 3f3f1c0ec2b77be4789014ca8c29b7e051a4f5cd Mon Sep 17 00:00:00 2001 From: sahani-deriv <125638269+sahani-deriv@users.noreply.github.com> Date: Tue, 23 Jan 2024 19:04:29 +0800 Subject: [PATCH 11/13] chore(version): version bump (#416) --- README.md | 2 +- packages/deriv_auth/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f52e566ba..fa9d486e3 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ deriv_ui: | Name | Description | Version | | ------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------- | | [analytics](./packages/analytics) | Used to collect and send analytical information to 'Firebase' and 'Segment'. | [v1.0.2](./packages/analytics/CHANGELOG.md) | -| [deriv_auth](./packages/deriv_auth) | A Dart package that provides Authentication logic for Deriv applications. | [v2.0.3 ](./packages/deriv_auth/CHANGELOG.md) | +| [deriv_auth](./packages/deriv_auth) | A Dart package that provides Authentication logic for Deriv applications. | [v2.0.5 ](./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/pubspec.yaml b/packages/deriv_auth/pubspec.yaml index 447232db3..8294e2922 100644 --- 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: 2.0.4 +version: 2.0.5 environment: sdk: ">=3.0.0 <4.0.0" From cc2d2ebbbecf53de56aa7c067aec4ad505fcc6b5 Mon Sep 17 00:00:00 2001 From: sahani-deriv <125638269+sahani-deriv@users.noreply.github.com> Date: Fri, 26 Jan 2024 12:30:26 +0800 Subject: [PATCH 12/13] refactor(deriv_auth): improve reset password error handling (#417) --- .../lib/features/reset_password/cubit/reset_password_cubit.dart | 2 ++ .../lib/features/reset_password/cubit/reset_password_state.dart | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/deriv_auth/lib/features/reset_password/cubit/reset_password_cubit.dart b/packages/deriv_auth/lib/features/reset_password/cubit/reset_password_cubit.dart index cba8ff6c9..d11c07999 100644 --- a/packages/deriv_auth/lib/features/reset_password/cubit/reset_password_cubit.dart +++ b/packages/deriv_auth/lib/features/reset_password/cubit/reset_password_cubit.dart @@ -55,6 +55,8 @@ class DerivResetPassCubit extends Cubit /// Check if password is reset if (isPasswordReset) { emit(const DerivResetPassPasswordChangedState()); + } else { + emit(const DerivResetPassErrorState()); } } on Exception catch (e) { emit(DerivResetPassErrorState(errorMessage: e.toString())); diff --git a/packages/deriv_auth/lib/features/reset_password/cubit/reset_password_state.dart b/packages/deriv_auth/lib/features/reset_password/cubit/reset_password_state.dart index 7cb15b260..7515c6bf4 100644 --- a/packages/deriv_auth/lib/features/reset_password/cubit/reset_password_state.dart +++ b/packages/deriv_auth/lib/features/reset_password/cubit/reset_password_state.dart @@ -28,7 +28,7 @@ class DerivResetPassPasswordChangedState extends DerivResetPassState { class DerivResetPassErrorState extends DerivResetPassState { /// Initializes Reset pass error State. const DerivResetPassErrorState({ - required this.errorMessage, + this.errorMessage, }); /// Error message. From 1f6eb85b8de249bdc866c3f158e02601abb03391 Mon Sep 17 00:00:00 2001 From: mobile-apps-deriv <134251399+mobile-apps-deriv@users.noreply.github.com> Date: Fri, 26 Jan 2024 13:41:42 +0800 Subject: [PATCH 13/13] chore(version): bump version and update changelog (#419) * chore(release): publish packages - deriv_auth@2.0.6 * [create-pull-request] automated change --------- Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: ahrar-deriv --- CHANGELOG.md | 21 +++++++++++++++++++++ README.md | 4 ++-- packages/deriv_auth/CHANGELOG.md | 4 ++++ packages/deriv_auth/pubspec.yaml | 2 +- 4 files changed, 28 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 04ca2dc37..970f0bbaf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,27 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## 2024-01-26 + +### Changes + +--- + +Packages with breaking changes: + + - There are no breaking changes in this release. + +Packages with other changes: + + - [`deriv_auth` - `v2.0.6`](#deriv_auth---v206) + +--- + +#### `deriv_auth` - `v2.0.6` + + - **REFACTOR**(deriv_auth): improve reset password error handling ([#417](https://github.com/regentmarkets/flutter-deriv-packages/issues/417)). ([cc2d2ebb](https://github.com/regentmarkets/flutter-deriv-packages/commit/cc2d2ebbbecf53de56aa7c067aec4ad505fcc6b5)) + + ## 2024-01-23 ### Changes diff --git a/README.md b/README.md index fa9d486e3..c8e81c043 100644 --- 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-v2.0.3)`. 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-v2.0.6)`. To use the package, add the following to your pubspec.yaml file: ```yaml deriv_ui: @@ -19,7 +19,7 @@ deriv_ui: | Name | Description | Version | | ------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------- | | [analytics](./packages/analytics) | Used to collect and send analytical information to 'Firebase' and 'Segment'. | [v1.0.2](./packages/analytics/CHANGELOG.md) | -| [deriv_auth](./packages/deriv_auth) | A Dart package that provides Authentication logic for Deriv applications. | [v2.0.5 ](./packages/deriv_auth/CHANGELOG.md) | +| [deriv_auth](./packages/deriv_auth) | A Dart package that provides Authentication logic for Deriv applications. | [v2.0.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/deriv_auth/CHANGELOG.md b/packages/deriv_auth/CHANGELOG.md index 08d42d620..e1ef518b7 100644 --- a/packages/deriv_auth/CHANGELOG.md +++ b/packages/deriv_auth/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.6 + + - **REFACTOR**(deriv_auth): improve reset password error handling ([#417](https://github.com/regentmarkets/flutter-deriv-packages/issues/417)). ([cc2d2ebb](https://github.com/regentmarkets/flutter-deriv-packages/commit/cc2d2ebbbecf53de56aa7c067aec4ad505fcc6b5)) + ## 2.0.4 - **REFACTOR**(deriv_auth): renamed localization getter in ContextExtension ([#414](https://github.com/regentmarkets/flutter-deriv-packages/issues/414)). ([b625fbce](https://github.com/regentmarkets/flutter-deriv-packages/commit/b625fbce37e7acfd9454ba16b908207aee3c9a86)) diff --git a/packages/deriv_auth/pubspec.yaml b/packages/deriv_auth/pubspec.yaml index 8294e2922..30b00c9aa 100644 --- 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: 2.0.5 +version: 2.0.6 environment: sdk: ">=3.0.0 <4.0.0"