Merge branch 'regentmarkets:dev' into glitch_on_livechat_icon_DERG_750

README.md

@@ -32,19 +32,3 @@ This repository contains private packages & plugins that are used by the company
 | [form_builder](./packages/form_builder)                                   | A simpler and cleaner way to create, validate and submit forms.                                                        |
 | [update_checker](./packages/update_checker)                               | Check and retrieve update information from the server for the given package.                                           |
 
-# Add New Package in CI Configuration(config.yml)
-
-This repository contains packages with CI configuration to run basic flutter commands, if we add new package under flutter-deriv-packages/packages we have to add package in .circleci/config.yml file.
-
-Steps to add new package in config.yml
-
-1. Open root of the package flutter-deriv-packages
-2. Go to circleci/config.yml
-3. Go to Steps and add
-
-- run:
-  working_directory: ~/flutter-deriv-packages/packages/[new_package_name]
-  command: flutter pub get && flutter analyze && flutter test
-  name: [new_package_name] analysis
-
-4. Edit Commands as per new package requirements.

packages/deriv_auth/lib/features/auth/cubit/deriv_auth_state.dart

@@ -18,8 +18,13 @@ class DerivAuthLoggedInState extends DerivAuthState {
   final DerivAuthModel authModel;
 
   /// Indicates if the user is migrated to wallets or not.
+  ///
+  /// The user is considered  migrated if at least one of their accounts
+  /// is [AccountCategoryEnum.wallet]
   bool get isMigratedToWallets =>
-      authModel.authorizeEntity.linkedTo?.isNotEmpty ?? false;
+      authModel.authorizeEntity.accountList?.any((AccountListItem account) =>
+          account.accountCategory == AccountCategoryEnum.wallet) ??
+      false;
 }
 
 /// Logged out state.

packages/deriv_auth_ui/example/pubspec.yaml

@@ -18,7 +18,7 @@ dependencies:
     git:
       url: [email protected]:regentmarkets/flutter-deriv-packages.git
       path: packages/deriv_auth
-      ref: dev
+      ref: d5bef178341a318f911b42b8105d8c3d50c6b63e
   deriv_theme:
     path: ../../deriv_theme
     # git:

packages/deriv_auth_ui/pubspec.yaml

@@ -18,7 +18,7 @@ dependencies:
     git:
       url: [email protected]:regentmarkets/flutter-deriv-packages.git
       path: packages/deriv_auth
-      ref: dev
+      ref: d5bef178341a318f911b42b8105d8c3d50c6b63e
   deriv_theme:
     path: ../deriv_theme
     # git:

packages/deriv_theme/lib/src/dimens.dart

@@ -34,6 +34,9 @@ class Dimens {
   /// 18 pixels margin
   static const double margin18 = 18;
 
+  /// 20 pixels margin.
+  static const double margin20 = 20;
+
   /// 24 pixels margin
   static const double margin24 = 24;
 

packages/deriv_theme/lib/theme_provider.dart

@@ -40,6 +40,8 @@ class ThemeProvider {
 
   static const double margin18 = Dimens.margin18;
 
+  static const double margin20 = Dimens.margin20;
+
   static const double margin24 = Dimens.margin24;
 
   static const double margin32 = Dimens.margin32;