diff --git a/example/lib/blocs/active_symbols/active_symbols_bloc.dart b/example/lib/blocs/active_symbols/active_symbols_bloc.dart
index 3b784534c7..cbb58bb7ec 100644
--- a/example/lib/blocs/active_symbols/active_symbols_bloc.dart
+++ b/example/lib/blocs/active_symbols/active_symbols_bloc.dart
@@ -51,6 +51,7 @@ class ActiveSymbolsBloc extends Bloc<ActiveSymbolsEvent, ActiveSymbolsState> {
   Future<ActiveSymbolsResponse> _fetchActiveSymbols() async =>
       ActiveSymbolsResponse.fetchActiveSymbols(const ActiveSymbolsRequest(
         activeSymbols: 'brief',
-        productType: 'basic', landingCompany: '',
+        productType: 'basic',
+        landingCompany: '',
       ));
 }
diff --git a/example/lib/blocs/ticks/ticks_event.dart b/example/lib/blocs/ticks/ticks_event.dart
index b21abacd72..51ce0dac5e 100644
--- a/example/lib/blocs/ticks/ticks_event.dart
+++ b/example/lib/blocs/ticks/ticks_event.dart
@@ -37,4 +37,4 @@ class YieldError extends TicksEvent {
 
   @override
   String toString() => 'YieldError $message';
-}
\ No newline at end of file
+}
diff --git a/lib/api/models/reset_pass_model.dart b/lib/api/models/reset_pass_model.dart
index 45fe13af86..14dbd3873b 100644
--- a/lib/api/models/reset_pass_model.dart
+++ b/lib/api/models/reset_pass_model.dart
@@ -7,4 +7,4 @@ abstract class ResetPasswordModel {
 
   /// `true`: password reset success, `false`: password reset failure
   final bool resetPassword;
-}
\ No newline at end of file
+}
diff --git a/lib/api/response/account_list_response_result.dart b/lib/api/response/account_list_response_result.dart
index bcef45fb5c..c2fc1390b0 100644
--- a/lib/api/response/account_list_response_result.dart
+++ b/lib/api/response/account_list_response_result.dart
@@ -106,6 +106,7 @@ enum PlatformEnum {
   /// mt5.
   mt5,
 }
+
 /// Account list item model class.
 abstract class AccountListItemModel {
   /// Initializes Account list item model class .
@@ -240,6 +241,7 @@ class AccountListItem extends AccountListItemModel {
         broker: broker ?? this.broker,
       );
 }
+
 /// Linked to item model class.
 abstract class LinkedToItemModel {
   /// Initializes Linked to item model class .
diff --git a/lib/api/response/account_security_response_result.dart b/lib/api/response/account_security_response_result.dart
index 9cda186520..afa10a9466 100644
--- a/lib/api/response/account_security_response_result.dart
+++ b/lib/api/response/account_security_response_result.dart
@@ -51,6 +51,7 @@ class AccountSecurityResponse extends AccountSecurityResponseModel {
         accountSecurity: accountSecurity ?? this.accountSecurity,
       );
 }
+
 /// Account security model class.
 abstract class AccountSecurityModel {
   /// Initializes Account security model class .
@@ -94,6 +95,7 @@ class AccountSecurity extends AccountSecurityModel {
         totp: totp ?? this.totp,
       );
 }
+
 /// Totp model class.
 abstract class TotpModel {
   /// Initializes Totp model class .
diff --git a/lib/api/response/account_statistics_response_result.dart b/lib/api/response/account_statistics_response_result.dart
index 357c0a924e..cb382be81d 100644
--- a/lib/api/response/account_statistics_response_result.dart
+++ b/lib/api/response/account_statistics_response_result.dart
@@ -51,6 +51,7 @@ class AccountStatisticsResponse extends AccountStatisticsResponseModel {
         accountStatistics: accountStatistics ?? this.accountStatistics,
       );
 }
+
 /// Account statistics model class.
 abstract class AccountStatisticsModel {
   /// Initializes Account statistics model class .
diff --git a/lib/api/response/active_symbols_response_result.dart b/lib/api/response/active_symbols_response_result.dart
index e5cad6afaa..c21e198e5e 100644
--- a/lib/api/response/active_symbols_response_result.dart
+++ b/lib/api/response/active_symbols_response_result.dart
@@ -86,6 +86,7 @@ class ActiveSymbolsResponse extends ActiveSymbolsResponseModel {
         activeSymbols: activeSymbols ?? this.activeSymbols,
       );
 }
+
 /// Active symbols item model class.
 abstract class ActiveSymbolsItemModel {
   /// Initializes Active symbols item model class .
diff --git a/lib/api/response/affiliate_account_add_response_result.dart b/lib/api/response/affiliate_account_add_response_result.dart
index a93100840f..381213d65a 100644
--- a/lib/api/response/affiliate_account_add_response_result.dart
+++ b/lib/api/response/affiliate_account_add_response_result.dart
@@ -53,6 +53,7 @@ class AffiliateAccountAddResponse extends AffiliateAccountAddResponseModel {
         affiliateAccountAdd: affiliateAccountAdd ?? this.affiliateAccountAdd,
       );
 }
+
 /// Affiliate account add model class.
 abstract class AffiliateAccountAddModel {
   /// Initializes Affiliate account add model class .
diff --git a/lib/api/response/affiliate_add_company_response_result.dart b/lib/api/response/affiliate_add_company_response_result.dart
index 175f69b276..ffc2d65bbb 100644
--- a/lib/api/response/affiliate_add_company_response_result.dart
+++ b/lib/api/response/affiliate_add_company_response_result.dart
@@ -51,6 +51,7 @@ class AffiliateAddCompanyResponse extends AffiliateAddCompanyResponseModel {
         affiliateAddCompany: affiliateAddCompany ?? this.affiliateAddCompany,
       );
 }
+
 /// Affiliate add company model class.
 abstract class AffiliateAddCompanyModel {
   /// Initializes Affiliate add company model class .
diff --git a/lib/api/response/affiliate_add_person_response_result.dart b/lib/api/response/affiliate_add_person_response_result.dart
index 0a0ada6297..3efd4f487b 100644
--- a/lib/api/response/affiliate_add_person_response_result.dart
+++ b/lib/api/response/affiliate_add_person_response_result.dart
@@ -51,6 +51,7 @@ class AffiliateAddPersonResponse extends AffiliateAddPersonResponseModel {
         affiliateAddPerson: affiliateAddPerson ?? this.affiliateAddPerson,
       );
 }
