diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 42c78a276..000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,113 +0,0 @@ -version: 2.1 -jobs: - Flutter-Workflow: - docker: - - image: cirrusci/flutter:2.10.5 - working_directory: ~/flutter-deriv-packages - - steps: - - checkout - - run: - name: Update submodules - command: | - git submodule init - git submodule update --remote - - run: - name: Run Flutter doctor - command: flutter doctor - - # - run: - # working_directory: ~/flutter-deriv-packages/packages/analytics - # command: flutter pub get && flutter analyze && flutter test - # name: analytics analysis - # issue : access issue and depend on ruuderstack - - # - run: - # working_directory: ~/flutter-deriv-packages/packages/deriv_api_key_provider - # command: flutter pub get && flutter analyze && flutter test - # name: deriv_api_key_provider analysis - # issue : testfailing test production api token getter. - - - run: - working_directory: ~/flutter-deriv-packages/packages/deriv_lint - command: flutter pub get && flutter analyze - name: deriv_lint analysis - - # - run: - # working_directory: ~/flutter-deriv-packages/packages/deriv_banner - # command: flutter pub get && flutter analyze && flutter test - # name: deriv_banner analysis - # issue : access issue - - - run: - working_directory: ~/flutter-deriv-packages/packages/deriv_bloc_manager - command: flutter pub get && flutter analyze && flutter test - name: deriv_bloc_manager analysis - # test not found - - # - run: - # working_directory: ~/flutter-deriv-packages/packages/deriv_live_chat - # command: flutter pub get && flutter analyze && flutter test - # name: deriv_live_chat analysis - # issue : access issues - - # - run: - # working_directory: ~/flutter-deriv-packages/packages/deriv_rudderstack - # command: flutter pub get && flutter analyze && flutter test - # name: deriv_rudderstack test - # issue : This app is using a deprecated version of the Android embedding. - - # - run: - # working_directory: ~/flutter-deriv-packages/packages/deriv_survicate - # command: flutter pub get && flutter analyze && flutter test - # name: deriv_survicate analysis - # issue : This app is using a deprecated version of the Android embedding. - - - run: - working_directory: ~/flutter-deriv-packages/packages/deriv_signup_login - command: flutter pub get && flutter analyze - name: deriv_signup_login analysis - - # - run: - # working_directory: ~/flutter-deriv-packages/packages/deriv_store_launcher - # command: flutter pub get && flutter analyze && flutter test - # name: deriv_store_launcher test - # issue : Please make sure you have the correct access rights and the repository exists - - - run: - working_directory: ~/flutter-deriv-packages/packages/deriv_technical_analysis - command: flutter pub get && flutter analyze && flutter test - name: deriv_technical_analysis analysis - - - run: - working_directory: ~/flutter-deriv-packages/packages/deriv_theme - command: flutter pub get && flutter analyze && flutter test - name: deriv_theme analysis - - # - run: - # working_directory: ~/flutter-deriv-packages/packages/survey_monkey - # command: flutter pub get && flutter analyze && flutter test - # name: survey_monkey test - # issue : This app is using a deprecated version of the Android embedding. - - # - run: - # working_directory: ~/flutter-deriv-packages/packages/update_checker - # command: flutter pub get && flutter analyze && flutter test - # name: update_checker test - # issue : This app is using a deprecated version of the Android embedding. - - - run: - working_directory: ~/flutter-deriv-packages/packages/form_builder - command: flutter pub get && flutter analyze && flutter test - name: form_builder analysis - - - run: - working_directory: ~/flutter-deriv-packages/packages/deriv_auth - command: flutter pub get && flutter analyze && flutter test - name: deriv_auth analysis - -workflows: - version: 2 - build-workflow: - jobs: - - Flutter-Workflow diff --git a/README.md b/README.md index bad5c1205..5b70334a5 100644 --- a/README.md +++ b/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. diff --git a/packages/deriv_auth/lib/features/auth/cubit/deriv_auth_state.dart b/packages/deriv_auth/lib/features/auth/cubit/deriv_auth_state.dart index 952829ed7..e178f5744 100644 --- a/packages/deriv_auth/lib/features/auth/cubit/deriv_auth_state.dart +++ b/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. diff --git a/packages/deriv_auth_ui/example/pubspec.yaml b/packages/deriv_auth_ui/example/pubspec.yaml index 4c200936c..d72faeb0d 100644 --- a/packages/deriv_auth_ui/example/pubspec.yaml +++ b/packages/deriv_auth_ui/example/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: git: url: git@github.com:regentmarkets/flutter-deriv-packages.git path: packages/deriv_auth - ref: dev + ref: d5bef178341a318f911b42b8105d8c3d50c6b63e deriv_theme: path: ../../deriv_theme # git: diff --git a/packages/deriv_auth_ui/pubspec.yaml b/packages/deriv_auth_ui/pubspec.yaml index e7aa909ba..0b7c361f6 100644 --- a/packages/deriv_auth_ui/pubspec.yaml +++ b/packages/deriv_auth_ui/pubspec.yaml @@ -18,7 +18,7 @@ dependencies: git: url: git@github.com:regentmarkets/flutter-deriv-packages.git path: packages/deriv_auth - ref: dev + ref: d5bef178341a318f911b42b8105d8c3d50c6b63e deriv_theme: path: ../deriv_theme # git: diff --git a/packages/deriv_theme/lib/src/dimens.dart b/packages/deriv_theme/lib/src/dimens.dart index 3f78f6372..b13f4812d 100644 --- a/packages/deriv_theme/lib/src/dimens.dart +++ b/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; diff --git a/packages/deriv_theme/lib/theme_provider.dart b/packages/deriv_theme/lib/theme_provider.dart index c9799187b..b9bc21ec5 100644 --- a/packages/deriv_theme/lib/theme_provider.dart +++ b/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;