+
 /// Affiliate add person model class.
 abstract class AffiliateAddPersonModel {
   /// Initializes Affiliate add person model class .
diff --git a/lib/api/response/api_token_response_result.dart b/lib/api/response/api_token_response_result.dart
index 30477bd762..31a3718698 100644
--- a/lib/api/response/api_token_response_result.dart
+++ b/lib/api/response/api_token_response_result.dart
@@ -132,6 +132,7 @@ enum ScopesItemEnum {
   /// admin.
   admin,
 }
+
 /// Api token model class.
 abstract class ApiTokenModel {
   /// Initializes Api token model class .
@@ -202,6 +203,7 @@ class ApiToken extends ApiTokenModel {
         tokens: tokens ?? this.tokens,
       );
 }
+
 /// Tokens item model class.
 abstract class TokensItemModel {
   /// Initializes Tokens item model class .
diff --git a/lib/api/response/app_get_response_result.dart b/lib/api/response/app_get_response_result.dart
index 524efcc97d..d519e18bb4 100644
--- a/lib/api/response/app_get_response_result.dart
+++ b/lib/api/response/app_get_response_result.dart
@@ -184,6 +184,7 @@ class AppGetResponse extends AppGetResponseModel {
         appGet: appGet ?? this.appGet,
       );
 }
+
 /// App get model class.
 abstract class AppGetModel {
   /// Initializes App get model class .
diff --git a/lib/api/response/app_list_response_result.dart b/lib/api/response/app_list_response_result.dart
index ab2fd828e7..f574ea4d4e 100644
--- a/lib/api/response/app_list_response_result.dart
+++ b/lib/api/response/app_list_response_result.dart
@@ -85,6 +85,7 @@ class AppListResponse extends AppListResponseModel {
         appList: appList ?? this.appList,
       );
 }
+
 /// App list item model class.
 abstract class AppListItemModel {
   /// Initializes App list item model class .
diff --git a/lib/api/response/app_markup_details_response_result.dart b/lib/api/response/app_markup_details_response_result.dart
index 06a048df18..4a8d0ff5ae 100644
--- a/lib/api/response/app_markup_details_response_result.dart
+++ b/lib/api/response/app_markup_details_response_result.dart
@@ -76,6 +76,7 @@ class AppMarkupDetailsResponse extends AppMarkupDetailsResponseModel {
         appMarkupDetails: appMarkupDetails ?? this.appMarkupDetails,
       );
 }
+
 /// App markup details model class.
 abstract class AppMarkupDetailsModel {
   /// Initializes App markup details model class .
@@ -129,6 +130,7 @@ class AppMarkupDetails extends AppMarkupDetailsModel {
         transactions: transactions ?? this.transactions,
       );
 }
+
 /// Transactions item model class.
 abstract class TransactionsItemModel {
   /// Initializes Transactions item model class .
diff --git a/lib/api/response/app_markup_statistics_response_result.dart b/lib/api/response/app_markup_statistics_response_result.dart
index be36c2b6c7..7da2c75df8 100644
--- a/lib/api/response/app_markup_statistics_response_result.dart
+++ b/lib/api/response/app_markup_statistics_response_result.dart
@@ -51,6 +51,7 @@ class AppMarkupStatisticsResponse extends AppMarkupStatisticsResponseModel {
         appMarkupStatistics: appMarkupStatistics ?? this.appMarkupStatistics,
       );
 }
+
 /// App markup statistics model class.
 abstract class AppMarkupStatisticsModel {
   /// Initializes App markup statistics model class .
@@ -123,6 +124,7 @@ class AppMarkupStatistics extends AppMarkupStatisticsModel {
             totalTransactionsCount ?? this.totalTransactionsCount,
       );
 }
+
 /// Breakdown item model class.
 abstract class BreakdownItemModel {
   /// Initializes Breakdown item model class .
diff --git a/lib/api/response/app_register_response_result.dart b/lib/api/response/app_register_response_result.dart
index 1130290a57..50f65b72e3 100644
--- a/lib/api/response/app_register_response_result.dart
+++ b/lib/api/response/app_register_response_result.dart
@@ -77,6 +77,7 @@ class AppRegisterResponse extends AppRegisterResponseModel {
         appRegister: appRegister ?? this.appRegister,
       );
 }
+
 /// App register model class.
 abstract class AppRegisterModel {
   /// Initializes App register model class .
diff --git a/lib/api/response/app_update_response_result.dart b/lib/api/response/app_update_response_result.dart
index aa99365731..82af64edea 100644
--- a/lib/api/response/app_update_response_result.dart
+++ b/lib/api/response/app_update_response_result.dart
@@ -75,6 +75,7 @@ class AppUpdateResponse extends AppUpdateResponseModel {
         appUpdate: appUpdate ?? this.appUpdate,
       );
 }
+
 /// App update model class.
 abstract class AppUpdateModel {
   /// Initializes App update model class .
diff --git a/lib/api/response/authorize_response_result.dart b/lib/api/response/authorize_response_result.dart
index ff7c8b2f78..a8e4e6e26f 100644
--- a/lib/api/response/authorize_response_result.dart
+++ b/lib/api/response/authorize_response_result.dart
@@ -137,6 +137,7 @@ enum PlatformEnum {
   /// mt5.
   mt5,
 }
+
 /// Authorize model class.
 abstract class AuthorizeModel {
   /// Initializes Authorize model class .
@@ -371,6 +372,7 @@ class Authorize extends AuthorizeModel {
         userId: userId ?? this.userId,
       );
 }
+
 /// Account list item model class.
 abstract class AccountListItemModel {
   /// Initializes Account list item model class .
@@ -519,6 +521,7 @@ class AccountListItem extends AccountListItemModel {
         loginid: loginid ?? this.loginid,
       );
 }
+
 /// Linked to item model class.
 abstract class LinkedToItemModel {
   /// Initializes Linked to item model class .
@@ -573,6 +576,7 @@ class LinkedToItem extends LinkedToItemModel {
         platform: platform ?? this.platform,
       );
 }
+
 /// Authorize linked to item model class.
 abstract class AuthorizeLinkedToItemModel {
   /// Initializes Authorize linked to item model class .
@@ -628,6 +632,7 @@ class AuthorizeLinkedToItem extends AuthorizeLinkedToItemModel {
         platform: platform ?? this.platform,
       );
 }
+
 /// Local currencies property model class.
 abstract class LocalCurrenciesPropertyModel {
   /// Initializes Local currencies property model class .
diff --git a/lib/api/response/available_accounts_response_result.dart b/lib/api/response/available_accounts_response_result.dart
index b02d7c3c86..2431e86612 100644
--- a/lib/api/response/available_accounts_response_result.dart
+++ b/lib/api/response/available_accounts_response_result.dart
@@ -79,6 +79,7 @@ enum AccountTypeEnum {
   /// p2p.
   p2p,
 }
+
 /// Available accounts model class.
 abstract class AvailableAccountsModel {
   /// Initializes Available accounts model class .
@@ -128,6 +129,7 @@ class AvailableAccounts extends AvailableAccountsModel {
         wallets: wallets ?? this.wallets,
       );
 }
+
 /// Wallets item model class.
 abstract class WalletsItemModel {
   /// Initializes Wallets item model class .
diff --git a/lib/api/response/balance_response_result.dart b/lib/api/response/balance_response_result.dart
index 4f1304536f..9b50459b2b 100644
--- a/lib/api/response/balance_response_result.dart
+++ b/lib/api/response/balance_response_result.dart
@@ -169,6 +169,7 @@ enum TypeEnum {
   /// deriv.
   deriv,
 }
+
 /// Balance model class.
 abstract class BalanceModel {
   /// Initializes Balance model class .
@@ -263,6 +264,7 @@ class Balance extends BalanceModel {
         total: total ?? this.total,
       );
 }
+
 /// Accounts property model class.
 abstract class AccountsPropertyModel {
   /// Initializes Accounts property model class .
@@ -351,6 +353,7 @@ class AccountsProperty extends AccountsPropertyModel {
         type: type ?? this.type,
       );
 }
+
 /// Total model class.
 abstract class TotalModel {
   /// Initializes Total model class .
@@ -430,6 +433,7 @@ class Total extends TotalModel {
         mt5Demo: mt5Demo ?? this.mt5Demo,
       );
 }
+
 /// Deriv model class.
 abstract class DerivModel {
   /// Initializes Deriv model class .
@@ -479,6 +483,7 @@ class Deriv extends DerivModel {
         currency: currency ?? this.currency,
       );
 }
+
 /// Deriv demo model class.
 abstract class DerivDemoModel {
   /// Initializes Deriv demo model class .
@@ -528,6 +533,7 @@ class DerivDemo extends DerivDemoModel {
         currency: currency ?? this.currency,
       );
 }
+
 /// Mt5 model class.
 abstract class Mt5Model {
   /// Initializes Mt5 model class .
@@ -577,6 +583,7 @@ class Mt5 extends Mt5Model {
         currency: currency ?? this.currency,
       );
 }
+
 /// Mt5 demo model class.
 abstract class Mt5DemoModel {
   /// Initializes Mt5 demo model class .
@@ -626,6 +633,7 @@ class Mt5Demo extends Mt5DemoModel {
         currency: currency ?? this.currency,
       );
 }
+
 /// Subscription model class.
 abstract class SubscriptionModel {
   /// Initializes Subscription model class .
diff --git a/lib/api/response/buy_contract_for_multiple_accounts_response_result.dart b/lib/api/response/buy_contract_for_multiple_accounts_response_result.dart
index e561f66899..76cd19e055 100644
--- a/lib/api/response/buy_contract_for_multiple_accounts_response_result.dart
+++ b/lib/api/response/buy_contract_for_multiple_accounts_response_result.dart
@@ -2,7 +2,6 @@
 
 import 'package:equatable/equatable.dart';
 
-
 /// Buy contract for multiple accounts response model class.
 abstract class BuyContractForMultipleAccountsResponseModel {
   /// Initializes Buy contract for multiple accounts response model class .
@@ -55,6 +54,7 @@ class BuyContractForMultipleAccountsResponse
             this.buyContractForMultipleAccounts,
       );
 }
+
 /// Buy contract for multiple accounts model class.
 abstract class BuyContractForMultipleAccountsModel {
   /// Initializes Buy contract for multiple accounts model class .
diff --git a/lib/api/response/buy_response_result.dart b/lib/api/response/buy_response_result.dart
index 4419933a8b..d03b08fe2e 100644
--- a/lib/api/response/buy_response_result.dart
+++ b/lib/api/response/buy_response_result.dart
@@ -16,6 +16,7 @@ import 'package:flutter_deriv_api/helpers/helpers.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/base_api.dart';
 import 'package:flutter_deriv_api/services/connection/call_manager/base_call_manager.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
+
 /// Buy response model class.
 abstract class BuyResponseModel {
   /// Initializes Buy response model class .
@@ -157,6 +158,7 @@ class BuyResponse extends BuyResponseModel {
         subscription: subscription ?? this.subscription,
       );
 }
+
 /// Buy model class.
 abstract class BuyModel {
   /// Initializes Buy model class .
@@ -269,6 +271,7 @@ class Buy extends BuyModel {
         transactionId: transactionId ?? this.transactionId,
       );
 }
+
 /// Subscription model class.
 abstract class SubscriptionModel {
   /// Initializes Subscription model class .
diff --git a/lib/api/response/cancel_response_result.dart b/lib/api/response/cancel_response_result.dart
index dd005e22a7..c2691319d1 100644
--- a/lib/api/response/cancel_response_result.dart
+++ b/lib/api/response/cancel_response_result.dart
@@ -72,6 +72,7 @@ class CancelResponse extends CancelResponseModel {
         cancel: cancel ?? this.cancel,
       );
 }
+
 /// Cancel model class.
 abstract class CancelModel {
   /// Initializes Cancel model class .
diff --git a/lib/api/response/cashier_payments_response_result.dart b/lib/api/response/cashier_payments_response_result.dart
index 5a7266a601..b14b0fd6c0 100644
--- a/lib/api/response/cashier_payments_response_result.dart
+++ b/lib/api/response/cashier_payments_response_result.dart
@@ -137,6 +137,7 @@ enum TransactionTypeEnum {
   /// withdrawal.
   withdrawal,
 }
+
 /// Cashier payments model class.
 abstract class CashierPaymentsModel {
   /// Initializes Cashier payments model class .
@@ -190,6 +191,7 @@ class CashierPayments extends CashierPaymentsModel {
         crypto: crypto ?? this.crypto,
       );
 }
+
 /// Crypto item model class.
 abstract class CryptoItemModel {
   /// Initializes Crypto item model class .
@@ -335,6 +337,7 @@ class CryptoItem extends CryptoItemModel {
         transactionUrl: transactionUrl ?? this.transactionUrl,
       );
 }
+
 /// Subscription model class.
 abstract class SubscriptionModel {
   /// Initializes Subscription model class .
diff --git a/lib/api/response/cashier_response_result.dart b/lib/api/response/cashier_response_result.dart
index 89c2fefb95..7ec4516e93 100644
--- a/lib/api/response/cashier_response_result.dart
+++ b/lib/api/response/cashier_response_result.dart
@@ -101,6 +101,7 @@ enum ActionEnum {
   /// withdraw.
   withdraw,
 }
+
 /// Cashier object model class.
 abstract class CashierObjectModel {
   /// Initializes Cashier object model class .
@@ -165,6 +166,7 @@ class CashierObject extends CashierObjectModel {
         withdraw: withdraw ?? this.withdraw,
       );
 }
+
 /// Deposit model class.
 abstract class DepositModel {
   /// Initializes Deposit model class .
diff --git a/lib/api/response/cashier_withdrawal_cancel_response_result.dart b/lib/api/response/cashier_withdrawal_cancel_response_result.dart
index b00f67da0b..1df2136608 100644
--- a/lib/api/response/cashier_withdrawal_cancel_response_result.dart
+++ b/lib/api/response/cashier_withdrawal_cancel_response_result.dart
@@ -66,6 +66,7 @@ enum StatusCodeEnum {
   /// CANCELLED.
   cancelled,
 }
+
 /// Cashier withdrawal cancel model class.
 abstract class CashierWithdrawalCancelModel {
   /// Initializes Cashier withdrawal cancel model class .
diff --git a/lib/api/response/contract_update_history_response_result.dart b/lib/api/response/contract_update_history_response_result.dart
index 7a2550c167..aa70e2ffab 100644
--- a/lib/api/response/contract_update_history_response_result.dart
+++ b/lib/api/response/contract_update_history_response_result.dart
@@ -87,6 +87,7 @@ class ContractUpdateHistoryResponse extends ContractUpdateHistoryResponseModel {
             contractUpdateHistory ?? this.contractUpdateHistory,
       );
 }
+
 /// Contract update history item model class.
 abstract class ContractUpdateHistoryItemModel {
   /// Initializes Contract update history item model class .
diff --git a/lib/api/response/contract_update_response_result.dart b/lib/api/response/contract_update_response_result.dart
index 86e983fe3b..7c9c8e092e 100644
--- a/lib/api/response/contract_update_response_result.dart
+++ b/lib/api/response/contract_update_response_result.dart
@@ -76,6 +76,7 @@ class ContractUpdateResponse extends ContractUpdateResponseModel {
         contractUpdate: contractUpdate ?? this.contractUpdate,
       );
 }
+
 /// Contract update model class.
 abstract class ContractUpdateModel {
   /// Initializes Contract update model class .
@@ -133,6 +134,7 @@ class ContractUpdate extends ContractUpdateModel {
         takeProfit: takeProfit ?? this.takeProfit,
       );
 }
+
 /// Stop loss model class.
 abstract class StopLossModel extends Equatable {
   /// Initializes Stop loss model class .
@@ -207,6 +209,7 @@ class StopLoss extends StopLossModel {
         orderAmount,
       ];
 }
+
 /// Take profit model class.
 abstract class TakeProfitModel extends Equatable {
   /// Initializes Take profit model class .
diff --git a/lib/api/response/contracts_for_response_result.dart b/lib/api/response/contracts_for_response_result.dart
index f088a4d9d4..ccda86ceb8 100644
--- a/lib/api/response/contracts_for_response_result.dart
+++ b/lib/api/response/contracts_for_response_result.dart
@@ -78,6 +78,7 @@ class ContractsForResponse extends ContractsForResponseModel {
         contractsFor: contractsFor ?? this.contractsFor,
       );
 }
+
 /// Contracts for model class.
 abstract class ContractsForModel {
   /// Initializes Contracts for model class .
@@ -193,6 +194,7 @@ class ContractsFor extends ContractsForModel {
         spot: spot ?? this.spot,
       );
 }
+
 /// Available item model class.
 abstract class AvailableItemModel {
   /// Initializes Available item model class .
@@ -592,6 +594,7 @@ class AvailableItem extends AvailableItemModel {
         tradingPeriod: tradingPeriod ?? this.tradingPeriod,
       );
 }
+
 /// Forward starting options item model class.
 abstract class ForwardStartingOptionsItemModel {
   /// Initializes Forward starting options item model class .
diff --git a/lib/api/response/copytrading_list_response_result.dart b/lib/api/response/copytrading_list_response_result.dart
index e4db814cad..21e8203f61 100644
--- a/lib/api/response/copytrading_list_response_result.dart
+++ b/lib/api/response/copytrading_list_response_result.dart
@@ -78,6 +78,7 @@ class CopytradingListResponse extends CopytradingListResponseModel {
         copytradingList: copytradingList ?? this.copytradingList,
       );
 }
+
 /// Copytrading list model class.
 abstract class CopytradingListModel {
   /// Initializes Copytrading list model class .
@@ -145,6 +146,7 @@ class CopytradingList extends CopytradingListModel {
         traders: traders ?? this.traders,
       );
 }
+
 /// Copiers item model class.
 abstract class CopiersItemModel {
   /// Initializes Copiers item model class .
@@ -185,6 +187,7 @@ class CopiersItem extends CopiersItemModel {
         loginid: loginid ?? this.loginid,
       );
 }
+
 /// Traders item model class.
 abstract class TradersItemModel {
   /// Initializes Traders item model class .
diff --git a/lib/api/response/copytrading_statistics_response_result.dart b/lib/api/response/copytrading_statistics_response_result.dart
index c46b0faa95..54be9f535a 100644
--- a/lib/api/response/copytrading_statistics_response_result.dart
+++ b/lib/api/response/copytrading_statistics_response_result.dart
@@ -80,6 +80,7 @@ class CopytradingStatisticsResponse extends CopytradingStatisticsResponseModel {
             copytradingStatistics ?? this.copytradingStatistics,
       );
 }
+
 /// Copytrading statistics model class.
 abstract class CopytradingStatisticsModel {
   /// Initializes Copytrading statistics model class .
diff --git a/lib/api/response/crypto_config_response_result.dart b/lib/api/response/crypto_config_response_result.dart
index 41e901f613..cc72646279 100644
--- a/lib/api/response/crypto_config_response_result.dart
+++ b/lib/api/response/crypto_config_response_result.dart
@@ -51,6 +51,7 @@ class CryptoConfigResponse extends CryptoConfigResponseModel {
         cryptoConfig: cryptoConfig ?? this.cryptoConfig,
       );
 }
+
 /// Crypto config model class.
 abstract class CryptoConfigModel {
   /// Initializes Crypto config model class .
@@ -97,6 +98,7 @@ class CryptoConfig extends CryptoConfigModel {
         currenciesConfig: currenciesConfig ?? this.currenciesConfig,
       );
 }
+
 /// Currencies config property model class.
 abstract class CurrenciesConfigPropertyModel {
   /// Initializes Currencies config property model class .
diff --git a/lib/api/response/crypto_estimations_response_result.dart b/lib/api/response/crypto_estimations_response_result.dart
index b3a0d9f66b..b9849bcfbe 100644
--- a/lib/api/response/crypto_estimations_response_result.dart
+++ b/lib/api/response/crypto_estimations_response_result.dart
@@ -68,6 +68,7 @@ class CryptoEstimationsResponse extends CryptoEstimationsResponseModel {
         subscription: subscription ?? this.subscription,
       );
 }
+
 /// Crypto estimations property model class.
 abstract class CryptoEstimationsPropertyModel {
   /// Initializes Crypto estimations property model class .
@@ -113,6 +114,7 @@ class CryptoEstimationsProperty extends CryptoEstimationsPropertyModel {
         withdrawalFee: withdrawalFee ?? this.withdrawalFee,
       );
 }
+
 /// Withdrawal fee model class.
 abstract class WithdrawalFeeModel {
   /// Initializes Withdrawal fee model class .
@@ -171,6 +173,7 @@ class WithdrawalFee extends WithdrawalFeeModel {
         value: value ?? this.value,
       );
 }
+
 /// Subscription model class.
 abstract class SubscriptionModel {
   /// Initializes Subscription model class .
diff --git a/lib/api/response/document_upload_response_result.dart b/lib/api/response/document_upload_response_result.dart
index fe2365ec76..2ed9f98547 100644
--- a/lib/api/response/document_upload_response_result.dart
+++ b/lib/api/response/document_upload_response_result.dart
@@ -3,6 +3,7 @@
 import 'package:equatable/equatable.dart';
 
 import 'package:flutter_deriv_api/helpers/helpers.dart';
+
 /// Document upload response model class.
 abstract class DocumentUploadResponseModel {
   /// Initializes Document upload response model class .
@@ -50,6 +51,7 @@ class DocumentUploadResponse extends DocumentUploadResponseModel {
         documentUpload: documentUpload ?? this.documentUpload,
       );
 }
+
 /// Document upload model class.
 abstract class DocumentUploadModel {
   /// Initializes Document upload model class .
diff --git a/lib/api/response/economic_calendar_response_result.dart b/lib/api/response/economic_calendar_response_result.dart
index aa91d3d8db..b6eedd60fa 100644
--- a/lib/api/response/economic_calendar_response_result.dart
+++ b/lib/api/response/economic_calendar_response_result.dart
@@ -3,6 +3,7 @@
 import 'package:equatable/equatable.dart';
 
 import 'package:flutter_deriv_api/helpers/helpers.dart';
+
 /// Economic calendar response model class.
 abstract class EconomicCalendarResponseModel {
   /// Initializes Economic calendar response model class .
@@ -50,6 +51,7 @@ class EconomicCalendarResponse extends EconomicCalendarResponseModel {
         economicCalendar: economicCalendar ?? this.economicCalendar,
       );
 }
+
 /// Economic calendar model class.
 abstract class EconomicCalendarModel {
   /// Initializes Economic calendar model class .
@@ -103,6 +105,7 @@ class EconomicCalendar extends EconomicCalendarModel {
         events: events ?? this.events,
       );
 }
+
 /// Events item model class.
 abstract class EventsItemModel {
   /// Initializes Events item model class .
@@ -207,6 +210,7 @@ class EventsItem extends EventsItemModel {
         releaseDate: releaseDate ?? this.releaseDate,
       );
 }
+
 /// Actual model class.
 abstract class ActualModel {
   /// Initializes Actual model class .
@@ -247,6 +251,7 @@ class Actual extends ActualModel {
         displayValue: displayValue ?? this.displayValue,
       );
 }
+
 /// Forecast model class.
 abstract class ForecastModel {
   /// Initializes Forecast model class .
@@ -287,6 +292,7 @@ class Forecast extends ForecastModel {
         displayValue: displayValue ?? this.displayValue,
       );
 }
+
 /// Previous model class.
 abstract class PreviousModel {
   /// Initializes Previous model class .
diff --git a/lib/api/response/exchange_rates_response_result.dart b/lib/api/response/exchange_rates_response_result.dart
index d6585ce550..5cb5b354fa 100644
--- a/lib/api/response/exchange_rates_response_result.dart
+++ b/lib/api/response/exchange_rates_response_result.dart
@@ -103,6 +103,7 @@ class ExchangeRatesResponse extends ExchangeRatesResponseModel {
         subscription: subscription ?? this.subscription,
       );
 }
+
 /// Exchange rates model class.
 abstract class ExchangeRatesModel {
   /// Initializes Exchange rates model class .
@@ -168,6 +169,7 @@ class ExchangeRates extends ExchangeRatesModel {
         rates: rates ?? this.rates,
       );
 }
+
 /// Subscription model class.
 abstract class SubscriptionModel {
   /// Initializes Subscription model class .
diff --git a/lib/api/response/get_account_status_response_result.dart b/lib/api/response/get_account_status_response_result.dart
index ff9472e4cb..e0ce801aa7 100644
--- a/lib/api/response/get_account_status_response_result.dart
+++ b/lib/api/response/get_account_status_response_result.dart
@@ -268,6 +268,7 @@ enum SocialIdentityProviderEnum {
   /// apple.
   apple,
 }
+
 /// Get account status model class.
 abstract class GetAccountStatusModel {
   /// Initializes Get account status model class .
@@ -490,6 +491,7 @@ class GetAccountStatus extends GetAccountStatusModel {
             socialIdentityProvider ?? this.socialIdentityProvider,
       );
 }
+
 /// Currency config property model class.
 abstract class CurrencyConfigPropertyModel {
   /// Initializes Currency config property model class .
@@ -541,6 +543,7 @@ class CurrencyConfigProperty extends CurrencyConfigPropertyModel {
             isWithdrawalSuspended ?? this.isWithdrawalSuspended,
       );
 }
+
 /// Authentication model class.
 abstract class AuthenticationModel {
   /// Initializes Authentication model class .
@@ -653,6 +656,7 @@ class Authentication extends AuthenticationModel {
         ownership: ownership ?? this.ownership,
       );
 }
+
 /// Attempts model class.
 abstract class AttemptsModel {
   /// Initializes Attempts model class .
@@ -723,6 +727,7 @@ class Attempts extends AttemptsModel {
         latest: latest ?? this.latest,
       );
 }
+
 /// History item model class.
 abstract class HistoryItemModel {
   /// Initializes History item model class .
@@ -812,6 +817,7 @@ class HistoryItem extends HistoryItemModel {
         timestamp: timestamp ?? this.timestamp,
       );
 }
+
 /// Document model class.
 abstract class DocumentModel {
   /// Initializes Document model class .
@@ -879,6 +885,7 @@ class Document extends DocumentModel {
         status: status ?? this.status,
       );
 }
+
 /// Authenticated with idv model class.
 abstract class AuthenticatedWithIdvModel {
   /// Initializes Authenticated with idv model class .
@@ -1010,6 +1017,7 @@ class AuthenticatedWithIdv extends AuthenticatedWithIdvModel {
         virtual: virtual ?? this.virtual,
       );
 }
+
 /// Identity model class.
 abstract class IdentityModel {
   /// Initializes Identity model class .
@@ -1077,6 +1085,7 @@ class Identity extends IdentityModel {
         status: status ?? this.status,
       );
 }
+
 /// Services model class.
 abstract class ServicesModel {
   /// Initializes Services model class .
@@ -1141,6 +1150,7 @@ class Services extends ServicesModel {
         onfido: onfido ?? this.onfido,
       );
 }
+
 /// Idv model class.
 abstract class IdvModel {
   /// Initializes Idv model class .
@@ -1233,6 +1243,7 @@ class Idv extends IdvModel {
         submissionsLeft: submissionsLeft ?? this.submissionsLeft,
       );
 }
+
 /// Manual model class.
 abstract class ManualModel {
   /// Initializes Manual model class .
@@ -1278,6 +1289,7 @@ class Manual extends ManualModel {
         status: status ?? this.status,
       );
 }
+
 /// Onfido model class.
 abstract class OnfidoModel {
   /// Initializes Onfido model class .
@@ -1422,6 +1434,7 @@ class Onfido extends OnfidoModel {
         submissionsLeft: submissionsLeft ?? this.submissionsLeft,
       );
 }
+
 /// Income model class.
 abstract class IncomeModel {
   /// Initializes Income model class .
@@ -1476,6 +1489,7 @@ class Income extends IncomeModel {
         status: status ?? this.status,
       );
 }
+
 /// Ownership model class.
 abstract class OwnershipModel {
   /// Initializes Ownership model class .
@@ -1542,6 +1556,7 @@ class Ownership extends OwnershipModel {
         status: status ?? this.status,
       );
 }
+
 /// Requests item model class.
 abstract class RequestsItemModel {
   /// Initializes Requests item model class .
diff --git a/lib/api/response/get_account_types_response_result.dart b/lib/api/response/get_account_types_response_result.dart
index e582c3a1a7..3cc79393e4 100644
--- a/lib/api/response/get_account_types_response_result.dart
+++ b/lib/api/response/get_account_types_response_result.dart
@@ -51,6 +51,7 @@ class GetAccountTypesResponse extends GetAccountTypesResponseModel {
         getAccountTypes: getAccountTypes ?? this.getAccountTypes,
       );
 }
+
 /// Get account types model class.
 abstract class GetAccountTypesModel {
   /// Initializes Get account types model class .
@@ -111,6 +112,7 @@ class GetAccountTypes extends GetAccountTypesModel {
         wallet: wallet ?? this.wallet,
       );
 }
+
 /// Trading property model class.
 abstract class TradingPropertyModel {
   /// Initializes Trading property model class .
@@ -190,6 +192,7 @@ class TradingProperty extends TradingPropertyModel {
         linkableWalletTypes: linkableWalletTypes ?? this.linkableWalletTypes,
       );
 }
+
 /// Wallet property model class.
 abstract class WalletPropertyModel {
   /// Initializes Wallet property model class .
diff --git a/lib/api/response/get_available_accounts_to_transfer_response_result.dart b/lib/api/response/get_available_accounts_to_transfer_response_result.dart
index 186f715b0b..d0547cfc9b 100644
--- a/lib/api/response/get_available_accounts_to_transfer_response_result.dart
+++ b/lib/api/response/get_available_accounts_to_transfer_response_result.dart
@@ -101,6 +101,7 @@ enum TypeEnum {
   /// pa_client.
   paClient,
 }
+
 /// Get available accounts to transfer model class.
 abstract class GetAvailableAccountsToTransferModel {
   /// Initializes Get available accounts to transfer model class .
@@ -153,6 +154,7 @@ class GetAvailableAccountsToTransfer
         accountList: accountList ?? this.accountList,
       );
 }
+
 /// Account list item model class.
 abstract class AccountListItemModel {
   /// Initializes Account list item model class .
diff --git a/lib/api/response/get_financial_assessment_response_result.dart b/lib/api/response/get_financial_assessment_response_result.dart
index 0829e6d906..27a56b3865 100644
--- a/lib/api/response/get_financial_assessment_response_result.dart
+++ b/lib/api/response/get_financial_assessment_response_result.dart
@@ -82,6 +82,7 @@ class GetFinancialAssessmentResponse
             getFinancialAssessment ?? this.getFinancialAssessment,
       );
 }
+
 /// Get financial assessment model class.
 abstract class GetFinancialAssessmentModel {
   /// Initializes Get financial assessment model class .
diff --git a/lib/api/response/get_limits_response_result.dart b/lib/api/response/get_limits_response_result.dart
index 8438a4a6f1..102f7b4347 100644
--- a/lib/api/response/get_limits_response_result.dart
+++ b/lib/api/response/get_limits_response_result.dart
@@ -77,6 +77,7 @@ class GetLimitsResponse extends GetLimitsResponseModel {
         getLimits: getLimits ?? this.getLimits,
       );
 }
+
 /// Get limits model class.
 abstract class GetLimitsModel {
   /// Initializes Get limits model class .
@@ -285,6 +286,7 @@ class GetLimits extends GetLimitsModel {
             this.withdrawalSinceInceptionMonetary,
       );
 }
+
 /// Lifetime transfers model class.
 abstract class LifetimeTransfersModel {
   /// Initializes Lifetime transfers model class .
@@ -356,6 +358,7 @@ class LifetimeTransfers extends LifetimeTransfersModel {
         fiatToCrypto: fiatToCrypto ?? this.fiatToCrypto,
       );
 }
+
 /// Crypto to crypto model class.
 abstract class CryptoToCryptoModel {
   /// Initializes Crypto to crypto model class .
@@ -405,6 +408,7 @@ class CryptoToCrypto extends CryptoToCryptoModel {
         available: available ?? this.available,
       );
 }
+
 /// Crypto to fiat model class.
 abstract class CryptoToFiatModel {
   /// Initializes Crypto to fiat model class .
@@ -454,6 +458,7 @@ class CryptoToFiat extends CryptoToFiatModel {
         available: available ?? this.available,
       );
 }
+
 /// Fiat to crypto model class.
 abstract class FiatToCryptoModel {
   /// Initializes Fiat to crypto model class .
@@ -503,6 +508,7 @@ class FiatToCrypto extends FiatToCryptoModel {
         available: available ?? this.available,
       );
 }
+
 /// Market specific property item model class.
 abstract class MarketSpecificPropertyItemModel {
   /// Initializes Market specific property item model class .
@@ -580,6 +586,7 @@ class MarketSpecificPropertyItem extends MarketSpecificPropertyItemModel {
         turnoverLimit: turnoverLimit ?? this.turnoverLimit,
       );
 }
+
 /// Payout per symbol model class.
 abstract class PayoutPerSymbolModel {
   /// Initializes Payout per symbol model class .
@@ -633,6 +640,7 @@ class PayoutPerSymbol extends PayoutPerSymbolModel {
         nonAtm: nonAtm ?? this.nonAtm,
       );
 }
+
 /// Non atm model class.
 abstract class NonAtmModel {
   /// Initializes Non atm model class .
diff --git a/lib/api/response/get_self_exclusion_response_result.dart b/lib/api/response/get_self_exclusion_response_result.dart
index 0612425f43..94aabc3f76 100644
--- a/lib/api/response/get_self_exclusion_response_result.dart
+++ b/lib/api/response/get_self_exclusion_response_result.dart
@@ -133,6 +133,7 @@ class GetSelfExclusionResponse extends GetSelfExclusionResponseModel {
         getSelfExclusion: getSelfExclusion ?? this.getSelfExclusion,
       );
 }
+
 /// Get self exclusion model class.
 abstract class GetSelfExclusionModel {
   /// Initializes Get self exclusion model class .
diff --git a/lib/api/response/identity_verification_document_add_response_result.dart b/lib/api/response/identity_verification_document_add_response_result.dart
index a1e39d4467..d51fba1749 100644
--- a/lib/api/response/identity_verification_document_add_response_result.dart
+++ b/lib/api/response/identity_verification_document_add_response_result.dart
@@ -2,7 +2,6 @@
 
 import 'package:equatable/equatable.dart';
 
-
 /// Identity verification document add response model class.
 abstract class IdentityVerificationDocumentAddResponseModel {
   /// Initializes Identity verification document add response model class .
diff --git a/lib/api/response/landing_company_details_response_result.dart b/lib/api/response/landing_company_details_response_result.dart
index aa9c3ccce2..8f45299302 100644
--- a/lib/api/response/landing_company_details_response_result.dart
+++ b/lib/api/response/landing_company_details_response_result.dart
@@ -3,6 +3,7 @@
 import 'package:equatable/equatable.dart';
 
 import 'package:flutter_deriv_api/helpers/helpers.dart';
+
 /// Landing company details response model class.
 abstract class LandingCompanyDetailsResponseModel {
   /// Initializes Landing company details response model class .
@@ -51,6 +52,7 @@ class LandingCompanyDetailsResponse extends LandingCompanyDetailsResponseModel {
             landingCompanyDetails ?? this.landingCompanyDetails,
       );
 }
+
 /// Landing company details model class.
 abstract class LandingCompanyDetailsModel {
   /// Initializes Landing company details model class .
@@ -270,6 +272,7 @@ class LandingCompanyDetails extends LandingCompanyDetailsModel {
         tinNotMandatory: tinNotMandatory ?? this.tinNotMandatory,
       );
 }
+
 /// Currency config model class.
 abstract class CurrencyConfigModel {
   /// Initializes Currency config model class .
@@ -357,6 +360,7 @@ class CurrencyConfig extends CurrencyConfigModel {
         syntheticIndex: syntheticIndex ?? this.syntheticIndex,
       );
 }
+
 /// Market model class.
 abstract class MarketModel {
   /// Initializes Market model class .
@@ -401,6 +405,7 @@ class Market extends MarketModel {
         currency: currency ?? this.currency,
       );
 }
+
 /// Currency model class.
 abstract class CurrencyModel {
   /// Initializes Currency model class .
@@ -450,6 +455,7 @@ class Currency extends CurrencyModel {
         minStake: minStake ?? this.minStake,
       );
 }
+
 /// Requirements model class.
 abstract class RequirementsModel {
   /// Initializes Requirements model class .
@@ -549,6 +555,7 @@ class Requirements extends RequirementsModel {
         withdrawal: withdrawal ?? this.withdrawal,
       );
 }
+
 /// After first deposit model class.
 abstract class AfterFirstDepositModel {
   /// Initializes After first deposit model class .
@@ -602,6 +609,7 @@ class AfterFirstDeposit extends AfterFirstDepositModel {
         financialAssessment: financialAssessment ?? this.financialAssessment,
       );
 }
+
 /// Compliance model class.
 abstract class ComplianceModel {
   /// Initializes Compliance model class .
diff --git a/lib/api/response/landing_company_response_result.dart b/lib/api/response/landing_company_response_result.dart
index bd3a8c73f7..a15eeb9c38 100644
--- a/lib/api/response/landing_company_response_result.dart
+++ b/lib/api/response/landing_company_response_result.dart
@@ -130,6 +130,7 @@ enum StandardEnum {
   /// none.
   none,
 }
+
 /// Landing company model class.
 abstract class LandingCompanyModel {
   /// Initializes Landing company model class .
@@ -479,6 +480,7 @@ class LandingCompany extends LandingCompanyModel {
         virtualCompany: virtualCompany ?? this.virtualCompany,
       );
 }
+
 /// Ctrader model class.
 abstract class CtraderModel {
   /// Initializes Ctrader model class .
@@ -521,6 +523,7 @@ class Ctrader extends CtraderModel {
         all: all ?? this.all,
       );
 }
+
 /// All model class.
 abstract class AllModel {
   /// Initializes All model class .
@@ -566,6 +569,7 @@ class All extends AllModel {
         standard: standard ?? this.standard,
       );
 }
+
 /// Derivez model class.
 abstract class DerivezModel {
   /// Initializes Derivez model class .
@@ -608,6 +612,7 @@ class Derivez extends DerivezModel {
         all: all ?? this.all,
       );
 }
+
 /// Derivez all model class.
 abstract class DerivezAllModel {
   /// Initializes Derivez all model class .
@@ -653,6 +658,7 @@ class DerivezAll extends DerivezAllModel {
         standard: standard ?? this.standard,
       );
 }
+
 /// Dxtrade all company model class.
 abstract class DxtradeAllCompanyModel {
   /// Initializes Dxtrade all company model class .
@@ -698,6 +704,7 @@ class DxtradeAllCompany extends DxtradeAllCompanyModel {
         standard: standard ?? this.standard,
       );
 }
+
 /// Standard model class.
 abstract class StandardModel {
   /// Initializes Standard model class .
@@ -912,6 +919,7 @@ class Standard extends StandardModel {
         tinNotMandatory: tinNotMandatory ?? this.tinNotMandatory,
       );
 }
+
 /// Requirements model class.
 abstract class RequirementsModel {
   /// Initializes Requirements model class .
@@ -1011,6 +1019,7 @@ class Requirements extends RequirementsModel {
         withdrawal: withdrawal ?? this.withdrawal,
       );
 }
+
 /// After first deposit model class.
 abstract class AfterFirstDepositModel {
   /// Initializes After first deposit model class .
@@ -1064,6 +1073,7 @@ class AfterFirstDeposit extends AfterFirstDepositModel {
         financialAssessment: financialAssessment ?? this.financialAssessment,
       );
 }
+
 /// Compliance model class.
 abstract class ComplianceModel {
   /// Initializes Compliance model class .
@@ -1137,6 +1147,7 @@ class Compliance extends ComplianceModel {
         taxInformation: taxInformation ?? this.taxInformation,
       );
 }
+
 /// Dxtrade financial company model class.
 abstract class DxtradeFinancialCompanyModel {
   /// Initializes Dxtrade financial company model class .
@@ -1182,6 +1193,7 @@ class DxtradeFinancialCompany extends DxtradeFinancialCompanyModel {
         standard: standard ?? this.standard,
       );
 }
+
 /// Dxtrade financial company standard model class.
 abstract class DxtradeFinancialCompanyStandardModel {
   /// Initializes Dxtrade financial company standard model class .
@@ -1398,6 +1410,7 @@ class DxtradeFinancialCompanyStandard
         tinNotMandatory: tinNotMandatory ?? this.tinNotMandatory,
       );
 }
+
 /// Standard requirements model class.
 abstract class StandardRequirementsModel {
   /// Initializes Standard requirements model class .
@@ -1499,6 +1512,7 @@ class StandardRequirements extends StandardRequirementsModel {
         withdrawal: withdrawal ?? this.withdrawal,
       );
 }
+
 /// Requirements after first deposit model class.
 abstract class RequirementsAfterFirstDepositModel {
   /// Initializes Requirements after first deposit model class .
@@ -1552,6 +1566,7 @@ class RequirementsAfterFirstDeposit extends RequirementsAfterFirstDepositModel {
         financialAssessment: financialAssessment ?? this.financialAssessment,
       );
 }
+
 /// Requirements compliance model class.
 abstract class RequirementsComplianceModel {
   /// Initializes Requirements compliance model class .
@@ -1626,6 +1641,7 @@ class RequirementsCompliance extends RequirementsComplianceModel {
         taxInformation: taxInformation ?? this.taxInformation,
       );
 }
+
 /// Dxtrade gaming company model class.
 abstract class DxtradeGamingCompanyModel {
   /// Initializes Dxtrade gaming company model class .
@@ -1671,6 +1687,7 @@ class DxtradeGamingCompany extends DxtradeGamingCompanyModel {
         standard: standard ?? this.standard,
       );
 }
+
 /// Dxtrade gaming company standard model class.
 abstract class DxtradeGamingCompanyStandardModel {
   /// Initializes Dxtrade gaming company standard model class .
@@ -1886,6 +1903,7 @@ class DxtradeGamingCompanyStandard extends DxtradeGamingCompanyStandardModel {
         tinNotMandatory: tinNotMandatory ?? this.tinNotMandatory,
       );
 }
+
 /// Standard requirements16 model class.
 abstract class StandardRequirements16Model {
   /// Initializes Standard requirements16 model class .
@@ -1987,6 +2005,7 @@ class StandardRequirements16 extends StandardRequirements16Model {
         withdrawal: withdrawal ?? this.withdrawal,
       );
 }
+
 /// Requirements after first deposit14 model class.
 abstract class RequirementsAfterFirstDeposit14Model {
   /// Initializes Requirements after first deposit14 model class .
@@ -2041,6 +2060,7 @@ class RequirementsAfterFirstDeposit14
         financialAssessment: financialAssessment ?? this.financialAssessment,
       );
 }
+
 /// Requirements compliance15 model class.
 abstract class RequirementsCompliance15Model {
   /// Initializes Requirements compliance15 model class .
@@ -2115,6 +2135,7 @@ class RequirementsCompliance15 extends RequirementsCompliance15Model {
         taxInformation: taxInformation ?? this.taxInformation,
       );
 }
+
 /// Financial company model class.
 abstract class FinancialCompanyModel {
   /// Initializes Financial company model class .
@@ -2330,6 +2351,7 @@ class FinancialCompany extends FinancialCompanyModel {
         tinNotMandatory: tinNotMandatory ?? this.tinNotMandatory,
       );
 }
+
 /// Financial company requirements model class.
 abstract class FinancialCompanyRequirementsModel {
   /// Initializes Financial company requirements model class .
@@ -2431,6 +2453,7 @@ class FinancialCompanyRequirements extends FinancialCompanyRequirementsModel {
         withdrawal: withdrawal ?? this.withdrawal,
       );
 }
+
 /// Requirements after first deposit19 model class.
 abstract class RequirementsAfterFirstDeposit19Model {
   /// Initializes Requirements after first deposit19 model class .
@@ -2485,6 +2508,7 @@ class RequirementsAfterFirstDeposit19
         financialAssessment: financialAssessment ?? this.financialAssessment,
       );
 }
+
 /// Requirements compliance20 model class.
 abstract class RequirementsCompliance20Model {
   /// Initializes Requirements compliance20 model class .
@@ -2559,6 +2583,7 @@ class RequirementsCompliance20 extends RequirementsCompliance20Model {
         taxInformation: taxInformation ?? this.taxInformation,
       );
 }
+
 /// Gaming company model class.
 abstract class GamingCompanyModel {
   /// Initializes Gaming company model class .
@@ -2773,6 +2798,7 @@ class GamingCompany extends GamingCompanyModel {
         tinNotMandatory: tinNotMandatory ?? this.tinNotMandatory,
       );
 }
+
 /// Gaming company requirements model class.
 abstract class GamingCompanyRequirementsModel {
   /// Initializes Gaming company requirements model class .
@@ -2874,6 +2900,7 @@ class GamingCompanyRequirements extends GamingCompanyRequirementsModel {
         withdrawal: withdrawal ?? this.withdrawal,
       );
 }
+
 /// Requirements after first deposit23 model class.
 abstract class RequirementsAfterFirstDeposit23Model {
   /// Initializes Requirements after first deposit23 model class .
@@ -2928,6 +2955,7 @@ class RequirementsAfterFirstDeposit23
         financialAssessment: financialAssessment ?? this.financialAssessment,
       );
 }
+
 /// Requirements compliance24 model class.
 abstract class RequirementsCompliance24Model {
   /// Initializes Requirements compliance24 model class .
@@ -3002,6 +3030,7 @@ class RequirementsCompliance24 extends RequirementsCompliance24Model {
         taxInformation: taxInformation ?? this.taxInformation,
       );
 }
+
 /// Mt all company model class.
 abstract class MtAllCompanyModel {
   /// Initializes Mt all company model class .
@@ -3046,6 +3075,7 @@ class MtAllCompany extends MtAllCompanyModel {
         swapFree: swapFree ?? this.swapFree,
       );
 }
+
 /// Swap free model class.
 abstract class SwapFreeModel {
   /// Initializes Swap free model class .
@@ -3260,6 +3290,7 @@ class SwapFree extends SwapFreeModel {
         tinNotMandatory: tinNotMandatory ?? this.tinNotMandatory,
       );
 }
+
 /// Swap free requirements model class.
 abstract class SwapFreeRequirementsModel {
   /// Initializes Swap free requirements model class .
@@ -3361,6 +3392,7 @@ class SwapFreeRequirements extends SwapFreeRequirementsModel {
         withdrawal: withdrawal ?? this.withdrawal,
       );
 }
+
 /// Requirements after first deposit27 model class.
 abstract class RequirementsAfterFirstDeposit27Model {
   /// Initializes Requirements after first deposit27 model class .
@@ -3415,6 +3447,7 @@ class RequirementsAfterFirstDeposit27
         financialAssessment: financialAssessment ?? this.financialAssessment,
       );
 }
+
 /// Requirements compliance28 model class.
 abstract class RequirementsCompliance28Model {
   /// Initializes Requirements compliance28 model class .
@@ -3489,6 +3522,7 @@ class RequirementsCompliance28 extends RequirementsCompliance28Model {
         taxInformation: taxInformation ?? this.taxInformation,
       );
 }
+
 /// Mt financial company model class.
 abstract class MtFinancialCompanyModel {
   /// Initializes Mt financial company model class .
@@ -3547,6 +3581,7 @@ class MtFinancialCompany extends MtFinancialCompanyModel {
         financialStp: financialStp ?? this.financialStp,
       );
 }
+
 /// Financial model class.
 abstract class FinancialModel {
   /// Initializes Financial model class .
@@ -3761,6 +3796,7 @@ class Financial extends FinancialModel {
         tinNotMandatory: tinNotMandatory ?? this.tinNotMandatory,
       );
 }
+
 /// Financial requirements model class.
 abstract class FinancialRequirementsModel {
   /// Initializes Financial requirements model class .
@@ -3862,6 +3898,7 @@ class FinancialRequirements extends FinancialRequirementsModel {
         withdrawal: withdrawal ?? this.withdrawal,
       );
 }
+
 /// Requirements after first deposit32 model class.
 abstract class RequirementsAfterFirstDeposit32Model {
   /// Initializes Requirements after first deposit32 model class .
@@ -3916,6 +3953,7 @@ class RequirementsAfterFirstDeposit32
         financialAssessment: financialAssessment ?? this.financialAssessment,
       );
 }
+
 /// Requirements compliance33 model class.
 abstract class RequirementsCompliance33Model {
   /// Initializes Requirements compliance33 model class .
@@ -3990,6 +4028,7 @@ class RequirementsCompliance33 extends RequirementsCompliance33Model {
         taxInformation: taxInformation ?? this.taxInformation,
       );
 }
+
 /// Financial stp model class.
 abstract class FinancialStpModel {
   /// Initializes Financial stp model class .
@@ -4204,6 +4243,7 @@ class FinancialStp extends FinancialStpModel {
         tinNotMandatory: tinNotMandatory ?? this.tinNotMandatory,
       );
 }
+
 /// Financial stp requirements model class.
 abstract class FinancialStpRequirementsModel {
   /// Initializes Financial stp requirements model class .
@@ -4305,6 +4345,7 @@ class FinancialStpRequirements extends FinancialStpRequirementsModel {
         withdrawal: withdrawal ?? this.withdrawal,
       );
 }
+
 /// Requirements after first deposit36 model class.
 abstract class RequirementsAfterFirstDeposit36Model {
   /// Initializes Requirements after first deposit36 model class .
@@ -4359,6 +4400,7 @@ class RequirementsAfterFirstDeposit36
         financialAssessment: financialAssessment ?? this.financialAssessment,
       );
 }
+
 /// Requirements compliance37 model class.
 abstract class RequirementsCompliance37Model {
   /// Initializes Requirements compliance37 model class .
@@ -4433,6 +4475,7 @@ class RequirementsCompliance37 extends RequirementsCompliance37Model {
         taxInformation: taxInformation ?? this.taxInformation,
       );
 }
+
 /// Mt gaming company model class.
 abstract class MtGamingCompanyModel {
   /// Initializes Mt gaming company model class .
@@ -4478,6 +4521,7 @@ class MtGamingCompany extends MtGamingCompanyModel {
         financial: financial ?? this.financial,
       );
 }
+
 /// Mt gaming company financial model class.
 abstract class MtGamingCompanyFinancialModel {
   /// Initializes Mt gaming company financial model class .
@@ -4693,6 +4737,7 @@ class MtGamingCompanyFinancial extends MtGamingCompanyFinancialModel {
         tinNotMandatory: tinNotMandatory ?? this.tinNotMandatory,
       );
 }
+
 /// Financial requirements43 model class.
 abstract class FinancialRequirements43Model {
   /// Initializes Financial requirements43 model class .
@@ -4794,6 +4839,7 @@ class FinancialRequirements43 extends FinancialRequirements43Model {
         withdrawal: withdrawal ?? this.withdrawal,
       );
 }
+
 /// Requirements after first deposit41 model class.
 abstract class RequirementsAfterFirstDeposit41Model {
   /// Initializes Requirements after first deposit41 model class .
@@ -4848,6 +4894,7 @@ class RequirementsAfterFirstDeposit41
         financialAssessment: financialAssessment ?? this.financialAssessment,
       );
 }
+
 /// Requirements compliance42 model class.
 abstract class RequirementsCompliance42Model {
   /// Initializes Requirements compliance42 model class .
diff --git a/lib/api/response/login_history_response_result.dart b/lib/api/response/login_history_response_result.dart
index 54ee1c5706..2eb9fb0dee 100644
--- a/lib/api/response/login_history_response_result.dart
+++ b/lib/api/response/login_history_response_result.dart
@@ -87,6 +87,7 @@ class LoginHistoryResponse extends LoginHistoryResponseModel {
         loginHistory: loginHistory ?? this.loginHistory,
       );
 }
+
 /// Login history item model class.
 abstract class LoginHistoryItemModel {
   /// Initializes Login history item model class .
diff --git a/lib/api/response/mt5_get_settings_response_result.dart b/lib/api/response/mt5_get_settings_response_result.dart
index 5a2dc3d5ef..1ddc4cadcf 100644
--- a/lib/api/response/mt5_get_settings_response_result.dart
+++ b/lib/api/response/mt5_get_settings_response_result.dart
@@ -225,6 +225,7 @@ enum SubAccountTypeEnum {
   /// standard.
   standard,
 }
+
 /// Mt5 get settings model class.
 abstract class Mt5GetSettingsModel {
   /// Initializes Mt5 get settings model class .
@@ -492,6 +493,7 @@ class Mt5GetSettings extends Mt5GetSettingsModel {
         zipCode: zipCode ?? this.zipCode,
       );
 }
+
 /// Server info model class.
 abstract class ServerInfoModel {
   /// Initializes Server info model class .
@@ -559,6 +561,7 @@ class ServerInfo extends ServerInfoModel {
         id: id ?? this.id,
       );
 }
+
 /// Geolocation model class.
 abstract class GeolocationModel {
   /// Initializes Geolocation model class .
diff --git a/lib/api/response/mt5_new_account_response_result.dart b/lib/api/response/mt5_new_account_response_result.dart
index 22f8638c01..85be682226 100644
--- a/lib/api/response/mt5_new_account_response_result.dart
+++ b/lib/api/response/mt5_new_account_response_result.dart
@@ -236,6 +236,7 @@ enum Mt5AccountTypeEnum {
   /// standard.
   standard,
 }
+
 /// Mt5 new account model class.
 abstract class Mt5NewAccountModel {
   /// Initializes Mt5 new account model class .
diff --git a/lib/api/response/new_account_maltainvest_response_result.dart b/lib/api/response/new_account_maltainvest_response_result.dart
index f72578d7df..78ab79f2a5 100644
--- a/lib/api/response/new_account_maltainvest_response_result.dart
+++ b/lib/api/response/new_account_maltainvest_response_result.dart
@@ -2,7 +2,6 @@
 
 import 'package:equatable/equatable.dart';
 
-
 /// New account maltainvest response model class.
 abstract class NewAccountMaltainvestResponseModel {
   /// Initializes New account maltainvest response model class .
@@ -51,6 +50,7 @@ class NewAccountMaltainvestResponse extends NewAccountMaltainvestResponseModel {
             newAccountMaltainvest ?? this.newAccountMaltainvest,
       );
 }
+
 /// New account maltainvest model class.
 abstract class NewAccountMaltainvestModel {
   /// Initializes New account maltainvest model class .
diff --git a/lib/api/response/new_account_real_response_result.dart b/lib/api/response/new_account_real_response_result.dart
index 584f8ebbc5..c9d9e91e7f 100644
--- a/lib/api/response/new_account_real_response_result.dart
+++ b/lib/api/response/new_account_real_response_result.dart
@@ -77,6 +77,7 @@ class NewAccountRealResponse extends NewAccountRealResponseModel {
         newAccountReal: newAccountReal ?? this.newAccountReal,
       );
 }
+
 /// New account real model class.
 abstract class NewAccountRealModel {
   /// Initializes New account real model class .
diff --git a/lib/api/response/new_account_virtual_response_result.dart b/lib/api/response/new_account_virtual_response_result.dart
index f5e09cec28..05a933422f 100644
--- a/lib/api/response/new_account_virtual_response_result.dart
+++ b/lib/api/response/new_account_virtual_response_result.dart
@@ -92,6 +92,7 @@ enum TypeEnum {
   /// wallet.
   wallet,
 }
+
 /// New account virtual model class.
 abstract class NewAccountVirtualModel {
   /// Initializes New account virtual model class .
diff --git a/lib/api/response/new_account_wallet_response_result.dart b/lib/api/response/new_account_wallet_response_result.dart
index bab5e442bb..c4e33536b8 100644
--- a/lib/api/response/new_account_wallet_response_result.dart
+++ b/lib/api/response/new_account_wallet_response_result.dart
@@ -51,6 +51,7 @@ class NewAccountWalletResponse extends NewAccountWalletResponseModel {
         newAccountWallet: newAccountWallet ?? this.newAccountWallet,
       );
 }
+
 /// New account wallet model class.
 abstract class NewAccountWalletModel {
   /// Initializes New account wallet model class .
diff --git a/lib/api/response/oauth_apps_response_result.dart b/lib/api/response/oauth_apps_response_result.dart
index 1e75c1d474..be0ca74eff 100644
--- a/lib/api/response/oauth_apps_response_result.dart
+++ b/lib/api/response/oauth_apps_response_result.dart
@@ -86,6 +86,7 @@ class OauthAppsResponse extends OauthAppsResponseModel {
         oauthApps: oauthApps ?? this.oauthApps,
       );
 }
+
 /// Oauth apps item model class.
 abstract class OauthAppsItemModel {
   /// Initializes Oauth apps item model class .
diff --git a/lib/api/response/p2p_advert_info_response_result.dart b/lib/api/response/p2p_advert_info_response_result.dart
index b4cb703daf..ee7c092a01 100644
--- a/lib/api/response/p2p_advert_info_response_result.dart
+++ b/lib/api/response/p2p_advert_info_response_result.dart
@@ -17,6 +17,7 @@ import 'package:flutter_deriv_api/basic_api/generated/p2p_advert_update_receive.
 import 'package:flutter_deriv_api/basic_api/generated/p2p_advert_update_send.dart';
 import 'package:flutter_deriv_api/basic_api/generated/p2p_order_create_receive.dart';
 import 'package:flutter_deriv_api/basic_api/generated/p2p_order_create_send.dart';
+
 /// P2p advert info response model class.
 abstract class P2pAdvertInfoResponseModel {
   /// Initializes P2p advert info response model class .
@@ -375,6 +376,7 @@ enum VisibilityStatusItemEnum {
   /// advertiser_temp_ban.
   advertiserTempBan,
 }
+
 /// P2p advert info model class.
 abstract class P2pAdvertInfoModel {
   /// Initializes P2p advert info model class .
@@ -939,6 +941,7 @@ class P2pAdvertInfo extends P2pAdvertInfoModel {
         visibilityStatus: visibilityStatus ?? this.visibilityStatus,
       );
 }
+
 /// Advertiser details model class.
 abstract class AdvertiserDetailsModel {
   /// Initializes Advertiser details model class .
@@ -1107,6 +1110,7 @@ class AdvertiserDetails extends AdvertiserDetailsModel {
         totalCompletionRate: totalCompletionRate ?? this.totalCompletionRate,
       );
 }
+
 /// Payment method details property model class.
 abstract class PaymentMethodDetailsPropertyModel {
   /// Initializes Payment method details property model class .
@@ -1235,6 +1239,7 @@ class PaymentMethodDetailsProperty extends PaymentMethodDetailsPropertyModel {
         usedByOrders: usedByOrders ?? this.usedByOrders,
       );
 }
+
 /// Fields property model class.
 abstract class FieldsPropertyModel {
   /// Initializes Fields property model class .
@@ -1304,6 +1309,7 @@ class FieldsProperty extends FieldsPropertyModel {
         value: value ?? this.value,
       );
 }
+
 /// Subscription model class.
 abstract class SubscriptionModel {
   /// Initializes Subscription model class .
diff --git a/lib/api/response/p2p_advert_update_response_result.dart b/lib/api/response/p2p_advert_update_response_result.dart
index a41f4f1541..fff78714c2 100644
--- a/lib/api/response/p2p_advert_update_response_result.dart
+++ b/lib/api/response/p2p_advert_update_response_result.dart
@@ -221,6 +221,7 @@ enum VisibilityStatusItemEnum {
   /// advertiser_temp_ban.
   advertiserTempBan,
 }
+
 /// P2p advert update model class.
 abstract class P2pAdvertUpdateModel {
   /// Initializes P2p advert update model class .
@@ -745,6 +746,7 @@ class P2pAdvertUpdate extends P2pAdvertUpdateModel {
         visibilityStatus: visibilityStatus ?? this.visibilityStatus,
       );
 }
+
 /// Advertiser details model class.
 abstract class AdvertiserDetailsModel {
   /// Initializes Advertiser details model class .
@@ -886,6 +888,7 @@ class AdvertiserDetails extends AdvertiserDetailsModel {
         totalCompletionRate: totalCompletionRate ?? this.totalCompletionRate,
       );
 }
+
 /// Payment method details property model class.
 abstract class PaymentMethodDetailsPropertyModel {
   /// Initializes Payment method details property model class .
@@ -1014,6 +1017,7 @@ class PaymentMethodDetailsProperty extends PaymentMethodDetailsPropertyModel {
         usedByOrders: usedByOrders ?? this.usedByOrders,
       );
 }
+
 /// Fields property model class.
 abstract class FieldsPropertyModel {
   /// Initializes Fields property model class .
diff --git a/lib/api/response/p2p_advertiser_adverts_response_result.dart b/lib/api/response/p2p_advertiser_adverts_response_result.dart
index d7ba72e949..fb999732e8 100644
--- a/lib/api/response/p2p_advertiser_adverts_response_result.dart
+++ b/lib/api/response/p2p_advertiser_adverts_response_result.dart
@@ -184,6 +184,7 @@ enum VisibilityStatusItemEnum {
   /// advertiser_temp_ban.
   advertiserTempBan,
 }
+
 /// P2p advertiser adverts model class.
 abstract class P2pAdvertiserAdvertsModel {
   /// Initializes P2p advertiser adverts model class .
@@ -233,6 +234,7 @@ class P2pAdvertiserAdverts extends P2pAdvertiserAdvertsModel {
         list: list ?? this.list,
       );
 }
+
 /// List item model class.
 abstract class ListItemModel {
   /// Initializes List item model class .
@@ -720,6 +722,7 @@ class ListItem extends ListItemModel {
         visibilityStatus: visibilityStatus ?? this.visibilityStatus,
       );
 }
+
 /// Advertiser details model class.
 abstract class AdvertiserDetailsModel {
   /// Initializes Advertiser details model class .
diff --git a/lib/api/response/p2p_advertiser_create_response_result.dart b/lib/api/response/p2p_advertiser_create_response_result.dart
index 85b5050ace..a706852155 100644
--- a/lib/api/response/p2p_advertiser_create_response_result.dart
+++ b/lib/api/response/p2p_advertiser_create_response_result.dart
@@ -143,6 +143,7 @@ class P2pAdvertiserCreateResponse extends P2pAdvertiserCreateResponseModel {
         subscription: subscription ?? this.subscription,
       );
 }
+
 /// P2p advertiser create model class.
 abstract class P2pAdvertiserCreateModel {
   /// Initializes P2p advertiser create model class .
@@ -573,6 +574,7 @@ class P2pAdvertiserCreate extends P2pAdvertiserCreateModel {
         withdrawalLimit: withdrawalLimit ?? this.withdrawalLimit,
       );
 }
+
 /// Subscription model class.
 abstract class SubscriptionModel {
   /// Initializes Subscription model class .
diff --git a/lib/api/response/p2p_advertiser_info_response_result.dart b/lib/api/response/p2p_advertiser_info_response_result.dart
index dc9b53ae3b..628aaa52eb 100644
--- a/lib/api/response/p2p_advertiser_info_response_result.dart
+++ b/lib/api/response/p2p_advertiser_info_response_result.dart
@@ -182,6 +182,7 @@ class P2pAdvertiserInfoResponse extends P2pAdvertiserInfoResponseModel {
         subscription: subscription ?? this.subscription,
       );
 }
+
 /// P2p advertiser info model class.
 abstract class P2pAdvertiserInfoModel {
   /// Initializes P2p advertiser info model class .
@@ -711,6 +712,7 @@ class P2pAdvertiserInfo extends P2pAdvertiserInfoModel {
         withdrawalLimit: withdrawalLimit ?? this.withdrawalLimit,
       );
 }
+
 /// Block trade model class.
 abstract class BlockTradeModel {
   /// Initializes Block trade model class .
@@ -760,6 +762,7 @@ class BlockTrade extends BlockTradeModel {
         minOrderAmount: minOrderAmount ?? this.minOrderAmount,
       );
 }
+
 /// Upgradable daily limits model class.
 abstract class UpgradableDailyLimitsModel {
   /// Initializes Upgradable daily limits model class .
@@ -819,6 +822,7 @@ class UpgradableDailyLimits extends UpgradableDailyLimitsModel {
         blockTrade: blockTrade ?? this.blockTrade,
       );
 }
+
 /// Subscription model class.
 abstract class SubscriptionModel {
   /// Initializes Subscription model class .
diff --git a/lib/api/response/p2p_advertiser_list_response_result.dart b/lib/api/response/p2p_advertiser_list_response_result.dart
index 7339b167f1..a1454f6c0b 100644
--- a/lib/api/response/p2p_advertiser_list_response_result.dart
+++ b/lib/api/response/p2p_advertiser_list_response_result.dart
@@ -2,11 +2,12 @@
 
 import 'package:equatable/equatable.dart';
 
-import 'package:flutter_deriv_api/api/exceptions/exceptions.dart'; 
-import 'package:flutter_deriv_api/basic_api/generated/api.dart'; 
-import 'package:flutter_deriv_api/helpers/helpers.dart'; 
-import 'package:flutter_deriv_api/services/connection/api_manager/base_api.dart'; 
+import 'package:flutter_deriv_api/api/exceptions/exceptions.dart';
+import 'package:flutter_deriv_api/basic_api/generated/api.dart';
+import 'package:flutter_deriv_api/helpers/helpers.dart';
+import 'package:flutter_deriv_api/services/connection/api_manager/base_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
+
 /// P2p advertiser list response model class.
 abstract class P2pAdvertiserListResponseModel {
   /// Initializes P2p advertiser list response model class .
@@ -85,6 +86,7 @@ class P2pAdvertiserListResponse extends P2pAdvertiserListResponseModel {
         p2pAdvertiserList: p2pAdvertiserList ?? this.p2pAdvertiserList,
       );
 }
+
 /// P2p advertiser list model class.
 abstract class P2pAdvertiserListModel {
   /// Initializes P2p advertiser list model class .
@@ -134,6 +136,7 @@ class P2pAdvertiserList extends P2pAdvertiserListModel {
         list: list ?? this.list,
       );
 }
+
 /// List item model class.
 abstract class ListItemModel {
   /// Initializes List item model class .
diff --git a/lib/api/response/p2p_advertiser_payment_methods_response_result.dart b/lib/api/response/p2p_advertiser_payment_methods_response_result.dart
index 4fca2314aa..37b794e9da 100644
--- a/lib/api/response/p2p_advertiser_payment_methods_response_result.dart
+++ b/lib/api/response/p2p_advertiser_payment_methods_response_result.dart
@@ -2,13 +2,14 @@
 
 import 'package:equatable/equatable.dart';
 
-import 'package:flutter_deriv_api/api/exceptions/exceptions.dart'; 
-import 'package:flutter_deriv_api/api/models/base_exception_model.dart'; 
-import 'package:flutter_deriv_api/basic_api/generated/p2p_advertiser_payment_methods_receive.dart'; 
-import 'package:flutter_deriv_api/basic_api/generated/p2p_advertiser_payment_methods_send.dart'; 
-import 'package:flutter_deriv_api/helpers/helpers.dart'; 
-import 'package:flutter_deriv_api/services/connection/api_manager/base_api.dart'; 
+import 'package:flutter_deriv_api/api/exceptions/exceptions.dart';
+import 'package:flutter_deriv_api/api/models/base_exception_model.dart';
+import 'package:flutter_deriv_api/basic_api/generated/p2p_advertiser_payment_methods_receive.dart';
+import 'package:flutter_deriv_api/basic_api/generated/p2p_advertiser_payment_methods_send.dart';
+import 'package:flutter_deriv_api/helpers/helpers.dart';
+import 'package:flutter_deriv_api/services/connection/api_manager/base_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
+
 /// P2p advertiser payment methods response model class.
 abstract class P2pAdvertiserPaymentMethodsResponseModel {
   /// Initializes P2p advertiser payment methods response model class .
@@ -137,6 +138,7 @@ enum P2pAdvertiserPaymentMethodsPropertyTypeEnum {
   /// other.
   other,
 }
+
 /// P2p advertiser payment methods property model class.
 abstract class P2pAdvertiserPaymentMethodsPropertyModel {
   /// Initializes P2p advertiser payment methods property model class .
@@ -269,6 +271,7 @@ class P2pAdvertiserPaymentMethodsProperty
         usedByOrders: usedByOrders ?? this.usedByOrders,
       );
 }
+
 /// Fields property model class.
 abstract class FieldsPropertyModel {
   /// Initializes Fields property model class .
diff --git a/lib/api/response/p2p_advertiser_relations_response_result.dart b/lib/api/response/p2p_advertiser_relations_response_result.dart
index e602cd1fad..4b95940629 100644
--- a/lib/api/response/p2p_advertiser_relations_response_result.dart
+++ b/lib/api/response/p2p_advertiser_relations_response_result.dart
@@ -93,6 +93,7 @@ class P2pAdvertiserRelationsResponse
             p2pAdvertiserRelations ?? this.p2pAdvertiserRelations,
       );
 }
+
 /// P2p advertiser relations model class.
 abstract class P2pAdvertiserRelationsModel {
   /// Initializes P2p advertiser relations model class .
@@ -160,6 +161,7 @@ class P2pAdvertiserRelations extends P2pAdvertiserRelationsModel {
         favouriteAdvertisers: favouriteAdvertisers ?? this.favouriteAdvertisers,
       );
 }
+
 /// Blocked advertisers item model class.
 abstract class BlockedAdvertisersItemModel {
   /// Initializes Blocked advertisers item model class .
@@ -219,6 +221,7 @@ class BlockedAdvertisersItem extends BlockedAdvertisersItemModel {
         name: name ?? this.name,
       );
 }
+
 /// Favourite advertisers item model class.
 abstract class FavouriteAdvertisersItemModel {
   /// Initializes Favourite advertisers item model class .
diff --git a/lib/api/response/p2p_advertiser_update_response_result.dart b/lib/api/response/p2p_advertiser_update_response_result.dart
index a673845825..4f72211799 100644
--- a/lib/api/response/p2p_advertiser_update_response_result.dart
+++ b/lib/api/response/p2p_advertiser_update_response_result.dart
@@ -89,6 +89,7 @@ class P2pAdvertiserUpdateResponse extends P2pAdvertiserUpdateResponseModel {
         p2pAdvertiserUpdate: p2pAdvertiserUpdate ?? this.p2pAdvertiserUpdate,
       );
 }
+
 /// P2p advertiser update model class.
 abstract class P2pAdvertiserUpdateModel {
   /// Initializes P2p advertiser update model class .
@@ -591,6 +592,7 @@ class P2pAdvertiserUpdate extends P2pAdvertiserUpdateModel {
         withdrawalLimit: withdrawalLimit ?? this.withdrawalLimit,
       );
 }
+
 /// Block trade model class.
 abstract class BlockTradeModel {
   /// Initializes Block trade model class .
@@ -640,6 +642,7 @@ class BlockTrade extends BlockTradeModel {
         minOrderAmount: minOrderAmount ?? this.minOrderAmount,
       );
 }
+
 /// Upgradable daily limits model class.
 abstract class UpgradableDailyLimitsModel {
   /// Initializes Upgradable daily limits model class .
diff --git a/lib/api/response/p2p_chat_create_response_result.dart b/lib/api/response/p2p_chat_create_response_result.dart
index 785ceaddc0..a9d95525a8 100644
--- a/lib/api/response/p2p_chat_create_response_result.dart
+++ b/lib/api/response/p2p_chat_create_response_result.dart
@@ -89,6 +89,7 @@ class P2pChatCreateResponse extends P2pChatCreateResponseModel {
         p2pChatCreate: p2pChatCreate ?? this.p2pChatCreate,
       );
 }
+
 /// P2p chat create model class.
 abstract class P2pChatCreateModel {
   /// Initializes P2p chat create model class .
diff --git a/lib/api/response/p2p_country_list_response_result.dart b/lib/api/response/p2p_country_list_response_result.dart
index 3797582302..4460cfb482 100644
--- a/lib/api/response/p2p_country_list_response_result.dart
+++ b/lib/api/response/p2p_country_list_response_result.dart
@@ -130,6 +130,7 @@ enum PaymentMethodsPropertyTypeEnum {
   /// other.
   other,
 }
+
 /// P2p country list property model class.
 abstract class P2pCountryListPropertyModel {
   /// Initializes P2p country list property model class .
@@ -240,6 +241,7 @@ class P2pCountryListProperty extends P2pCountryListPropertyModel {
         paymentMethods: paymentMethods ?? this.paymentMethods,
       );
 }
+
 /// Payment methods property model class.
 abstract class PaymentMethodsPropertyModel {
   /// Initializes Payment methods property model class .
@@ -311,6 +313,7 @@ class PaymentMethodsProperty extends PaymentMethodsPropertyModel {
         type: type ?? this.type,
       );
 }
+
 /// Fields property model class.
 abstract class FieldsPropertyModel {
   /// Initializes Fields property model class .
diff --git a/lib/api/response/p2p_order_cancel_response_result.dart b/lib/api/response/p2p_order_cancel_response_result.dart
index 26ee394468..cb53e8a21a 100644
--- a/lib/api/response/p2p_order_cancel_response_result.dart
+++ b/lib/api/response/p2p_order_cancel_response_result.dart
@@ -99,6 +99,7 @@ enum StatusEnum {
   /// cancelled.
   cancelled,
 }
+
 /// P2p order cancel model class.
 abstract class P2pOrderCancelModel {
   /// Initializes P2p order cancel model class .
diff --git a/lib/api/response/p2p_order_confirm_response_result.dart b/lib/api/response/p2p_order_confirm_response_result.dart
index a5d0c15328..ae7d5a378e 100644
--- a/lib/api/response/p2p_order_confirm_response_result.dart
+++ b/lib/api/response/p2p_order_confirm_response_result.dart
@@ -103,6 +103,7 @@ enum StatusEnum {
   /// completed.
   completed,
 }
+
 /// P2p order confirm model class.
 abstract class P2pOrderConfirmModel {
   /// Initializes P2p order confirm model class .
diff --git a/lib/api/response/p2p_order_create_response_result.dart b/lib/api/response/p2p_order_create_response_result.dart
index a14ad33791..9093a4d6b0 100644
--- a/lib/api/response/p2p_order_create_response_result.dart
+++ b/lib/api/response/p2p_order_create_response_result.dart
@@ -199,6 +199,7 @@ enum StatusEnum {
   /// pending.
   pending,
 }
+
 /// P2p order create model class.
 abstract class P2pOrderCreateModel {
   /// Initializes P2p order create model class .
@@ -475,6 +476,7 @@ class P2pOrderCreate extends P2pOrderCreateModel {
         paymentMethodDetails: paymentMethodDetails ?? this.paymentMethodDetails,
       );
 }
+
 /// Advert details model class.
 abstract class AdvertDetailsModel {
   /// Initializes Advert details model class .
@@ -553,6 +555,7 @@ class AdvertDetails extends AdvertDetailsModel {
         paymentMethod: paymentMethod ?? this.paymentMethod,
       );
 }
+
 /// Advertiser details model class.
 abstract class AdvertiserDetailsModel {
   /// Initializes Advertiser details model class .
@@ -649,6 +652,7 @@ class AdvertiserDetails extends AdvertiserDetailsModel {
         lastOnlineTime: lastOnlineTime ?? this.lastOnlineTime,
       );
 }
+
 /// Client details model class.
 abstract class ClientDetailsModel {
   /// Initializes Client details model class .
@@ -744,6 +748,7 @@ class ClientDetails extends ClientDetailsModel {
         lastOnlineTime: lastOnlineTime ?? this.lastOnlineTime,
       );
 }
+
 /// Dispute details model class.
 abstract class DisputeDetailsModel {
   /// Initializes Dispute details model class .
@@ -793,6 +798,7 @@ class DisputeDetails extends DisputeDetailsModel {
         disputerLoginid: disputerLoginid ?? this.disputerLoginid,
       );
 }
+
 /// Payment method details property model class.
 abstract class PaymentMethodDetailsPropertyModel {
   /// Initializes Payment method details property model class .
@@ -921,6 +927,7 @@ class PaymentMethodDetailsProperty extends PaymentMethodDetailsPropertyModel {
         usedByOrders: usedByOrders ?? this.usedByOrders,
       );
 }
+
 /// Fields property model class.
 abstract class FieldsPropertyModel {
   /// Initializes Fields property model class .
@@ -991,6 +998,7 @@ class FieldsProperty extends FieldsPropertyModel {
         value: value ?? this.value,
       );
 }
+
 /// Subscription model class.
 abstract class SubscriptionModel {
   /// Initializes Subscription model class .
diff --git a/lib/api/response/p2p_order_dispute_response_result.dart b/lib/api/response/p2p_order_dispute_response_result.dart
index 55e41f6a9f..2d304b809e 100644
--- a/lib/api/response/p2p_order_dispute_response_result.dart
+++ b/lib/api/response/p2p_order_dispute_response_result.dart
@@ -151,6 +151,7 @@ enum StatusEnum {
   /// dispute-completed.
   disputeCompleted,
 }
+
 /// P2p order dispute model class.
 abstract class P2pOrderDisputeModel {
   /// Initializes P2p order dispute model class .
@@ -443,6 +444,7 @@ class P2pOrderDispute extends P2pOrderDisputeModel {
             verificationTokenExpiry ?? this.verificationTokenExpiry,
       );
 }
+
 /// Advert details model class.
 abstract class AdvertDetailsModel {
   /// Initializes Advert details model class .
@@ -521,6 +523,7 @@ class AdvertDetails extends AdvertDetailsModel {
         paymentMethod: paymentMethod ?? this.paymentMethod,
       );
 }
+
 /// Advertiser details model class.
 abstract class AdvertiserDetailsModel {
   /// Initializes Advertiser details model class .
@@ -617,6 +620,7 @@ class AdvertiserDetails extends AdvertiserDetailsModel {
         lastOnlineTime: lastOnlineTime ?? this.lastOnlineTime,
       );
 }
+
 /// Client details model class.
 abstract class ClientDetailsModel {
   /// Initializes Client details model class .
@@ -712,6 +716,7 @@ class ClientDetails extends ClientDetailsModel {
         lastOnlineTime: lastOnlineTime ?? this.lastOnlineTime,
       );
 }
+
 /// Dispute details model class.
 abstract class DisputeDetailsModel {
   /// Initializes Dispute details model class .
diff --git a/lib/api/response/p2p_order_info_response_result.dart b/lib/api/response/p2p_order_info_response_result.dart
index 95b617e039..1aa2a11698 100644
--- a/lib/api/response/p2p_order_info_response_result.dart
+++ b/lib/api/response/p2p_order_info_response_result.dart
@@ -359,6 +359,7 @@ enum StatusEnum {
   /// dispute-completed.
   disputeCompleted,
 }
+
 /// P2p order info model class.
 abstract class P2pOrderInfoModel {
   /// Initializes P2p order info model class .
@@ -721,6 +722,7 @@ class P2pOrderInfo extends P2pOrderInfoModel {
             verificationTokenExpiry ?? this.verificationTokenExpiry,
       );
 }
+
 /// Advert details model class.
 abstract class AdvertDetailsModel {
   /// Initializes Advert details model class .
@@ -799,6 +801,7 @@ class AdvertDetails extends AdvertDetailsModel {
         paymentMethod: paymentMethod ?? this.paymentMethod,
       );
 }
+
 /// Advertiser details model class.
 abstract class AdvertiserDetailsModel {
   /// Initializes Advertiser details model class .
@@ -904,6 +907,7 @@ class AdvertiserDetails extends AdvertiserDetailsModel {
         lastOnlineTime: lastOnlineTime ?? this.lastOnlineTime,
       );
 }
+
 /// Client details model class.
 abstract class ClientDetailsModel {
   /// Initializes Client details model class .
@@ -1008,6 +1012,7 @@ class ClientDetails extends ClientDetailsModel {
         lastOnlineTime: lastOnlineTime ?? this.lastOnlineTime,
       );
 }
+
 /// Dispute details model class.
 abstract class DisputeDetailsModel {
   /// Initializes Dispute details model class .
@@ -1057,6 +1062,7 @@ class DisputeDetails extends DisputeDetailsModel {
         disputerLoginid: disputerLoginid ?? this.disputerLoginid,
       );
 }
+
 /// Payment method details property model class.
 abstract class PaymentMethodDetailsPropertyModel {
   /// Initializes Payment method details property model class .
@@ -1185,6 +1191,7 @@ class PaymentMethodDetailsProperty extends PaymentMethodDetailsPropertyModel {
         usedByOrders: usedByOrders ?? this.usedByOrders,
       );
 }
+
 /// Fields property model class.
 abstract class FieldsPropertyModel {
   /// Initializes Fields property model class .
@@ -1255,6 +1262,7 @@ class FieldsProperty extends FieldsPropertyModel {
         value: value ?? this.value,
       );
 }
+
 /// Review details model class.
 abstract class ReviewDetailsModel {
   /// Initializes Review details model class .
@@ -1313,6 +1321,7 @@ class ReviewDetails extends ReviewDetailsModel {
         recommended: recommended ?? this.recommended,
       );
 }
+
 /// Subscription model class.
 abstract class SubscriptionModel {
   /// Initializes Subscription model class .
diff --git a/lib/api/response/p2p_order_list_response_result.dart b/lib/api/response/p2p_order_list_response_result.dart
index 3cc71ac3e3..c3436e936d 100644
--- a/lib/api/response/p2p_order_list_response_result.dart
+++ b/lib/api/response/p2p_order_list_response_result.dart
@@ -234,6 +234,7 @@ enum StatusEnum {
   /// dispute-completed.
   disputeCompleted,
 }
+
 /// P2p order list model class.
 abstract class P2pOrderListModel {
   /// Initializes P2p order list model class .
@@ -282,6 +283,7 @@ class P2pOrderList extends P2pOrderListModel {
         list: list ?? this.list,
       );
 }
+
 /// List item model class.
 abstract class ListItemModel {
   /// Initializes List item model class .
@@ -628,6 +630,7 @@ class ListItem extends ListItemModel {
             verificationTokenExpiry ?? this.verificationTokenExpiry,
       );
 }
+
 /// Advert details model class.
 abstract class AdvertDetailsModel {
   /// Initializes Advert details model class .
@@ -706,6 +709,7 @@ class AdvertDetails extends AdvertDetailsModel {
         paymentMethod: paymentMethod ?? this.paymentMethod,
       );
 }
+
 /// Advertiser details model class.
 abstract class AdvertiserDetailsModel {
   /// Initializes Advertiser details model class .
@@ -811,6 +815,7 @@ class AdvertiserDetails extends AdvertiserDetailsModel {
         lastOnlineTime: lastOnlineTime ?? this.lastOnlineTime,
       );
 }
+
 /// Dispute details model class.
 abstract class DisputeDetailsModel {
   /// Initializes Dispute details model class .
@@ -860,6 +865,7 @@ class DisputeDetails extends DisputeDetailsModel {
         disputerLoginid: disputerLoginid ?? this.disputerLoginid,
       );
 }
+
 /// Client details model class.
 abstract class ClientDetailsModel {
   /// Initializes Client details model class .
@@ -964,6 +970,7 @@ class ClientDetails extends ClientDetailsModel {
         lastOnlineTime: lastOnlineTime ?? this.lastOnlineTime,
       );
 }
+
 /// Review details model class.
 abstract class ReviewDetailsModel {
   /// Initializes Review details model class .
@@ -1022,6 +1029,7 @@ class ReviewDetails extends ReviewDetailsModel {
         recommended: recommended ?? this.recommended,
       );
 }
+
 /// Subscription model class.
 abstract class SubscriptionModel {
   /// Initializes Subscription model class .
diff --git a/lib/api/response/p2p_order_review_response_result.dart b/lib/api/response/p2p_order_review_response_result.dart
index 4e26bc16dc..51ba1ff4d2 100644
--- a/lib/api/response/p2p_order_review_response_result.dart
+++ b/lib/api/response/p2p_order_review_response_result.dart
@@ -88,6 +88,7 @@ class P2pOrderReviewResponse extends P2pOrderReviewResponseModel {
         p2pOrderReview: p2pOrderReview ?? this.p2pOrderReview,
       );
 }
+
 /// P2p order review model class.
 abstract class P2pOrderReviewModel {
   /// Initializes P2p order review model class .
diff --git a/lib/api/response/p2p_payment_methods_response_result.dart b/lib/api/response/p2p_payment_methods_response_result.dart
index 651cf997df..1389bb77af 100644
--- a/lib/api/response/p2p_payment_methods_response_result.dart
+++ b/lib/api/response/p2p_payment_methods_response_result.dart
@@ -121,6 +121,7 @@ enum P2pPaymentMethodsPropertyTypeEnum {
   /// other.
   other,
 }
+
 /// P2p payment methods property model class.
 abstract class P2pPaymentMethodsPropertyModel {
   /// Initializes P2p payment methods property model class .
@@ -189,6 +190,7 @@ class P2pPaymentMethodsProperty extends P2pPaymentMethodsPropertyModel {
         type: type ?? this.type,
       );
 }
+
 /// Fields property model class.
 abstract class FieldsPropertyModel {
   /// Initializes Fields property model class .
diff --git a/lib/api/response/p2p_settings_response_result.dart b/lib/api/response/p2p_settings_response_result.dart
index d6d15e6ce1..817bf33f3c 100644
--- a/lib/api/response/p2p_settings_response_result.dart
+++ b/lib/api/response/p2p_settings_response_result.dart
@@ -105,6 +105,7 @@ enum FloatRateAdvertsEnum {
   /// list_only.
   listOnly,
 }
+
 /// P2p settings model class.
 abstract class P2pSettingsModel {
   /// Initializes P2p settings model class .
@@ -390,6 +391,7 @@ class P2pSettings extends P2pSettingsModel {
         overrideExchangeRate: overrideExchangeRate ?? this.overrideExchangeRate,
       );
 }
+
 /// Block trade model class.
 abstract class BlockTradeModel {
   /// Initializes Block trade model class .
@@ -439,6 +441,7 @@ class BlockTrade extends BlockTradeModel {
         maximumAdvertAmount: maximumAdvertAmount ?? this.maximumAdvertAmount,
       );
 }
+
 /// Local currencies item model class.
 abstract class LocalCurrenciesItemModel {
   /// Initializes Local currencies item model class .
@@ -507,6 +510,7 @@ class LocalCurrenciesItem extends LocalCurrenciesItemModel {
         isDefault: isDefault ?? this.isDefault,
       );
 }
+
 /// Counterparty term steps model class.
 abstract class CounterpartyTermStepsModel {
   /// Initializes Counterparty term steps model class .
@@ -592,6 +596,7 @@ class CounterpartyTermSteps extends CounterpartyTermStepsModel {
         rating: rating ?? this.rating,
       );
 }
+
 /// Subscription model class.
 abstract class SubscriptionModel {
   /// Initializes Subscription model class .
diff --git a/lib/api/response/passkeys_login_response_result.dart b/lib/api/response/passkeys_login_response_result.dart
index 4ca8ffa84b..da458fa7f9 100644
--- a/lib/api/response/passkeys_login_response_result.dart
+++ b/lib/api/response/passkeys_login_response_result.dart
@@ -51,6 +51,7 @@ class PasskeysLoginResponse extends PasskeysLoginResponseModel {
         passkeysLogin: passkeysLogin ?? this.passkeysLogin,
       );
 }
+
 /// Passkeys login model class.
 abstract class PasskeysLoginModel {
   /// Initializes Passkeys login model class .
diff --git a/lib/api/response/payment_methods_response_result.dart b/lib/api/response/payment_methods_response_result.dart
index c93613160c..0d1f9e18d1 100644
--- a/lib/api/response/payment_methods_response_result.dart
+++ b/lib/api/response/payment_methods_response_result.dart
@@ -83,6 +83,7 @@ class PaymentMethodsResponse extends PaymentMethodsResponseModel {
         paymentMethods: paymentMethods ?? this.paymentMethods,
       );
 }
+
 /// Payment methods item model class.
 abstract class PaymentMethodsItemModel {
   /// Initializes Payment methods item model class .
@@ -262,6 +263,7 @@ class PaymentMethodsItem extends PaymentMethodsItemModel {
         withdrawalTime: withdrawalTime ?? this.withdrawalTime,
       );
 }
+
 /// Deposit limits property model class.
 abstract class DepositLimitsPropertyModel {
   /// Initializes Deposit limits property model class .
@@ -312,6 +314,7 @@ class DepositLimitsProperty extends DepositLimitsPropertyModel {
         min: min ?? this.min,
       );
 }
+
 /// Withdraw limits property model class.
 abstract class WithdrawLimitsPropertyModel {
   /// Initializes Withdraw limits property model class .
diff --git a/lib/api/response/paymentagent_create_response_result.dart b/lib/api/response/paymentagent_create_response_result.dart
index 621bf0e57b..c1d5f45bad 100644
--- a/lib/api/response/paymentagent_create_response_result.dart
+++ b/lib/api/response/paymentagent_create_response_result.dart
@@ -1,3 +1 @@
 // ignore_for_file: prefer_single_quotes, unnecessary_import, unused_import
-
-
diff --git a/lib/api/response/paymentagent_details_response_result.dart b/lib/api/response/paymentagent_details_response_result.dart
index 9f54ad73b7..d7839924de 100644
--- a/lib/api/response/paymentagent_details_response_result.dart
+++ b/lib/api/response/paymentagent_details_response_result.dart
@@ -3,6 +3,7 @@
 import 'package:equatable/equatable.dart';
 
 import 'package:flutter_deriv_api/helpers/helpers.dart';
+
 /// Paymentagent details response model class.
 abstract class PaymentagentDetailsResponseModel {
   /// Initializes Paymentagent details response model class .
@@ -50,6 +51,7 @@ class PaymentagentDetailsResponse extends PaymentagentDetailsResponseModel {
         paymentagentDetails: paymentagentDetails ?? this.paymentagentDetails,
       );
 }
+
 /// Paymentagent details model class.
 abstract class PaymentagentDetailsModel {
   /// Initializes Paymentagent details model class .
@@ -294,6 +296,7 @@ class PaymentagentDetails extends PaymentagentDetailsModel {
         urls: urls ?? this.urls,
       );
 }
+
 /// Phone numbers item model class.
 abstract class PhoneNumbersItemModel {
   /// Initializes Phone numbers item model class .
@@ -335,6 +338,7 @@ class PhoneNumbersItem extends PhoneNumbersItemModel {
         phoneNumber: phoneNumber ?? this.phoneNumber,
       );
 }
+
 /// Supported payment methods item model class.
 abstract class SupportedPaymentMethodsItemModel {
   /// Initializes Supported payment methods item model class .
@@ -376,6 +380,7 @@ class SupportedPaymentMethodsItem extends SupportedPaymentMethodsItemModel {
         paymentMethod: paymentMethod ?? this.paymentMethod,
       );
 }
+
 /// Urls item model class.
 abstract class UrlsItemModel {
   /// Initializes Urls item model class .
diff --git a/lib/api/response/paymentagent_list_response_result.dart b/lib/api/response/paymentagent_list_response_result.dart
index cdc5822ffc..cc5a82ca45 100644
--- a/lib/api/response/paymentagent_list_response_result.dart
+++ b/lib/api/response/paymentagent_list_response_result.dart
@@ -77,6 +77,7 @@ class PaymentagentListResponse extends PaymentagentListResponseModel {
         paymentagentList: paymentagentList ?? this.paymentagentList,
       );
 }
+
 /// Paymentagent list model class.
 abstract class PaymentagentListModel {
   /// Initializes Paymentagent list model class .
@@ -156,6 +157,7 @@ class PaymentagentList extends PaymentagentListModel {
         availableCountries: availableCountries ?? this.availableCountries,
       );
 }
+
 /// List item model class.
 abstract class ListItemModel {
   /// Initializes List item model class .
@@ -332,6 +334,7 @@ class ListItem extends ListItemModel {
         minWithdrawal: minWithdrawal ?? this.minWithdrawal,
       );
 }
+
 /// Phone numbers item model class.
 abstract class PhoneNumbersItemModel {
   /// Initializes Phone numbers item model class .
@@ -373,6 +376,7 @@ class PhoneNumbersItem extends PhoneNumbersItemModel {
         phoneNumber: phoneNumber ?? this.phoneNumber,
       );
 }
+
 /// Supported payment methods item model class.
 abstract class SupportedPaymentMethodsItemModel {
   /// Initializes Supported payment methods item model class .
@@ -414,6 +418,7 @@ class SupportedPaymentMethodsItem extends SupportedPaymentMethodsItemModel {
         paymentMethod: paymentMethod ?? this.paymentMethod,
       );
 }
+
 /// Urls item model class.
 abstract class UrlsItemModel {
   /// Initializes Urls item model class .
diff --git a/lib/api/response/portfolio_response_result.dart b/lib/api/response/portfolio_response_result.dart
index b519748208..5e395e5ca6 100644
--- a/lib/api/response/portfolio_response_result.dart
+++ b/lib/api/response/portfolio_response_result.dart
@@ -74,6 +74,7 @@ class PortfolioResponse extends PortfolioResponseModel {
         portfolio: portfolio ?? this.portfolio,
       );
 }
+
 /// Portfolio model class.
 abstract class PortfolioModel {
   /// Initializes Portfolio model class .
@@ -122,6 +123,7 @@ class Portfolio extends PortfolioModel {
         contracts: contracts ?? this.contracts,
       );
 }
+
 /// Contracts item model class.
 abstract class ContractsItemModel {
   /// Initializes Contracts item model class .
diff --git a/lib/api/response/profit_table_response_result.dart b/lib/api/response/profit_table_response_result.dart
index fd855dcb63..06ac7bdf68 100644
--- a/lib/api/response/profit_table_response_result.dart
+++ b/lib/api/response/profit_table_response_result.dart
@@ -9,6 +9,7 @@ import 'package:flutter_deriv_api/basic_api/generated/profit_table_send.dart';
 import 'package:flutter_deriv_api/helpers/helpers.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/base_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
+
 /// Profit table response model class.
 abstract class ProfitTableResponseModel {
   /// Initializes Profit table response model class .
@@ -74,6 +75,7 @@ class ProfitTableResponse extends ProfitTableResponseModel {
         profitTable: profitTable ?? this.profitTable,
       );
 }
+
 /// Profit table model class.
 abstract class ProfitTableModel {
   /// Initializes Profit table model class .
@@ -135,6 +137,7 @@ class ProfitTable extends ProfitTableModel {
         transactions: transactions ?? this.transactions,
       );
 }
+
 /// Transactions item model class.
 abstract class TransactionsItemModel {
   /// Initializes Transactions item model class .
diff --git a/lib/api/response/proposal_open_contract_response_result.dart b/lib/api/response/proposal_open_contract_response_result.dart
index d13095390b..99e37ca790 100644
--- a/lib/api/response/proposal_open_contract_response_result.dart
+++ b/lib/api/response/proposal_open_contract_response_result.dart
@@ -20,6 +20,7 @@ import 'package:flutter_deriv_api/helpers/helpers.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/base_api.dart';
 import 'package:flutter_deriv_api/services/connection/call_manager/base_call_manager.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
+
 /// Proposal open contract response model class.
 abstract class ProposalOpenContractResponseModel {
   /// Initializes Proposal open contract response model class .
@@ -212,6 +213,7 @@ enum StatusEnum {
   /// null.
   _null,
 }
+
 /// Proposal open contract model class.
 abstract class ProposalOpenContractModel {
   /// Initializes Proposal open contract model class .
@@ -922,6 +924,7 @@ class ProposalOpenContract extends ProposalOpenContractModel {
         validationErrorCode: validationErrorCode ?? this.validationErrorCode,
       );
 }
+
 /// Audit details model class.
 abstract class AuditDetailsModel {
   /// Initializes Audit details model class .
@@ -1016,6 +1019,7 @@ class AuditDetails extends AuditDetailsModel {
         contractStart: contractStart ?? this.contractStart,
       );
 }
+
 /// All ticks item model class.
 abstract class AllTicksItemModel {
   /// Initializes All ticks item model class .
@@ -1092,6 +1096,7 @@ class AllTicksItem extends AllTicksItemModel {
         tickDisplayValue: tickDisplayValue ?? this.tickDisplayValue,
       );
 }
+
 /// Contract end item model class.
 abstract class ContractEndItemModel {
   /// Initializes Contract end item model class .
@@ -1169,6 +1174,7 @@ class ContractEndItem extends ContractEndItemModel {
         tickDisplayValue: tickDisplayValue ?? this.tickDisplayValue,
       );
 }
+
 /// Contract start item model class.
 abstract class ContractStartItemModel {
   /// Initializes Contract start item model class .
@@ -1246,6 +1252,7 @@ class ContractStartItem extends ContractStartItemModel {
         tickDisplayValue: tickDisplayValue ?? this.tickDisplayValue,
       );
 }
+
 /// Cancellation model class.
 abstract class CancellationModel extends Equatable {
   /// Initializes Cancellation model class .
@@ -1302,6 +1309,7 @@ class Cancellation extends CancellationModel {
         dateExpiry,
       ];
 }
+
 /// Limit order model class.
 abstract class LimitOrderModel extends Equatable {
   /// Initializes Limit order model class .
@@ -1380,6 +1388,7 @@ class LimitOrder extends LimitOrderModel {
         takeProfit,
       ];
 }
+
 /// Stop loss model class.
 abstract class StopLossModel extends Equatable {
   /// Initializes Stop loss model class .
@@ -1454,6 +1463,7 @@ class StopLoss extends StopLossModel {
         orderAmount,
       ];
 }
+
 /// Stop out model class.
 abstract class StopOutModel extends Equatable {
   /// Initializes Stop out model class .
@@ -1528,6 +1538,7 @@ class StopOut extends StopOutModel {
         orderAmount,
       ];
 }
+
 /// Take profit model class.
 abstract class TakeProfitModel extends Equatable {
   /// Initializes Take profit model class .
@@ -1602,6 +1613,7 @@ class TakeProfit extends TakeProfitModel {
         orderAmount,
       ];
 }
+
 /// Tick stream item model class.
 abstract class TickStreamItemModel {
   /// Initializes Tick stream item model class .
@@ -1660,6 +1672,7 @@ class TickStreamItem extends TickStreamItemModel {
         tickDisplayValue: tickDisplayValue ?? this.tickDisplayValue,
       );
 }
+
 /// Transaction ids model class.
 abstract class TransactionIdsModel {
   /// Initializes Transaction ids model class .
@@ -1709,6 +1722,7 @@ class TransactionIds extends TransactionIdsModel {
         sell: sell ?? this.sell,
       );
 }
+
 /// Subscription model class.
 abstract class SubscriptionModel {
   /// Initializes Subscription model class .
diff --git a/lib/api/response/proposal_response_result.dart b/lib/api/response/proposal_response_result.dart
index 37124d8d5d..175c3a8013 100644
--- a/lib/api/response/proposal_response_result.dart
+++ b/lib/api/response/proposal_response_result.dart
@@ -179,6 +179,7 @@ class ProposalResponse extends ProposalResponseModel {
         subscription: subscription ?? this.subscription,
       );
 }
+
 /// Proposal model class.
 abstract class ProposalModel extends Equatable {
   /// Initializes Proposal model class .
@@ -418,6 +419,7 @@ class Proposal extends ProposalModel {
         limitOrder,
       ];
 }
+
 /// Cancellation model class.
 abstract class CancellationModel extends Equatable {
   /// Initializes Cancellation model class .
@@ -474,6 +476,7 @@ class Cancellation extends CancellationModel {
         dateExpiry,
       ];
 }
+
 /// Contract details model class.
 abstract class ContractDetailsModel {
   /// Initializes Contract details model class .
@@ -599,6 +602,7 @@ class ContractDetails extends ContractDetailsModel {
         ticksStayedIn: ticksStayedIn ?? this.ticksStayedIn,
       );
 }
+
 /// Limit order model class.
 abstract class LimitOrderModel extends Equatable {
   /// Initializes Limit order model class .
@@ -677,6 +681,7 @@ class LimitOrder extends LimitOrderModel {
         takeProfit,
       ];
 }
+
 /// Stop loss model class.
 abstract class StopLossModel extends Equatable {
   /// Initializes Stop loss model class .
@@ -751,6 +756,7 @@ class StopLoss extends StopLossModel {
         orderAmount,
       ];
 }
+
 /// Stop out model class.
 abstract class StopOutModel extends Equatable {
   /// Initializes Stop out model class .
@@ -825,6 +831,7 @@ class StopOut extends StopOutModel {
         orderAmount,
       ];
 }
+
 /// Take profit model class.
 abstract class TakeProfitModel extends Equatable {
   /// Initializes Take profit model class .
@@ -899,6 +906,7 @@ class TakeProfit extends TakeProfitModel {
         orderAmount,
       ];
 }
+
 /// Subscription model class.
 abstract class SubscriptionModel {
   /// Initializes Subscription model class .
diff --git a/lib/api/response/reality_check_response_result.dart b/lib/api/response/reality_check_response_result.dart
index bf35c30235..6ad80d9fda 100644
--- a/lib/api/response/reality_check_response_result.dart
+++ b/lib/api/response/reality_check_response_result.dart
@@ -81,6 +81,7 @@ class RealityCheckResponse extends RealityCheckResponseModel {
         realityCheck: realityCheck ?? this.realityCheck,
       );
 }
+
 /// Reality check model class.
 abstract class RealityCheckModel {
   /// Initializes Reality check model class .
diff --git a/lib/api/response/request_report_response_result.dart b/lib/api/response/request_report_response_result.dart
index c3ecfc8376..3d81f2117a 100644
--- a/lib/api/response/request_report_response_result.dart
+++ b/lib/api/response/request_report_response_result.dart
@@ -51,6 +51,7 @@ class RequestReportResponse extends RequestReportResponseModel {
         requestReport: requestReport ?? this.requestReport,
       );
 }
+
 /// Request report model class.
 abstract class RequestReportModel {
   /// Initializes Request report model class .
diff --git a/lib/api/response/residence_list_response_result.dart b/lib/api/response/residence_list_response_result.dart
index 81bd209701..3e109edbeb 100644
--- a/lib/api/response/residence_list_response_result.dart
+++ b/lib/api/response/residence_list_response_result.dart
@@ -86,6 +86,7 @@ class ResidenceListResponse extends ResidenceListResponseModel {
         residenceList: residenceList ?? this.residenceList,
       );
 }
+
 /// Residence list item model class.
 abstract class ResidenceListItemModel {
   /// Initializes Residence list item model class .
@@ -197,6 +198,7 @@ class ResidenceListItem extends ResidenceListItemModel {
         value: value ?? this.value,
       );
 }
+
 /// Identity model class.
 abstract class IdentityModel {
   /// Initializes Identity model class .
@@ -241,6 +243,7 @@ class Identity extends IdentityModel {
         services: services ?? this.services,
       );
 }
+
 /// Services model class.
 abstract class ServicesModel {
   /// Initializes Services model class .
@@ -294,6 +297,7 @@ class Services extends ServicesModel {
         onfido: onfido ?? this.onfido,
       );
 }
+
 /// Idv model class.
 abstract class IdvModel {
   /// Initializes Idv model class .
@@ -360,6 +364,7 @@ class Idv extends IdvModel {
         isCountrySupported: isCountrySupported ?? this.isCountrySupported,
       );
 }
+
 /// Documents supported property model class.
 abstract class DocumentsSupportedPropertyModel {
   /// Initializes Documents supported property model class .
@@ -423,6 +428,7 @@ class DocumentsSupportedProperty extends DocumentsSupportedPropertyModel {
         format: format ?? this.format,
       );
 }
+
 /// Additional model class.
 abstract class AdditionalModel {
   /// Initializes Additional model class .
@@ -472,6 +478,7 @@ class Additional extends AdditionalModel {
         format: format ?? this.format,
       );
 }
+
 /// Onfido model class.
 abstract class OnfidoModel {
   /// Initializes Onfido model class .
@@ -533,6 +540,7 @@ class Onfido extends OnfidoModel {
         isCountrySupported: isCountrySupported ?? this.isCountrySupported,
       );
 }
+
 /// Documents supported documents supported property model class.
 abstract class DocumentsSupportedDocumentsSupportedPropertyModel {
   /// Initializes Documents supported documents supported property model class .
diff --git a/lib/api/response/sell_contract_for_multiple_accounts_response_result.dart b/lib/api/response/sell_contract_for_multiple_accounts_response_result.dart
index 9823461f00..0c49fb55d7 100644
--- a/lib/api/response/sell_contract_for_multiple_accounts_response_result.dart
+++ b/lib/api/response/sell_contract_for_multiple_accounts_response_result.dart
@@ -2,7 +2,6 @@
 
 import 'package:equatable/equatable.dart';
 
-
 /// Sell contract for multiple accounts response model class.
 abstract class SellContractForMultipleAccountsResponseModel {
   /// Initializes Sell contract for multiple accounts response model class .
@@ -55,6 +54,7 @@ class SellContractForMultipleAccountsResponse
             this.sellContractForMultipleAccounts,
       );
 }
+
 /// Sell contract for multiple accounts model class.
 abstract class SellContractForMultipleAccountsModel {
   /// Initializes Sell contract for multiple accounts model class .
diff --git a/lib/api/response/sell_expired_response_result.dart b/lib/api/response/sell_expired_response_result.dart
index e84c287b30..9d1f35178b 100644
--- a/lib/api/response/sell_expired_response_result.dart
+++ b/lib/api/response/sell_expired_response_result.dart
@@ -2,7 +2,6 @@
 
 import 'package:equatable/equatable.dart';
 
-
 /// Sell expired response model class.
 abstract class SellExpiredResponseModel {
   /// Initializes Sell expired response model class .
@@ -50,6 +49,7 @@ class SellExpiredResponse extends SellExpiredResponseModel {
         sellExpired: sellExpired ?? this.sellExpired,
       );
 }
+
 /// Sell expired model class.
 abstract class SellExpiredModel {
   /// Initializes Sell expired model class .
diff --git a/lib/api/response/sell_response_result.dart b/lib/api/response/sell_response_result.dart
index 539c2770e3..51811c0e43 100644
--- a/lib/api/response/sell_response_result.dart
+++ b/lib/api/response/sell_response_result.dart
@@ -94,6 +94,7 @@ class SellResponse extends SellResponseModel {
         sell: sell ?? this.sell,
       );
 }
+
 /// Sell model class.
 abstract class SellModel {
   /// Initializes Sell model class .
diff --git a/lib/api/response/service_token_response_result.dart b/lib/api/response/service_token_response_result.dart
index 89450d7139..3c75573cb6 100644
--- a/lib/api/response/service_token_response_result.dart
+++ b/lib/api/response/service_token_response_result.dart
@@ -92,6 +92,7 @@ class ServiceTokenResponse extends ServiceTokenResponseModel {
         serviceToken: serviceToken ?? this.serviceToken,
       );
 }
+
 /// Service token model class.
 abstract class ServiceTokenModel {
   /// Initializes Service token model class .
@@ -205,6 +206,7 @@ class ServiceToken extends ServiceTokenModel {
         wyre: wyre ?? this.wyre,
       );
 }
+
 /// Banxa model class.
 abstract class BanxaModel {
   /// Initializes Banxa model class .
@@ -263,6 +265,7 @@ class Banxa extends BanxaModel {
         urlIframe: urlIframe ?? this.urlIframe,
       );
 }
+
 /// Ctrader model class.
 abstract class CtraderModel {
   /// Initializes Ctrader model class .
@@ -303,6 +306,7 @@ class Ctrader extends CtraderModel {
         token: token ?? this.token,
       );
 }
+
 /// Dxtrade model class.
 abstract class DxtradeModel {
   /// Initializes Dxtrade model class .
@@ -343,6 +347,7 @@ class Dxtrade extends DxtradeModel {
         token: token ?? this.token,
       );
 }
+
 /// Onfido model class.
 abstract class OnfidoModel {
   /// Initializes Onfido model class .
@@ -383,6 +388,7 @@ class Onfido extends OnfidoModel {
         token: token ?? this.token,
       );
 }
+
 /// Pandats model class.
 abstract class PandatsModel {
   /// Initializes Pandats model class .
@@ -423,6 +429,7 @@ class Pandats extends PandatsModel {
         token: token ?? this.token,
       );
 }
+
 /// Sendbird model class.
 abstract class SendbirdModel {
   /// Initializes Sendbird model class .
@@ -481,6 +488,7 @@ class Sendbird extends SendbirdModel {
         token: token ?? this.token,
       );
 }
+
 /// Wyre model class.
 abstract class WyreModel {
   /// Initializes Wyre model class .
diff --git a/lib/api/response/set_financial_assessment_response_result.dart b/lib/api/response/set_financial_assessment_response_result.dart
index 3c210ccf5a..36a57eca17 100644
--- a/lib/api/response/set_financial_assessment_response_result.dart
+++ b/lib/api/response/set_financial_assessment_response_result.dart
@@ -83,6 +83,7 @@ class SetFinancialAssessmentResponse
             setFinancialAssessment ?? this.setFinancialAssessment,
       );
 }
+
 /// Set financial assessment model class.
 abstract class SetFinancialAssessmentModel {
   /// Initializes Set financial assessment model class .
diff --git a/lib/api/response/statement_response_result.dart b/lib/api/response/statement_response_result.dart
index c4fff2da2b..e9a0be1099 100644
--- a/lib/api/response/statement_response_result.dart
+++ b/lib/api/response/statement_response_result.dart
@@ -118,6 +118,7 @@ enum ActionTypeEnum {
   /// transfer.
   transfer,
 }
+
 /// Statement model class.
 abstract class StatementModel {
   /// Initializes Statement model class .
@@ -179,6 +180,7 @@ class Statement extends StatementModel {
         transactions: transactions ?? this.transactions,
       );
 }
+
 /// Transactions item model class.
 abstract class TransactionsItemModel {
   /// Initializes Transactions item model class .
@@ -367,6 +369,7 @@ class TransactionsItem extends TransactionsItemModel {
         withdrawalDetails: withdrawalDetails ?? this.withdrawalDetails,
       );
 }
+
 /// Fees model class.
 abstract class FeesModel {
   /// Initializes Fees model class .
@@ -434,6 +437,7 @@ class Fees extends FeesModel {
         percentage: percentage ?? this.percentage,
       );
 }
+
 /// From model class.
 abstract class FromModel {
   /// Initializes From model class .
@@ -474,6 +478,7 @@ class From extends FromModel {
         loginid: loginid ?? this.loginid,
       );
 }
+
 /// To model class.
 abstract class ToModel {
   /// Initializes To model class .
diff --git a/lib/api/response/states_list_response_result.dart b/lib/api/response/states_list_response_result.dart
index 7eb78d692a..a4baee8616 100644
--- a/lib/api/response/states_list_response_result.dart
+++ b/lib/api/response/states_list_response_result.dart
@@ -83,6 +83,7 @@ class StatesListResponse extends StatesListResponseModel {
         statesList: statesList ?? this.statesList,
       );
 }
+
 /// States list item model class.
 abstract class StatesListItemModel {
   /// Initializes States list item model class .
diff --git a/lib/api/response/ticks_history_response_result.dart b/lib/api/response/ticks_history_response_result.dart
index ac19b17778..9049bd5c1b 100644
--- a/lib/api/response/ticks_history_response_result.dart
+++ b/lib/api/response/ticks_history_response_result.dart
@@ -185,6 +185,7 @@ class TicksHistoryResponse extends TicksHistoryResponseModel {
         subscription: subscription ?? this.subscription,
       );
 }
+
 /// Candles item model class.
 abstract class CandlesItemModel {
   /// Initializes Candles item model class .
@@ -261,6 +262,7 @@ class CandlesItem extends CandlesItemModel {
         open: open ?? this.open,
       );
 }
+
 /// History model class.
 abstract class HistoryModel {
   /// Initializes History model class .
@@ -334,6 +336,7 @@ class History extends HistoryModel {
         times: times ?? this.times,
       );
 }
+
 /// Subscription model class.
 abstract class SubscriptionModel {
   /// Initializes Subscription model class .
diff --git a/lib/api/response/ticks_response_result.dart b/lib/api/response/ticks_response_result.dart
index 4c1fa3a488..cfd5319702 100644
--- a/lib/api/response/ticks_response_result.dart
+++ b/lib/api/response/ticks_response_result.dart
@@ -118,6 +118,7 @@ class TicksResponse extends TicksResponseModel {
         subscription: subscription ?? this.subscription,
       );
 }
+
 /// Tick model class.
 abstract class TickModel {
   /// Initializes Tick model class .
@@ -212,6 +213,7 @@ class Tick extends TickModel {
         symbol: symbol ?? this.symbol,
       );
 }
+
 /// Subscription model class.
 abstract class SubscriptionModel {
   /// Initializes Subscription model class .
diff --git a/lib/api/response/topup_virtual_response_result.dart b/lib/api/response/topup_virtual_response_result.dart
index 30734ab493..42393cfec2 100644
--- a/lib/api/response/topup_virtual_response_result.dart
+++ b/lib/api/response/topup_virtual_response_result.dart
@@ -79,6 +79,7 @@ class TopupVirtualResponse extends TopupVirtualResponseModel {
         topupVirtual: topupVirtual ?? this.topupVirtual,
       );
 }
+
 /// Topup virtual model class.
 abstract class TopupVirtualModel {
   /// Initializes Topup virtual model class .
diff --git a/lib/api/response/trading_durations_response_result.dart b/lib/api/response/trading_durations_response_result.dart
index c6e112eaf5..6cb65d2470 100644
--- a/lib/api/response/trading_durations_response_result.dart
+++ b/lib/api/response/trading_durations_response_result.dart
@@ -86,6 +86,7 @@ class TradingDurationsResponse extends TradingDurationsResponseModel {
         tradingDurations: tradingDurations ?? this.tradingDurations,
       );
 }
+
 /// Trading durations item model class.
 abstract class TradingDurationsItemModel {
   /// Initializes Trading durations item model class .
@@ -165,6 +166,7 @@ class TradingDurationsItem extends TradingDurationsItemModel {
         submarket: submarket ?? this.submarket,
       );
 }
+
 /// Data item model class.
 abstract class DataItemModel {
   /// Initializes Data item model class .
@@ -262,6 +264,7 @@ class DataItem extends DataItemModel {
         tradeDurations: tradeDurations ?? this.tradeDurations,
       );
 }
+
 /// Market model class.
 abstract class MarketModel {
   /// Initializes Market model class .
@@ -311,6 +314,7 @@ class Market extends MarketModel {
         name: name ?? this.name,
       );
 }
+
 /// Submarket model class.
 abstract class SubmarketModel {
   /// Initializes Submarket model class .
@@ -360,6 +364,7 @@ class Submarket extends SubmarketModel {
         name: name ?? this.name,
       );
 }
+
 /// Symbol item model class.
 abstract class SymbolItemModel {
   /// Initializes Symbol item model class .
@@ -409,6 +414,7 @@ class SymbolItem extends SymbolItemModel {
         name: name ?? this.name,
       );
 }
+
 /// Trade durations item model class.
 abstract class TradeDurationsItemModel {
   /// Initializes Trade durations item model class .
@@ -475,6 +481,7 @@ class TradeDurationsItem extends TradeDurationsItemModel {
         tradeType: tradeType ?? this.tradeType,
       );
 }
+
 /// Durations item model class.
 abstract class DurationsItemModel {
   /// Initializes Durations item model class .
@@ -542,6 +549,7 @@ class DurationsItem extends DurationsItemModel {
         name: name ?? this.name,
       );
 }
+
 /// Trade type model class.
 abstract class TradeTypeModel {
   /// Initializes Trade type model class .
@@ -591,6 +599,7 @@ class TradeType extends TradeTypeModel {
         name: name ?? this.name,
       );
 }
+
 /// Trading durations item market model class.
 abstract class TradingDurationsItemMarketModel {
   /// Initializes Trading durations item market model class .
@@ -641,6 +650,7 @@ class TradingDurationsItemMarket extends TradingDurationsItemMarketModel {
         name: name ?? this.name,
       );
 }
+
 /// Trading durations item submarket model class.
 abstract class TradingDurationsItemSubmarketModel {
   /// Initializes Trading durations item submarket model class .
diff --git a/lib/api/response/trading_platform_accounts_response_result.dart b/lib/api/response/trading_platform_accounts_response_result.dart
index b110666dc4..94fec6ea3a 100644
--- a/lib/api/response/trading_platform_accounts_response_result.dart
+++ b/lib/api/response/trading_platform_accounts_response_result.dart
@@ -224,6 +224,7 @@ enum SubAccountTypeEnum {
   /// swap_free.
   swapFree,
 }
+
 /// Trading platform accounts item model class.
 abstract class TradingPlatformAccountsItemModel {
   /// Initializes Trading platform accounts item model class .
@@ -447,6 +448,7 @@ class TradingPlatformAccountsItem extends TradingPlatformAccountsItemModel {
         subAccountType: subAccountType ?? this.subAccountType,
       );
 }
+
 /// Server info model class.
 abstract class ServerInfoModel {
   /// Initializes Server info model class .
@@ -514,6 +516,7 @@ class ServerInfo extends ServerInfoModel {
         id: id ?? this.id,
       );
 }
+
 /// Geolocation model class.
 abstract class GeolocationModel {
   /// Initializes Geolocation model class .
diff --git a/lib/api/response/trading_platform_asset_listing_response_result.dart b/lib/api/response/trading_platform_asset_listing_response_result.dart
index 2f5f36c8cd..1de6c03a77 100644
--- a/lib/api/response/trading_platform_asset_listing_response_result.dart
+++ b/lib/api/response/trading_platform_asset_listing_response_result.dart
@@ -74,6 +74,7 @@ class TradingPlatformAssetListingResponse
         subscription: subscription ?? this.subscription,
       );
 }
+
 /// Trading platform asset listing property model class.
 abstract class TradingPlatformAssetListingPropertyModel {
   /// Initializes Trading platform asset listing property model class .
@@ -129,6 +130,7 @@ class TradingPlatformAssetListingProperty
         assets: assets ?? this.assets,
       );
 }
+
 /// Assets item model class.
 abstract class AssetsItemModel {
   /// Initializes Assets item model class .
@@ -232,6 +234,7 @@ class AssetsItem extends AssetsItemModel {
         symbol: symbol ?? this.symbol,
       );
 }
+
 /// Subscription model class.
 abstract class SubscriptionModel {
   /// Initializes Subscription model class .
diff --git a/lib/api/response/trading_platform_available_accounts_response_result.dart b/lib/api/response/trading_platform_available_accounts_response_result.dart
index 57817492b9..1edf6ba4c6 100644
--- a/lib/api/response/trading_platform_available_accounts_response_result.dart
+++ b/lib/api/response/trading_platform_available_accounts_response_result.dart
@@ -127,6 +127,7 @@ enum SubAccountTypeEnum {
   /// stp.
   stp,
 }
+
 /// Trading platform available accounts item model class.
 abstract class TradingPlatformAvailableAccountsItemModel {
   /// Initializes Trading platform available accounts item model class .
@@ -250,6 +251,7 @@ class TradingPlatformAvailableAccountsItem
         subAccountType: subAccountType ?? this.subAccountType,
       );
 }
+
 /// Requirements model class.
 abstract class RequirementsModel {
   /// Initializes Requirements model class .
@@ -349,6 +351,7 @@ class Requirements extends RequirementsModel {
         withdrawal: withdrawal ?? this.withdrawal,
       );
 }
+
 /// After first deposit model class.
 abstract class AfterFirstDepositModel {
   /// Initializes After first deposit model class .
@@ -402,6 +405,7 @@ class AfterFirstDeposit extends AfterFirstDepositModel {
         financialAssessment: financialAssessment ?? this.financialAssessment,
       );
 }
+
 /// Compliance model class.
 abstract class ComplianceModel {
   /// Initializes Compliance model class .
diff --git a/lib/api/response/trading_platform_investor_password_reset_response_result.dart b/lib/api/response/trading_platform_investor_password_reset_response_result.dart
index 8b7a114bef..416af887a8 100644
--- a/lib/api/response/trading_platform_investor_password_reset_response_result.dart
+++ b/lib/api/response/trading_platform_investor_password_reset_response_result.dart
@@ -2,7 +2,8 @@
 
 import 'package:equatable/equatable.dart';
 
-import 'package:flutter_deriv_api/helpers/helpers.dart';    
+import 'package:flutter_deriv_api/helpers/helpers.dart';
+
 /// Trading platform investor password reset response model class.
 abstract class TradingPlatformInvestorPasswordResetResponseModel {
   /// Initializes Trading platform investor password reset response model class .
diff --git a/lib/api/response/trading_platform_leverage_response_result.dart b/lib/api/response/trading_platform_leverage_response_result.dart
index b7e4ff2985..654775933f 100644
--- a/lib/api/response/trading_platform_leverage_response_result.dart
+++ b/lib/api/response/trading_platform_leverage_response_result.dart
@@ -54,6 +54,7 @@ class TradingPlatformLeverageResponse
             tradingPlatformLeverage ?? this.tradingPlatformLeverage,
       );
 }
+
 /// Trading platform leverage model class.
 abstract class TradingPlatformLeverageModel {
   /// Initializes Trading platform leverage model class .
@@ -102,6 +103,7 @@ class TradingPlatformLeverage extends TradingPlatformLeverageModel {
         leverage: leverage ?? this.leverage,
       );
 }
+
 /// Leverage property model class.
 abstract class LeveragePropertyModel {
   /// Initializes Leverage property model class .
@@ -193,6 +195,7 @@ class LeverageProperty extends LeveragePropertyModel {
         volume: volume ?? this.volume,
       );
 }
+
 /// Volume model class.
 abstract class VolumeModel {
   /// Initializes Volume model class .
@@ -254,6 +257,7 @@ class Volume extends VolumeModel {
         unit: unit ?? this.unit,
       );
 }
+
 /// Data item model class.
 abstract class DataItemModel {
   /// Initializes Data item model class .
diff --git a/lib/api/response/trading_platform_new_account_response_result.dart b/lib/api/response/trading_platform_new_account_response_result.dart
index 2d3702e739..88d161feff 100644
--- a/lib/api/response/trading_platform_new_account_response_result.dart
+++ b/lib/api/response/trading_platform_new_account_response_result.dart
@@ -197,6 +197,7 @@ enum SubAccountTypeEnum {
   /// swap_free.
   swapFree,
 }
+
 /// Trading platform new account model class.
 abstract class TradingPlatformNewAccountModel {
   /// Initializes Trading platform new account model class .
diff --git a/lib/api/response/trading_platform_password_reset_response_result.dart b/lib/api/response/trading_platform_password_reset_response_result.dart
index 192f020abf..92cd1a8c80 100644
--- a/lib/api/response/trading_platform_password_reset_response_result.dart
+++ b/lib/api/response/trading_platform_password_reset_response_result.dart
@@ -2,7 +2,8 @@
 
 import 'package:equatable/equatable.dart';
 
-import 'package:flutter_deriv_api/helpers/helpers.dart';    
+import 'package:flutter_deriv_api/helpers/helpers.dart';
+
 /// Trading platform password reset response model class.
 abstract class TradingPlatformPasswordResetResponseModel {
   /// Initializes Trading platform password reset response model class .
diff --git a/lib/api/response/trading_platform_product_listing_response_result.dart b/lib/api/response/trading_platform_product_listing_response_result.dart
index c3a202e1f4..2476889ba6 100644
--- a/lib/api/response/trading_platform_product_listing_response_result.dart
+++ b/lib/api/response/trading_platform_product_listing_response_result.dart
@@ -61,6 +61,7 @@ class TradingPlatformProductListingResponse
             tradingPlatformProductListing ?? this.tradingPlatformProductListing,
       );
 }
+
 /// Trading platform product listing property model class.
 abstract class TradingPlatformProductListingPropertyModel {
   /// Initializes Trading platform product listing property model class .
@@ -167,6 +168,7 @@ class TradingPlatformProductListingProperty
         productList: productList ?? this.productList,
       );
 }
+
 /// Product list item model class.
 abstract class ProductListItemModel {
   /// Initializes Product list item model class .
@@ -277,6 +279,7 @@ class ProductListItem extends ProductListItemModel {
         symbol: symbol ?? this.symbol,
       );
 }
+
 /// Market model class.
 abstract class MarketModel {
   /// Initializes Market model class .
@@ -326,6 +329,7 @@ class Market extends MarketModel {
         name: name ?? this.name,
       );
 }
+
 /// Submarket model class.
 abstract class SubmarketModel {
   /// Initializes Submarket model class .
@@ -375,6 +379,7 @@ class Submarket extends SubmarketModel {
         name: name ?? this.name,
       );
 }
+
 /// Symbol model class.
 abstract class SymbolModel {
   /// Initializes Symbol model class .
diff --git a/lib/api/response/trading_platform_withdrawal_response_result.dart b/lib/api/response/trading_platform_withdrawal_response_result.dart
index e15ca38b05..e9e55c5f7f 100644
--- a/lib/api/response/trading_platform_withdrawal_response_result.dart
+++ b/lib/api/response/trading_platform_withdrawal_response_result.dart
@@ -54,6 +54,7 @@ class TradingPlatformWithdrawalResponse
             tradingPlatformWithdrawal ?? this.tradingPlatformWithdrawal,
       );
 }
+
 /// Trading platform withdrawal model class.
 abstract class TradingPlatformWithdrawalModel {
   /// Initializes Trading platform withdrawal model class .
diff --git a/lib/api/response/trading_servers_response_result.dart b/lib/api/response/trading_servers_response_result.dart
index bb74a89c09..627bfd8220 100644
--- a/lib/api/response/trading_servers_response_result.dart
+++ b/lib/api/response/trading_servers_response_result.dart
@@ -156,6 +156,7 @@ enum IdEnum {
   /// p03_ts01.
   p03Ts01,
 }
+
 /// Trading servers item model class.
 abstract class TradingServersItemModel {
   /// Initializes Trading servers item model class .
@@ -297,6 +298,7 @@ class TradingServersItem extends TradingServersItemModel {
         supportedAccounts: supportedAccounts ?? this.supportedAccounts,
       );
 }
+
 /// Geolocation model class.
 abstract class GeolocationModel {
   /// Initializes Geolocation model class .
diff --git a/lib/api/response/trading_times_response_result.dart b/lib/api/response/trading_times_response_result.dart
index af5616fa00..5ceb411bb4 100644
--- a/lib/api/response/trading_times_response_result.dart
+++ b/lib/api/response/trading_times_response_result.dart
@@ -113,6 +113,7 @@ enum TradingDaysItemEnum {
   /// Sat.
   sat,
 }
+
 /// Trading times model class.
 abstract class TradingTimesModel {
   /// Initializes Trading times model class .
@@ -161,6 +162,7 @@ class TradingTimes extends TradingTimesModel {
         markets: markets ?? this.markets,
       );
 }
+
 /// Markets item model class.
 abstract class MarketsItemModel {
   /// Initializes Markets item model class .
@@ -222,6 +224,7 @@ class MarketsItem extends MarketsItemModel {
         submarkets: submarkets ?? this.submarkets,
       );
 }
+
 /// Submarkets item model class.
 abstract class SubmarketsItemModel {
   /// Initializes Submarkets item model class .
@@ -283,6 +286,7 @@ class SubmarketsItem extends SubmarketsItemModel {
         symbols: symbols ?? this.symbols,
       );
 }
+
 /// Symbols item model class.
 abstract class SymbolsItemModel {
   /// Initializes Symbols item model class .
diff --git a/lib/api/response/transaction_response_result.dart b/lib/api/response/transaction_response_result.dart
index 2723dea79d..4fc65a1c55 100644
--- a/lib/api/response/transaction_response_result.dart
+++ b/lib/api/response/transaction_response_result.dart
@@ -181,6 +181,7 @@ enum ActionEnum {
   /// transfer.
   transfer,
 }
+
 /// Transaction model class.
 abstract class TransactionModel {
   /// Initializes Transaction model class .
@@ -388,6 +389,7 @@ class Transaction extends TransactionModel {
         transactionTime: transactionTime ?? this.transactionTime,
       );
 }
+
 /// Subscription model class.
 abstract class SubscriptionModel {
   /// Initializes Subscription model class .
diff --git a/lib/api/response/transfer_between_accounts_response_result.dart b/lib/api/response/transfer_between_accounts_response_result.dart
index 9e7d3c758a..887157e00f 100644
--- a/lib/api/response/transfer_between_accounts_response_result.dart
+++ b/lib/api/response/transfer_between_accounts_response_result.dart
@@ -250,6 +250,7 @@ enum TransfersEnum {
   /// withdrawal.
   withdrawal,
 }
+
 /// Accounts item model class.
 abstract class AccountsItemModel {
   /// Initializes Accounts item model class .
diff --git a/lib/api/response/wallet_migration_response_extended.dart b/lib/api/response/wallet_migration_response_extended.dart
index 28b1aa2203..5e7c5429f1 100644
--- a/lib/api/response/wallet_migration_response_extended.dart
+++ b/lib/api/response/wallet_migration_response_extended.dart
@@ -35,14 +35,16 @@ class WalletMigrationResponseExtended extends WalletMigrationResponse {
   }
 
   /// Starts the user's migration process to wallet.
-  static Future<WalletMigrationResponse> startMigration() => fetchWalletMigration(
+  static Future<WalletMigrationResponse> startMigration() =>
+      fetchWalletMigration(
         request: const WalletMigrationRequest(
           walletMigration: 'start',
         ),
       );
 
   /// Resets the user's migration process to wallet.
-  static Future<WalletMigrationResponse> resetMigration() => fetchWalletMigration(
+  static Future<WalletMigrationResponse> resetMigration() =>
+      fetchWalletMigration(
         request: const WalletMigrationRequest(
           walletMigration: 'reset',
         ),
diff --git a/lib/api/response/wallet_migration_response_result.dart b/lib/api/response/wallet_migration_response_result.dart
index ebe3e04e10..0e07a389ed 100644
--- a/lib/api/response/wallet_migration_response_result.dart
+++ b/lib/api/response/wallet_migration_response_result.dart
@@ -170,6 +170,7 @@ enum StateEnum {
   /// failed.
   failed,
 }
+
 /// Wallet migration model class.
 abstract class WalletMigrationModel {
   /// Initializes Wallet migration model class .
@@ -234,6 +235,7 @@ class WalletMigration extends WalletMigrationModel {
         accountList: accountList ?? this.accountList,
       );
 }
+
 /// Account list item model class.
 abstract class AccountListItemModel {
   /// Initializes Account list item model class .
@@ -335,6 +337,7 @@ class AccountListItem extends AccountListItemModel {
         platform: platform ?? this.platform,
       );
 }
+
 /// Link accounts item model class.
 abstract class LinkAccountsItemModel {
   /// Initializes Link accounts item model class .
diff --git a/lib/api/response/website_config_response_result.dart b/lib/api/response/website_config_response_result.dart
index 4b66bacf0f..0c7d48eabc 100644
--- a/lib/api/response/website_config_response_result.dart
+++ b/lib/api/response/website_config_response_result.dart
@@ -80,6 +80,7 @@ enum TypeEnum {
   /// crypto.
   crypto,
 }
+
 /// Website config model class.
 abstract class WebsiteConfigModel {
   /// Initializes Website config model class .
@@ -192,6 +193,7 @@ class WebsiteConfig extends WebsiteConfigModel {
             termsConditionsVersion ?? this.termsConditionsVersion,
       );
 }
+
 /// Currencies config property model class.
 abstract class CurrenciesConfigPropertyModel {
   /// Initializes Currencies config property model class .
@@ -302,6 +304,7 @@ class CurrenciesConfigProperty extends CurrenciesConfigPropertyModel {
         name: name ?? this.name,
       );
 }
+
 /// Transfer between accounts model class.
 abstract class TransferBetweenAccountsModel {
   /// Initializes Transfer between accounts model class .
@@ -392,6 +395,7 @@ class TransferBetweenAccounts extends TransferBetweenAccountsModel {
         limitsMt5: limitsMt5 ?? this.limitsMt5,
       );
 }
+
 /// Limits model class.
 abstract class LimitsModel {
   /// Initializes Limits model class .
@@ -441,6 +445,7 @@ class Limits extends LimitsModel {
         max: max ?? this.max,
       );
 }
+
 /// Payment agents model class.
 abstract class PaymentAgentsModel {
   /// Initializes Payment agents model class .
@@ -486,6 +491,7 @@ class PaymentAgents extends PaymentAgentsModel {
             initialDepositPerCountry ?? this.initialDepositPerCountry,
       );
 }
+
 /// Subscription model class.
 abstract class SubscriptionModel {
   /// Initializes Subscription model class .
diff --git a/lib/api/response/website_status_response_result.dart b/lib/api/response/website_status_response_result.dart
index 9b30d661b8..e4be14264a 100644
--- a/lib/api/response/website_status_response_result.dart
+++ b/lib/api/response/website_status_response_result.dart
@@ -281,6 +281,7 @@ enum SiteStatusEnum {
   /// updating.
   updating,
 }
+
 /// Website status model class.
 abstract class WebsiteStatusModel {
   /// Initializes Website status model class .
@@ -473,6 +474,7 @@ class WebsiteStatus extends WebsiteStatusModel {
             termsConditionsVersion ?? this.termsConditionsVersion,
       );
 }
+
 /// Api call limits model class.
 abstract class ApiCallLimitsModel {
   /// Initializes Api call limits model class .
@@ -548,6 +550,7 @@ class ApiCallLimits extends ApiCallLimitsModel {
         maxRequestsPricing: maxRequestsPricing ?? this.maxRequestsPricing,
       );
 }
+
 /// Max proposal subscription model class.
 abstract class MaxProposalSubscriptionModel {
   /// Initializes Max proposal subscription model class .
@@ -598,6 +601,7 @@ class MaxProposalSubscription extends MaxProposalSubscriptionModel {
         max: max ?? this.max,
       );
 }
+
 /// Max requestes general model class.
 abstract class MaxRequestesGeneralModel {
   /// Initializes Max requestes general model class .
@@ -657,6 +661,7 @@ class MaxRequestesGeneral extends MaxRequestesGeneralModel {
         minutely: minutely ?? this.minutely,
       );
 }
+
 /// Max requests outcome model class.
 abstract class MaxRequestsOutcomeModel {
   /// Initializes Max requests outcome model class .
@@ -716,6 +721,7 @@ class MaxRequestsOutcome extends MaxRequestsOutcomeModel {
         minutely: minutely ?? this.minutely,
       );
 }
+
 /// Max requests pricing model class.
 abstract class MaxRequestsPricingModel {
   /// Initializes Max requests pricing model class .
@@ -775,6 +781,7 @@ class MaxRequestsPricing extends MaxRequestsPricingModel {
         minutely: minutely ?? this.minutely,
       );
 }
+
 /// Currencies config property model class.
 abstract class CurrenciesConfigPropertyModel {
   /// Initializes Currencies config property model class .
@@ -885,6 +892,7 @@ class CurrenciesConfigProperty extends CurrenciesConfigPropertyModel {
         name: name ?? this.name,
       );
 }
+
 /// Transfer between accounts model class.
 abstract class TransferBetweenAccountsModel {
   /// Initializes Transfer between accounts model class .
@@ -975,6 +983,7 @@ class TransferBetweenAccounts extends TransferBetweenAccountsModel {
         limitsMt5: limitsMt5 ?? this.limitsMt5,
       );
 }
+
 /// Limits model class.
 abstract class LimitsModel {
   /// Initializes Limits model class .
@@ -1024,6 +1033,7 @@ class Limits extends LimitsModel {
         max: max ?? this.max,
       );
 }
+
 /// Dxtrade status model class.
 abstract class DxtradeStatusModel {
   /// Initializes Dxtrade status model class .
@@ -1082,6 +1092,7 @@ class DxtradeStatus extends DxtradeStatusModel {
         real: real ?? this.real,
       );
 }
+
 /// Mt5 status model class.
 abstract class Mt5StatusModel {
   /// Initializes Mt5 status model class .
@@ -1155,6 +1166,7 @@ class Mt5Status extends Mt5StatusModel {
         real: real ?? this.real,
       );
 }
+
 /// P2p config model class.
 abstract class P2pConfigModel {
   /// Initializes P2p config model class .
@@ -1426,6 +1438,7 @@ class P2pConfig extends P2pConfigModel {
         overrideExchangeRate: overrideExchangeRate ?? this.overrideExchangeRate,
       );
 }
+
 /// Block trade model class.
 abstract class BlockTradeModel {
   /// Initializes Block trade model class .
@@ -1475,6 +1488,7 @@ class BlockTrade extends BlockTradeModel {
         maximumAdvertAmount: maximumAdvertAmount ?? this.maximumAdvertAmount,
       );
 }
+
 /// Local currencies item model class.
 abstract class LocalCurrenciesItemModel {
   /// Initializes Local currencies item model class .
@@ -1543,6 +1557,7 @@ class LocalCurrenciesItem extends LocalCurrenciesItemModel {
         isDefault: isDefault ?? this.isDefault,
       );
 }
+
 /// Payment agents model class.
 abstract class PaymentAgentsModel {
   /// Initializes Payment agents model class .
@@ -1588,6 +1603,7 @@ class PaymentAgents extends PaymentAgentsModel {
             initialDepositPerCountry ?? this.initialDepositPerCountry,
       );
 }
+
 /// Subscription model class.
 abstract class SubscriptionModel {
   /// Initializes Subscription model class .
diff --git a/lib/helpers/number_helper.dart b/lib/helpers/number_helper.dart
index 462afe3a5a..7aedca275e 100644
--- a/lib/helpers/number_helper.dart
+++ b/lib/helpers/number_helper.dart
@@ -46,7 +46,9 @@ class NumberValidator {
     final String newString = stringValue.replaceAll(RegExp(r','), '');
 
     try {
-      double.parse(newString,);
+      double.parse(
+        newString,
+      );
     } on Exception {
       return false;
     }
diff --git a/lib/services/connection/api_manager/mock_data/account/copy_trading_list_response.dart b/lib/services/connection/api_manager/mock_data/account/copy_trading_list_response.dart
index 665e92bb79..21683e0c71 100644
--- a/lib/services/connection/api_manager/mock_data/account/copy_trading_list_response.dart
+++ b/lib/services/connection/api_manager/mock_data/account/copy_trading_list_response.dart
@@ -29,4 +29,4 @@ const String copyTradingListResponse = '''{
     ]
   },
   "req_id": 852
-}''';
\ No newline at end of file
+}''';
diff --git a/lib/services/connection/api_manager/mock_data/account/copy_trading_statistics_response.dart b/lib/services/connection/api_manager/mock_data/account/copy_trading_statistics_response.dart
index 51a5d6705d..1dc10ae105 100644
--- a/lib/services/connection/api_manager/mock_data/account/copy_trading_statistics_response.dart
+++ b/lib/services/connection/api_manager/mock_data/account/copy_trading_statistics_response.dart
@@ -23,4 +23,4 @@ const String copyTradingStatisticsResponse = '''{
     }
   },
   "req_id": 286
-}''';
\ No newline at end of file
+}''';
diff --git a/lib/services/connection/api_manager/mock_data/account/get_settings_response.dart b/lib/services/connection/api_manager/mock_data/account/get_settings_response.dart
index 0a92de5b59..9634eec3d6 100644
--- a/lib/services/connection/api_manager/mock_data/account/get_settings_response.dart
+++ b/lib/services/connection/api_manager/mock_data/account/get_settings_response.dart
@@ -13,4 +13,4 @@ const String getSettingsResponse = '''{
     "user_hash": "samplehash71627162jlj"
   },
   "msg_type": "get_settings"
-}''';
\ No newline at end of file
+}''';
diff --git a/lib/services/connection/api_manager/mock_data/cashier/cashier_information_response.dart b/lib/services/connection/api_manager/mock_data/cashier/cashier_information_response.dart
index eef566536c..8b61332cbf 100644
--- a/lib/services/connection/api_manager/mock_data/cashier/cashier_information_response.dart
+++ b/lib/services/connection/api_manager/mock_data/cashier/cashier_information_response.dart
@@ -8,4 +8,4 @@ const String cashierInformationResponse = '''{
   "msg_type": "cashier",
   "cashier": "http://example.url/sagsjgajshkjHSas",
   "req_id": 681
-}''';
\ No newline at end of file
+}''';
diff --git a/lib/services/connection/api_manager/mock_data/common/asset_index_response.dart b/lib/services/connection/api_manager/mock_data/common/asset_index_response.dart
index 8d0fa191e1..0f18288b97 100644
--- a/lib/services/connection/api_manager/mock_data/common/asset_index_response.dart
+++ b/lib/services/connection/api_manager/mock_data/common/asset_index_response.dart
@@ -48,4 +48,4 @@ const String assetIndexResponse = '''{
     "asset_index": 1
   },
   "msg_type": "asset_index"
-}''';
\ No newline at end of file
+}''';
diff --git a/lib/services/connection/api_manager/mock_data/common/landing_company_response.dart b/lib/services/connection/api_manager/mock_data/common/landing_company_response.dart
index 1444417a06..64413dec21 100644
--- a/lib/services/connection/api_manager/mock_data/common/landing_company_response.dart
+++ b/lib/services/connection/api_manager/mock_data/common/landing_company_response.dart
@@ -1421,4 +1421,4 @@ const String landingCompanyResponse = '''{
     "virtual_company": "virtual"
   },
   "msg_type": "landing_company"
-}''';
\ No newline at end of file
+}''';
diff --git a/lib/services/connection/api_manager/mock_data/common/payment_methods_response.dart b/lib/services/connection/api_manager/mock_data/common/payment_methods_response.dart
index 8bf6c1464d..7dfd5e7236 100644
--- a/lib/services/connection/api_manager/mock_data/common/payment_methods_response.dart
+++ b/lib/services/connection/api_manager/mock_data/common/payment_methods_response.dart
@@ -1,5 +1,3 @@
-
-
 /// Payment methods response
 const String paymentMethodsResponse = '''
 {
diff --git a/lib/services/connection/api_manager/mock_data/common/payout_currencies_response.dart b/lib/services/connection/api_manager/mock_data/common/payout_currencies_response.dart
index 271f5c0094..02c28a2b23 100644
--- a/lib/services/connection/api_manager/mock_data/common/payout_currencies_response.dart
+++ b/lib/services/connection/api_manager/mock_data/common/payout_currencies_response.dart
@@ -10,4 +10,4 @@ const String payoutCurrenciesResponse = '''{
     "ETH",
     "EUR"
   ]
-}''';
\ No newline at end of file
+}''';
diff --git a/lib/services/connection/api_manager/mock_data/common/residence_list_response.dart b/lib/services/connection/api_manager/mock_data/common/residence_list_response.dart
index 39bc1dd92e..78bfc4035b 100644
--- a/lib/services/connection/api_manager/mock_data/common/residence_list_response.dart
+++ b/lib/services/connection/api_manager/mock_data/common/residence_list_response.dart
@@ -12,4 +12,4 @@ const String residenceListResponse = '''{
       "value": "sc"
     }
   ]
-}''';
\ No newline at end of file
+}''';
diff --git a/lib/services/connection/api_manager/mock_data/common/states_list_response.dart b/lib/services/connection/api_manager/mock_data/common/states_list_response.dart
index 0031350adb..3892a6283a 100644
--- a/lib/services/connection/api_manager/mock_data/common/states_list_response.dart
+++ b/lib/services/connection/api_manager/mock_data/common/states_list_response.dart
@@ -14,4 +14,4 @@ const String statesListResponse = '''{
       "value": "BA"
     }
   ]
-}''';
\ No newline at end of file
+}''';
diff --git a/lib/services/connection/api_manager/mock_data/contract/contract_update_history_response.dart b/lib/services/connection/api_manager/mock_data/contract/contract_update_history_response.dart
index 421175a6e3..6b98e27c18 100644
--- a/lib/services/connection/api_manager/mock_data/contract/contract_update_history_response.dart
+++ b/lib/services/connection/api_manager/mock_data/contract/contract_update_history_response.dart
@@ -14,4 +14,4 @@ const String contractUpdateHistoryResponse = '''{
     "contract_update_history": 1
   },
   "msg_type": "contract_update_history"
-}''';
\ No newline at end of file
+}''';
diff --git a/lib/services/connection/api_manager/mock_data/contract/sell_expired_response.dart b/lib/services/connection/api_manager/mock_data/contract/sell_expired_response.dart
index 3c0a8675f5..e4f13b59c6 100644
--- a/lib/services/connection/api_manager/mock_data/contract/sell_expired_response.dart
+++ b/lib/services/connection/api_manager/mock_data/contract/sell_expired_response.dart
@@ -7,4 +7,4 @@ const String sellExpiredResponse = '''{
   "sell_expired": {
     "count": 2
   }
-}''';
\ No newline at end of file
+}''';
diff --git a/lib/services/connection/api_manager/mock_data/contract/sell_response.dart b/lib/services/connection/api_manager/mock_data/contract/sell_response.dart
index bf756f3d74..52a79684b3 100644
--- a/lib/services/connection/api_manager/mock_data/contract/sell_response.dart
+++ b/lib/services/connection/api_manager/mock_data/contract/sell_response.dart
@@ -12,4 +12,4 @@ const String sellResponse = '''{
     "price": 100
   },
   "msg_type": "sell"
-}''';
\ No newline at end of file
+}''';
diff --git a/lib/services/connection/api_manager/mock_data/contract/transaction_response.dart b/lib/services/connection/api_manager/mock_data/contract/transaction_response.dart
index e0ef3a93eb..3574295c0a 100644
--- a/lib/services/connection/api_manager/mock_data/contract/transaction_response.dart
+++ b/lib/services/connection/api_manager/mock_data/contract/transaction_response.dart
@@ -28,4 +28,4 @@ const String transactionResponse = '''{
     "transaction_id": 160042962588,
     "transaction_time": 1587626739
   }
-}''';
\ No newline at end of file
+}''';
diff --git a/lib/services/connection/api_manager/mock_data/p2p/p2p_order_cancel_response.dart b/lib/services/connection/api_manager/mock_data/p2p/p2p_order_cancel_response.dart
index 680cc089ce..c6e6d8e69c 100644
--- a/lib/services/connection/api_manager/mock_data/p2p/p2p_order_cancel_response.dart
+++ b/lib/services/connection/api_manager/mock_data/p2p/p2p_order_cancel_response.dart
@@ -9,4 +9,4 @@ const String p2pOrderCancelResponse = '''{
     "id": "107",
     "status": "cancelled"
   }
-}''';
\ No newline at end of file
+}''';
diff --git a/lib/services/connection/api_manager/mock_data/p2p/p2p_order_confirm_response.dart b/lib/services/connection/api_manager/mock_data/p2p/p2p_order_confirm_response.dart
index 63a2e615bd..ecfb6976f3 100644
--- a/lib/services/connection/api_manager/mock_data/p2p/p2p_order_confirm_response.dart
+++ b/lib/services/connection/api_manager/mock_data/p2p/p2p_order_confirm_response.dart
@@ -9,4 +9,4 @@ const String p2pOrderConfirmResponse = '''{
     "id": "107",
     "status": "buyer-confirmed"
   }
-}''';
\ No newline at end of file
+}''';
diff --git a/lib/state/connection/connection_cubit.dart b/lib/state/connection/connection_cubit.dart
index 4659014740..2ccb974b53 100644
--- a/lib/state/connection/connection_cubit.dart
+++ b/lib/state/connection/connection_cubit.dart
@@ -22,7 +22,7 @@ class ConnectionCubit extends Cubit<ConnectionState> {
     ConnectionInformation connectionInformation, {
     BaseAPI? api,
     this.enableDebug = false,
-        // TODO(NA): Refactor to only get BinaryAPI instance. and printResponse and proxyAwareConnection can be part of BinaryAPI only.
+    // TODO(NA): Refactor to only get BinaryAPI instance. and printResponse and proxyAwareConnection can be part of BinaryAPI only.
     this.printResponse = false,
     this.proxyAwareConnection = false,
   }) : super(const ConnectionInitialState()) {
diff --git a/pubspec.yaml b/pubspec.yaml
index d190144a5a..b0586dfe73 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -10,9 +10,6 @@ environment:
   sdk: ">=3.0.0"
 
 dependencies:
-  flutter:
-    sdk: flutter
-
   deriv_dependency_injector:
     git:
       url: https://github.com/deriv-com/deriv-dependency-injector.git
@@ -37,9 +34,6 @@ dependencies:
   web_socket_channel: ^2.4.5
 
 dev_dependencies:
-  flutter_test:
-    sdk: flutter
-
   bloc_test: ^9.1.1
   code_builder: ^4.1.0
   build_config: ^1.0.0
diff --git a/test/api/account/account_currency/set_account_currency_test.dart b/test/api/account/account_currency/set_account_currency_test.dart
index baa9f3cb8a..9525a660be 100644
--- a/test/api/account/account_currency/set_account_currency_test.dart
+++ b/test/api/account/account_currency/set_account_currency_test.dart
@@ -3,7 +3,7 @@ import 'package:flutter_deriv_api/api/response/set_account_currency_response_res
 import 'package:flutter_deriv_api/basic_api/generated/set_account_currency_send.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/account/account_limits/account_limits_test.dart b/test/api/account/account_limits/account_limits_test.dart
index a3432d6a47..ebcc599277 100644
--- a/test/api/account/account_limits/account_limits_test.dart
+++ b/test/api/account/account_limits/account_limits_test.dart
@@ -2,7 +2,7 @@ import 'package:flutter_deriv_api/api/api_initializer.dart';
 import 'package:flutter_deriv_api/api/response/get_limits_response_result.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/account/account_settings/account_settings_test.dart b/test/api/account/account_settings/account_settings_test.dart
index 3df94e7943..b02d6ca3a0 100644
--- a/test/api/account/account_settings/account_settings_test.dart
+++ b/test/api/account/account_settings/account_settings_test.dart
@@ -3,7 +3,7 @@ import 'package:flutter_deriv_api/api/response/get_settings_response_result.dart
 import 'package:flutter_deriv_api/api/response/set_settings_response_result.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/account/account_status/account_status_test.dart b/test/api/account/account_status/account_status_test.dart
index 3a7694bf0e..3f4644a804 100644
--- a/test/api/account/account_status/account_status_test.dart
+++ b/test/api/account/account_status/account_status_test.dart
@@ -2,7 +2,7 @@ import 'package:flutter_deriv_api/api/api_initializer.dart';
 import 'package:flutter_deriv_api/api/response/get_account_status_response_result.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/account/api_token/api_token_test.dart b/test/api/account/api_token/api_token_test.dart
index 1e5471ccfc..db1901c39c 100644
--- a/test/api/account/api_token/api_token_test.dart
+++ b/test/api/account/api_token/api_token_test.dart
@@ -1,6 +1,6 @@
 import 'package:flutter_deriv_api/api/api_initializer.dart';
 import 'package:flutter_deriv_api/api/response/api_token_response_result.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
 
diff --git a/test/api/account/authorize/authorize_test.dart b/test/api/account/authorize/authorize_test.dart
index 20ef537d00..0da1f11583 100644
--- a/test/api/account/authorize/authorize_test.dart
+++ b/test/api/account/authorize/authorize_test.dart
@@ -6,7 +6,7 @@ import 'package:flutter_deriv_api/basic_api/generated/authorize_send.dart';
 import 'package:flutter_deriv_api/helpers/helpers.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/account/balance/balance_test.dart b/test/api/account/balance/balance_test.dart
index c8d170f100..9b0db9e124 100644
--- a/test/api/account/balance/balance_test.dart
+++ b/test/api/account/balance/balance_test.dart
@@ -1,7 +1,7 @@
 import 'package:flutter_deriv_api/api/api_initializer.dart';
 import 'package:flutter_deriv_api/api/response/balance_response_result.dart';
 import 'package:flutter_deriv_api/basic_api/generated/balance_send.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
 
diff --git a/test/api/account/copy_trading/copy_trading_test.dart b/test/api/account/copy_trading/copy_trading_test.dart
index 1833f854c3..e30b1e9b4c 100644
--- a/test/api/account/copy_trading/copy_trading_test.dart
+++ b/test/api/account/copy_trading/copy_trading_test.dart
@@ -3,7 +3,7 @@ import 'package:flutter_deriv_api/api/response/copytrading_list_response_result.
 import 'package:flutter_deriv_api/api/response/copytrading_statistics_response_result.dart';
 import 'package:flutter_deriv_api/basic_api/generated/copytrading_statistics_send.dart';
 import 'package:flutter_deriv_api/helpers/helpers.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
 
diff --git a/test/api/account/get_account_types/get_account_types_test.dart b/test/api/account/get_account_types/get_account_types_test.dart
index 935494e26c..a49f57f0ad 100644
--- a/test/api/account/get_account_types/get_account_types_test.dart
+++ b/test/api/account/get_account_types/get_account_types_test.dart
@@ -4,7 +4,7 @@ import 'package:flutter_deriv_api/api/response/get_account_types_response_result
 import 'package:flutter_deriv_api/basic_api/generated/api.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/account/new_account_wallet/new_account_wallet_test.dart b/test/api/account/new_account_wallet/new_account_wallet_test.dart
index a4fa152a3e..658ba8b5dd 100644
--- a/test/api/account/new_account_wallet/new_account_wallet_test.dart
+++ b/test/api/account/new_account_wallet/new_account_wallet_test.dart
@@ -4,7 +4,7 @@ import 'package:flutter_deriv_api/api/response/new_account_wallet_response_resul
 import 'package:flutter_deriv_api/basic_api/generated/api.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/account/portfolio/portfolio_test.dart b/test/api/account/portfolio/portfolio_test.dart
index 635ce5211f..f4c20e8881 100644
--- a/test/api/account/portfolio/portfolio_test.dart
+++ b/test/api/account/portfolio/portfolio_test.dart
@@ -4,7 +4,7 @@ import 'package:flutter_deriv_api/basic_api/generated/portfolio_send.dart';
 import 'package:flutter_deriv_api/helpers/helpers.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/account/profit_table/profit_table_test.dart b/test/api/account/profit_table/profit_table_test.dart
index a2a6c332f4..5632fcd69a 100644
--- a/test/api/account/profit_table/profit_table_test.dart
+++ b/test/api/account/profit_table/profit_table_test.dart
@@ -4,7 +4,7 @@ import 'package:flutter_deriv_api/basic_api/generated/profit_table_send.dart';
 import 'package:flutter_deriv_api/helpers/helpers.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/account/reality_check/reality_check_test.dart b/test/api/account/reality_check/reality_check_test.dart
index 13891ca920..b44dcf06d7 100644
--- a/test/api/account/reality_check/reality_check_test.dart
+++ b/test/api/account/reality_check/reality_check_test.dart
@@ -3,7 +3,7 @@ import 'package:flutter_deriv_api/api/response/reality_check_response_result.dar
 import 'package:flutter_deriv_api/helpers/helpers.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/account/self_exclusion/self_exclusion_test.dart b/test/api/account/self_exclusion/self_exclusion_test.dart
index 2bba244e39..5056bf5ef6 100644
--- a/test/api/account/self_exclusion/self_exclusion_test.dart
+++ b/test/api/account/self_exclusion/self_exclusion_test.dart
@@ -4,7 +4,7 @@ import 'package:flutter_deriv_api/basic_api/generated/set_self_exclusion_send.da
 import 'package:flutter_deriv_api/helpers/helpers.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/account/statement/statement_test.dart b/test/api/account/statement/statement_test.dart
index 55d16aae99..dc50778a26 100644
--- a/test/api/account/statement/statement_test.dart
+++ b/test/api/account/statement/statement_test.dart
@@ -4,7 +4,7 @@ import 'package:flutter_deriv_api/basic_api/generated/statement_send.dart';
 import 'package:flutter_deriv_api/helpers/helpers.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/account/top_up_virtual/top_up_virtual_test.dart b/test/api/account/top_up_virtual/top_up_virtual_test.dart
index 0f9ca6afbf..2206562716 100644
--- a/test/api/account/top_up_virtual/top_up_virtual_test.dart
+++ b/test/api/account/top_up_virtual/top_up_virtual_test.dart
@@ -2,7 +2,7 @@ import 'package:flutter_deriv_api/api/api_initializer.dart';
 import 'package:flutter_deriv_api/api/response/topup_virtual_response_result.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/account/wallet_migration/wallet_migration_test.dart b/test/api/account/wallet_migration/wallet_migration_test.dart
index cd8448a4ad..60a17a3579 100644
--- a/test/api/account/wallet_migration/wallet_migration_test.dart
+++ b/test/api/account/wallet_migration/wallet_migration_test.dart
@@ -4,7 +4,7 @@ import 'package:flutter_deriv_api/api/response/wallet_migration_response_result.
 import 'package:flutter_deriv_api/basic_api/generated/wallet_migration_send.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   group('Wallet migration', () {
diff --git a/test/api/app/app_test.dart b/test/api/app/app_test.dart
index 4a9cfd7fc8..4734717a56 100644
--- a/test/api/app/app_test.dart
+++ b/test/api/app/app_test.dart
@@ -12,7 +12,7 @@ import 'package:flutter_deriv_api/basic_api/generated/app_update_send.dart';
 import 'package:flutter_deriv_api/basic_api/generated/revoke_oauth_app_send.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/app/new_account/new_account_test.dart b/test/api/app/new_account/new_account_test.dart
index 10cfae841d..e689fdac43 100644
--- a/test/api/app/new_account/new_account_test.dart
+++ b/test/api/app/new_account/new_account_test.dart
@@ -5,7 +5,7 @@ import 'package:flutter_deriv_api/basic_api/generated/new_account_real_send.dart
 import 'package:flutter_deriv_api/basic_api/generated/new_account_virtual_send.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/app/oauth_app_test.dart b/test/api/app/oauth_app_test.dart
index be2255e623..2557427d23 100644
--- a/test/api/app/oauth_app_test.dart
+++ b/test/api/app/oauth_app_test.dart
@@ -2,7 +2,7 @@ import 'package:flutter_deriv_api/api/api_initializer.dart';
 import 'package:flutter_deriv_api/api/response/oauth_apps_response_result.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/cashier/cashier_payments_test.dart b/test/api/cashier/cashier_payments_test.dart
index 28e805c3ec..ed672f3347 100644
--- a/test/api/cashier/cashier_payments_test.dart
+++ b/test/api/cashier/cashier_payments_test.dart
@@ -4,7 +4,7 @@ import 'package:flutter_deriv_api/api/response/cashier_payments_response_extende
 import 'package:flutter_deriv_api/api/response/cashier_payments_response_result.dart';
 import 'package:flutter_deriv_api/basic_api/generated/cashier_payments_send.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/cashier/cashier_test.dart b/test/api/cashier/cashier_test.dart
index 9e471e7983..0aae25857c 100644
--- a/test/api/cashier/cashier_test.dart
+++ b/test/api/cashier/cashier_test.dart
@@ -3,7 +3,7 @@ import 'package:flutter_deriv_api/api/response/cashier_response_result.dart';
 import 'package:flutter_deriv_api/basic_api/generated/cashier_send.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/common/active_symbols/active_symbols_test.dart b/test/api/common/active_symbols/active_symbols_test.dart
index fecbca988c..62932e8e62 100644
--- a/test/api/common/active_symbols/active_symbols_test.dart
+++ b/test/api/common/active_symbols/active_symbols_test.dart
@@ -3,7 +3,7 @@ import 'package:flutter_deriv_api/api/response/active_symbols_response_result.da
 import 'package:flutter_deriv_api/basic_api/generated/active_symbols_send.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/common/asset_index/asset_index_test.dart b/test/api/common/asset_index/asset_index_test.dart
index 013d2fc7ff..b88a23beec 100644
--- a/test/api/common/asset_index/asset_index_test.dart
+++ b/test/api/common/asset_index/asset_index_test.dart
@@ -3,7 +3,7 @@ import 'package:flutter_deriv_api/api/response/asset_index_response_result.dart'
 import 'package:flutter_deriv_api/basic_api/generated/asset_index_send.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/common/copy_trading/copy_trading_test.dart b/test/api/common/copy_trading/copy_trading_test.dart
index b614d21c7d..2d7f8c72af 100644
--- a/test/api/common/copy_trading/copy_trading_test.dart
+++ b/test/api/common/copy_trading/copy_trading_test.dart
@@ -5,7 +5,7 @@ import 'package:flutter_deriv_api/basic_api/generated/copy_start_send.dart';
 import 'package:flutter_deriv_api/basic_api/generated/copy_stop_send.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/common/crypto_config/crypto_config_test.dart b/test/api/common/crypto_config/crypto_config_test.dart
index 1fc2785fb8..255993d593 100644
--- a/test/api/common/crypto_config/crypto_config_test.dart
+++ b/test/api/common/crypto_config/crypto_config_test.dart
@@ -3,7 +3,7 @@ import 'package:flutter_deriv_api/api/api_initializer.dart';
 import 'package:flutter_deriv_api/api/response/crypto_config_response_extended.dart';
 import 'package:flutter_deriv_api/api/response/crypto_config_response_result.dart';
 import 'package:flutter_deriv_api/basic_api/generated/crypto_config_send.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 import '../../../services/call_manager/base_call_manager_test.dart';
 
diff --git a/test/api/common/exchange/exchange_rates_test.dart b/test/api/common/exchange/exchange_rates_test.dart
index 09903f929e..91749bb7a9 100644
--- a/test/api/common/exchange/exchange_rates_test.dart
+++ b/test/api/common/exchange/exchange_rates_test.dart
@@ -4,7 +4,7 @@ import 'package:flutter_deriv_api/basic_api/generated/exchange_rates_send.dart';
 import 'package:flutter_deriv_api/helpers/helpers.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/common/forget/forget_test.dart b/test/api/common/forget/forget_test.dart
index fa36345c65..cb226d546a 100644
--- a/test/api/common/forget/forget_test.dart
+++ b/test/api/common/forget/forget_test.dart
@@ -5,7 +5,7 @@ import 'package:flutter_deriv_api/basic_api/generated/forget_all_send.dart';
 import 'package:flutter_deriv_api/basic_api/generated/forget_send.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/common/landing_company/landing_company_test.dart b/test/api/common/landing_company/landing_company_test.dart
index 8f6cde93be..8d1ba03b77 100644
--- a/test/api/common/landing_company/landing_company_test.dart
+++ b/test/api/common/landing_company/landing_company_test.dart
@@ -5,7 +5,7 @@ import 'package:flutter_deriv_api/basic_api/generated/landing_company_details_se
 import 'package:flutter_deriv_api/basic_api/generated/landing_company_send.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/common/payment/payment_methods_test.dart b/test/api/common/payment/payment_methods_test.dart
index 16e4cf2a38..6d9b44f013 100644
--- a/test/api/common/payment/payment_methods_test.dart
+++ b/test/api/common/payment/payment_methods_test.dart
@@ -2,7 +2,7 @@ import 'package:flutter_deriv_api/api/api_initializer.dart';
 import 'package:flutter_deriv_api/api/response/payment_methods_response_result.dart';
 import 'package:flutter_deriv_api/basic_api/generated/payment_methods_send.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/common/payment_agent/payment_agent_test.dart b/test/api/common/payment_agent/payment_agent_test.dart
index 4e8e8ecbc6..17b58daf1a 100644
--- a/test/api/common/payment_agent/payment_agent_test.dart
+++ b/test/api/common/payment_agent/payment_agent_test.dart
@@ -7,7 +7,7 @@ import 'package:flutter_deriv_api/basic_api/generated/paymentagent_transfer_send
 import 'package:flutter_deriv_api/basic_api/generated/paymentagent_withdraw_send.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/common/payout_currency/payout_currency_test.dart b/test/api/common/payout_currency/payout_currency_test.dart
index e857fad8fd..83f1072908 100644
--- a/test/api/common/payout_currency/payout_currency_test.dart
+++ b/test/api/common/payout_currency/payout_currency_test.dart
@@ -2,7 +2,7 @@ import 'package:flutter_deriv_api/api/api_initializer.dart';
 import 'package:flutter_deriv_api/api/response/payout_currencies_response_result.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/common/ping/ping_test.dart b/test/api/common/ping/ping_test.dart
index a7d0057815..fd94d505a7 100644
--- a/test/api/common/ping/ping_test.dart
+++ b/test/api/common/ping/ping_test.dart
@@ -2,7 +2,7 @@ import 'package:flutter_deriv_api/api/api_initializer.dart';
 import 'package:flutter_deriv_api/api/response/ping_response_result.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/common/residence/residence_test.dart b/test/api/common/residence/residence_test.dart
index 1cafef86ef..3d55ee02fa 100644
--- a/test/api/common/residence/residence_test.dart
+++ b/test/api/common/residence/residence_test.dart
@@ -2,7 +2,7 @@ import 'package:flutter_deriv_api/api/api_initializer.dart';
 import 'package:flutter_deriv_api/api/response/residence_list_response_result.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/common/server_time/server_time_test.dart b/test/api/common/server_time/server_time_test.dart
index cff7734e36..220a19a576 100644
--- a/test/api/common/server_time/server_time_test.dart
+++ b/test/api/common/server_time/server_time_test.dart
@@ -3,7 +3,7 @@ import 'package:flutter_deriv_api/api/response/time_response_result.dart';
 import 'package:flutter_deriv_api/helpers/helpers.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/common/state/state_test.dart b/test/api/common/state/state_test.dart
index 6e3c892b16..e456b3369b 100644
--- a/test/api/common/state/state_test.dart
+++ b/test/api/common/state/state_test.dart
@@ -3,7 +3,7 @@ import 'package:flutter_deriv_api/api/response/states_list_response_result.dart'
 import 'package:flutter_deriv_api/basic_api/generated/states_list_send.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/common/tick/tick_test.dart b/test/api/common/tick/tick_test.dart
index 82009e79ba..b8c43b3f6f 100644
--- a/test/api/common/tick/tick_test.dart
+++ b/test/api/common/tick/tick_test.dart
@@ -7,7 +7,7 @@ import 'package:flutter_deriv_api/basic_api/generated/ticks_send.dart';
 import 'package:flutter_deriv_api/helpers/helpers.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/common/trading/trading_duration_test.dart b/test/api/common/trading/trading_duration_test.dart
index 388c6af57e..3575cc647e 100644
--- a/test/api/common/trading/trading_duration_test.dart
+++ b/test/api/common/trading/trading_duration_test.dart
@@ -3,7 +3,7 @@ import 'package:flutter_deriv_api/api/response/trading_durations_response_result
 import 'package:flutter_deriv_api/basic_api/generated/trading_durations_send.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/common/trading/trading_times_test.dart b/test/api/common/trading/trading_times_test.dart
index 01339d24cf..eb89df2db7 100644
--- a/test/api/common/trading/trading_times_test.dart
+++ b/test/api/common/trading/trading_times_test.dart
@@ -3,7 +3,7 @@ import 'package:flutter_deriv_api/api/response/trading_times_response_result.dar
 import 'package:flutter_deriv_api/basic_api/generated/trading_times_send.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/common/website_status/website_status_test.dart b/test/api/common/website_status/website_status_test.dart
index b8bb89b91b..078d17feca 100644
--- a/test/api/common/website_status/website_status_test.dart
+++ b/test/api/common/website_status/website_status_test.dart
@@ -2,7 +2,7 @@ import 'package:flutter_deriv_api/api/api_initializer.dart';
 import 'package:flutter_deriv_api/api/response/website_status_response_result.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/contract/contracts_for/contracts_for_test.dart b/test/api/contract/contracts_for/contracts_for_test.dart
index 53918cb2f2..cf988c2496 100644
--- a/test/api/contract/contracts_for/contracts_for_test.dart
+++ b/test/api/contract/contracts_for/contracts_for_test.dart
@@ -3,7 +3,7 @@ import 'package:flutter_deriv_api/api/response/contracts_for_response_result.dar
 import 'package:flutter_deriv_api/basic_api/generated/contracts_for_send.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/contract/operation/operations_test.dart b/test/api/contract/operation/operations_test.dart
index b31870ead1..8833403264 100644
--- a/test/api/contract/operation/operations_test.dart
+++ b/test/api/contract/operation/operations_test.dart
@@ -17,7 +17,7 @@ import 'package:flutter_deriv_api/basic_api/generated/sell_send.dart';
 import 'package:flutter_deriv_api/helpers/helpers.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/contract/transaction/transactions_test.dart b/test/api/contract/transaction/transactions_test.dart
index dd1a8342c7..34e359d53c 100644
--- a/test/api/contract/transaction/transactions_test.dart
+++ b/test/api/contract/transaction/transactions_test.dart
@@ -3,7 +3,7 @@ import 'package:flutter_deriv_api/api/response/transaction_response_result.dart'
 import 'package:flutter_deriv_api/helpers/helpers.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/exceptions/api_base_exception_test.dart b/test/api/exceptions/api_base_exception_test.dart
index 4ff9f125ba..fd75a80045 100644
--- a/test/api/exceptions/api_base_exception_test.dart
+++ b/test/api/exceptions/api_base_exception_test.dart
@@ -1,5 +1,5 @@
 import 'package:flutter_deriv_api/api/exceptions/exceptions.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   group('APIBaseException tests =>', () {
diff --git a/test/api/mt5/mt5_account_test.dart b/test/api/mt5/mt5_account_test.dart
index ceaeb5a242..6e10a79ccc 100644
--- a/test/api/mt5/mt5_account_test.dart
+++ b/test/api/mt5/mt5_account_test.dart
@@ -13,7 +13,7 @@ import 'package:flutter_deriv_api/basic_api/generated/mt5_login_list_send.dart';
 import 'package:flutter_deriv_api/basic_api/generated/mt5_new_account_send.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/p2p/p2p_advert/p2p_advert_test.dart b/test/api/p2p/p2p_advert/p2p_advert_test.dart
index a9aad382e3..b170e306d2 100644
--- a/test/api/p2p/p2p_advert/p2p_advert_test.dart
+++ b/test/api/p2p/p2p_advert/p2p_advert_test.dart
@@ -15,7 +15,7 @@ import 'package:flutter_deriv_api/basic_api/generated/p2p_advert_info_send.dart'
 import 'package:flutter_deriv_api/basic_api/generated/p2p_advert_list_send.dart';
 import 'package:flutter_deriv_api/helpers/helpers.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/p2p/p2p_advertiser/p2p_advertiser_test.dart b/test/api/p2p/p2p_advertiser/p2p_advertiser_test.dart
index 897626ffab..7a3b0b6ffa 100644
--- a/test/api/p2p/p2p_advertiser/p2p_advertiser_test.dart
+++ b/test/api/p2p/p2p_advertiser/p2p_advertiser_test.dart
@@ -10,7 +10,7 @@ import 'package:flutter_deriv_api/basic_api/generated/p2p_advertiser_update_send
 import 'package:flutter_deriv_api/helpers/helpers.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/p2p/p2p_chat/p2p_chat_create_test.dart b/test/api/p2p/p2p_chat/p2p_chat_create_test.dart
index cc44f1c0cb..8f77d6bd38 100644
--- a/test/api/p2p/p2p_chat/p2p_chat_create_test.dart
+++ b/test/api/p2p/p2p_chat/p2p_chat_create_test.dart
@@ -3,7 +3,7 @@ import 'package:flutter_deriv_api/api/response/p2p_chat_create_response_result.d
 import 'package:flutter_deriv_api/basic_api/generated/p2p_chat_create_send.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/p2p/p2p_order/p2p_order_test.dart b/test/api/p2p/p2p_order/p2p_order_test.dart
index c1eda51c39..957dfe0f0c 100644
--- a/test/api/p2p/p2p_order/p2p_order_test.dart
+++ b/test/api/p2p/p2p_order/p2p_order_test.dart
@@ -14,7 +14,7 @@ import 'package:flutter_deriv_api/basic_api/generated/p2p_order_info_send.dart';
 import 'package:flutter_deriv_api/helpers/helpers.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/trading_platform/trading_platform_password_reset_test.dart b/test/api/trading_platform/trading_platform_password_reset_test.dart
index 1f1c3f673c..1e1c341e1d 100644
--- a/test/api/trading_platform/trading_platform_password_reset_test.dart
+++ b/test/api/trading_platform/trading_platform_password_reset_test.dart
@@ -4,7 +4,7 @@ import 'package:flutter_deriv_api/api/response/trading_platform_password_reset_r
 import 'package:flutter_deriv_api/api/response/trading_platform_password_reset_response_result.dart';
 import 'package:flutter_deriv_api/basic_api/generated/trading_platform_password_reset_send.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/user/financial_assessment/financial_assessment_test.dart b/test/api/user/financial_assessment/financial_assessment_test.dart
index 1fe50c0073..91c0812c9f 100644
--- a/test/api/user/financial_assessment/financial_assessment_test.dart
+++ b/test/api/user/financial_assessment/financial_assessment_test.dart
@@ -5,7 +5,7 @@ import 'package:flutter_deriv_api/basic_api/generated/get_financial_assessment_s
 import 'package:flutter_deriv_api/basic_api/generated/set_financial_assessment_send.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/user/tnc_approval_test.dart b/test/api/user/tnc_approval_test.dart
index 50c6fb41d7..d03d3e922f 100644
--- a/test/api/user/tnc_approval_test.dart
+++ b/test/api/user/tnc_approval_test.dart
@@ -3,7 +3,7 @@ import 'package:flutter_deriv_api/api/response/tnc_approval_response_result.dart
 import 'package:flutter_deriv_api/basic_api/generated/tnc_approval_send.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/user/transfer/transfer_between_accounts_test.dart b/test/api/user/transfer/transfer_between_accounts_test.dart
index d3d9339d7c..6e4bafcd03 100644
--- a/test/api/user/transfer/transfer_between_accounts_test.dart
+++ b/test/api/user/transfer/transfer_between_accounts_test.dart
@@ -3,7 +3,7 @@ import 'package:flutter_deriv_api/api/response/transfer_between_accounts_respons
 import 'package:flutter_deriv_api/basic_api/generated/transfer_between_accounts_send.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/api/user/verify_email_test.dart b/test/api/user/verify_email_test.dart
index 202ff8180f..109a777c48 100644
--- a/test/api/user/verify_email_test.dart
+++ b/test/api/user/verify_email_test.dart
@@ -3,7 +3,7 @@ import 'package:flutter_deriv_api/api/response/verify_email_response_result.dart
 import 'package:flutter_deriv_api/basic_api/generated/verify_email_send.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/services/call_manager/pending_request_test.dart b/test/services/call_manager/pending_request_test.dart
index 93dd0b396f..1d8a4ee950 100644
--- a/test/services/call_manager/pending_request_test.dart
+++ b/test/services/call_manager/pending_request_test.dart
@@ -3,7 +3,7 @@ import 'dart:async';
 import 'package:flutter_deriv_api/basic_api/request.dart';
 import 'package:flutter_deriv_api/services/connection/call_manager/pending_request.dart';
 import 'package:flutter_deriv_api/services/connection/call_manager/subscription_stream.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   group('PendingRequest tests =>', () {
diff --git a/test/services/connection/api_manager/base_api_test.dart b/test/services/connection/api_manager/base_api_test.dart
index c101e1ed5b..fb3cd1a3fa 100644
--- a/test/services/connection/api_manager/base_api_test.dart
+++ b/test/services/connection/api_manager/base_api_test.dart
@@ -2,7 +2,7 @@ import 'package:flutter_deriv_api/api/api_initializer.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/base_api.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));
diff --git a/test/services/dependency_injector/injector_test.dart b/test/services/dependency_injector/injector_test.dart
index f38d5f7995..e1085f57b5 100644
--- a/test/services/dependency_injector/injector_test.dart
+++ b/test/services/dependency_injector/injector_test.dart
@@ -2,7 +2,7 @@ import 'package:flutter_deriv_api/api/api_initializer.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/base_api.dart';
 import 'package:flutter_deriv_api/services/connection/api_manager/mock_api.dart';
 import 'package:deriv_dependency_injector/dependency_injector.dart';
-import 'package:flutter_test/flutter_test.dart';
+import 'package:test/test.dart';
 
 void main() {
   setUp(() => APIInitializer().initialize(api: MockAPI()));