Merge remote-tracking branch 'refs/remotes/upstream/dev' into reza/fix_support_web_issue

# Conflicts:
#	lib/services/connection/api_manager/binary_api.dart
#	pubspec.yaml

Author: Reza-deriv

.circleci/config.yml

@@ -0,0 +1,47 @@
+name: Flutter Analyze, Test, and Build
+
+on:
+  push:
+    branches:
+      - master
+      - dev
+  pull_request:
+    branches:
+      - "*"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: "ubuntu-latest"
+    steps:
+      - name: 📚 Git Checkout
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
+
+      - name: 🐦 Setup Flutter
+        uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa
+        with:
+          flutter-version: "3.10.2"
+          channel: stable
+          cache: true
+          cache-key: flutter-:os:-:channel:-:version:-:arch:-:hash:-${{ hashFiles('**/pubspec.lock') }}
+
+      - name: 📦 Install Dependencies
+        run: flutter pub get
+
+      # do not fail if the analyze issue is info level
+      - name: 🕵️ Analyze
+        run: |
+          if flutter analyze 2>&1 | grep -q -E 'error:|warning:'; 
+          then exit 1
+          else exit 0
+          fi
+
+      - name: 🧪 Run Tests
+        run: flutter test
+
+      - name: Build Example app
+        working-directory: ./example
+        run: flutter build apk --target-platform android-arm

.github/workflows/main.yaml

@@ -1,4 +1,4 @@
 [submodule "binary-websocket-api"]
 	path = binary-websocket-api
-	url = https://github.com/regentmarkets/binary-websocket-api.git
+	url = git@github.com:regentmarkets/binary-websocket-api.git
 	branch = master

.gitmodules

@@ -39,7 +39,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.deriv.flutter_deriv_api_example"
-        minSdkVersion 16
+        minSdkVersion 19
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

binary-websocket-api

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
+platform :ios, '12.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

example/android/app/build.gradle

@@ -41,5 +41,9 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 </dict>
 </plist>

example/ios/Podfile

@@ -51,6 +51,6 @@ class ActiveSymbolsBloc extends Bloc<ActiveSymbolsEvent, ActiveSymbolsState> {
   Future<ActiveSymbolsResponse> _fetchActiveSymbols() async =>
       ActiveSymbolsResponse.fetchActiveSymbols(const ActiveSymbolsRequest(
         activeSymbols: 'brief',
-        productType: 'basic',
+        productType: 'basic', landingCompany: '',
       ));
 }

example/ios/Runner/Info.plist

@@ -9,6 +9,7 @@ import 'package:flutter_deriv_api/basic_api/generated/api.dart';
 import '../active_symbols/active_symbols_bloc.dart';
 
 part 'available_contracts_event.dart';
+
 part 'available_contracts_state.dart';
 
 /// AvailableContractsBloc
@@ -75,5 +76,6 @@ class AvailableContractsBloc
   ) async =>
       ContractsForResponse.fetchContractsForSymbol(ContractsForRequest(
         contractsFor: selectedSymbol?.symbol,
+        landingCompany: '',
       ));
 }

example/lib/blocs/active_symbols/active_symbols_bloc.dart

@@ -4,6 +4,7 @@ import 'package:flutter_deriv_api_example/blocs/active_symbols/active_symbols_bl
 import 'package:flutter_deriv_api_example/blocs/available_contracts/available_contracts_bloc.dart';
 import 'package:flutter_deriv_api_example/widgets/active_symbols_widget.dart';
 import 'package:flutter_deriv_api_example/widgets/contracts_type_widget.dart';
+import 'package:flutter_deriv_api_example/widgets/exchange_rate_widget.dart';
 import 'package:flutter_deriv_api_example/widgets/price_proposal_widget.dart';
 
 /// MainPage
@@ -47,6 +48,7 @@ class _MainPageState extends State<MainPage> {
             Expanded(child: ActiveSymbolsWidget()),
             Expanded(child: ContractsTypeWidget()),
             Expanded(flex: 2, child: PriceProposalWidget()),
+            const Expanded(flex: 2, child: ExchangeRateWidget()),
           ],
         ),
       );

example/lib/blocs/available_contracts/available_contracts_bloc.dart

@@ -24,6 +24,7 @@ class _SampleAppState extends State<SampleApp> {
         appId: '1089',
         brand: 'binary',
         endpoint: 'frontend.binaryws.com',
+        authEndpoint: '',
       ),
     );
   }

example/lib/pages/main_page.dart

@@ -0,0 +1,93 @@
+import 'dart:async';
+import 'dart:developer';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_deriv_api/api/response/exchange_rates_response_result.dart';
+import 'package:flutter_deriv_api/api/response/exchange_rates_response_extended.dart';
+import 'package:flutter_deriv_api/basic_api/generated/exchange_rates_send.dart';
+
+/// Test widget for the exchange rates for BTC -> USD.
+class ExchangeRateWidget extends StatefulWidget {
+  /// Test widget for exchange rates for BTC -> USD
+  const ExchangeRateWidget({super.key});
+
+  @override
+  State<ExchangeRateWidget> createState() => _ExchangeRateWidgetState();
+}
+
+class _ExchangeRateWidgetState extends State<ExchangeRateWidget> {
+  double value = 0;
+
+  bool isSubscribed = false;
+  int exchangeUpdateTime = 0;
+  String subscriptionId = '';
+
+  Timer? _refreshingTimer;
+
+  @override
+  Widget build(BuildContext context) => Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          ElevatedButton(
+            onPressed: () =>
+                isSubscribed ? _unsubscribe() : _subscribeUSDtoBTC(),
+            child: isSubscribed
+                ? const Text('Unsubscribe')
+                : const Text('Subscribe to exchange rate'),
+          ),
+          const Text('USD:'),
+          Text(value.toString()),
+          const SizedBox(height: 12),
+          const SizedBox(height: 12),
+          Text(
+            'Last updated after: ${exchangeUpdateTime.toStringAsFixed(2)} seconds',
+          )
+        ],
+      );
+
+  Future<void> _subscribeUSDtoBTC() async {
+    final Stream<ExchangeRatesResponse?> ratesStream =
+        ExchangeRatesResponseExtended.subscribeToExchangeRates(
+            const ExchangeRatesRequest(
+      baseCurrency: 'BTC',
+      targetCurrency: 'USD',
+      subscribe: true,
+    ));
+
+    // ignore: cascade_invocations
+    ratesStream.listen((ExchangeRatesResponse? response) {
+      setState(() {
+        subscriptionId = response!.subscription!.id;
+        isSubscribed = true;
+        value = response.exchangeRates!.rates!['USD'] as double;
+        _resetTimer();
+      });
+    });
+  }
+
+  void _resetTimer() {
+    _refreshingTimer?.cancel();
+
+    _refreshingTimer = Timer.periodic(
+      const Duration(seconds: 1),
+      (Timer timer) {
+        exchangeUpdateTime = timer.tick;
+      },
+    );
+  }
+
+  Future<void> _unsubscribe() async {
+    try {
+      final bool $ =
+          await ExchangeRatesResponseExtended.unsubscribeFromExchangeRates(
+              subscriptionId);
+      $.toString();
+      _refreshingTimer?.cancel();
+    } on Exception catch (e) {
+      log(e.toString());
+    }
+    setState(() {
+      isSubscribed = false;
+    });
+  }
+}

example/lib/sample_app.dart

@@ -1,6 +1,7 @@
 name: flutter_deriv_api_example
 description: Demonstrates how to use the flutter_deriv_api plugin.
 publish_to: "none"
+version: 0.0.1
 
 environment:
   sdk: ">=3.0.0"

example/lib/widgets/exchange_rate_widget.dart

@@ -19,10 +19,8 @@ abstract class AccountClosureResponseModel {
 class AccountClosureResponse extends AccountClosureResponseModel {
   /// Initializes Account closure response class.
   const AccountClosureResponse({
-    bool? accountClosure,
-  }) : super(
-          accountClosure: accountClosure,
-        );
+    super.accountClosure,
+  });
 
   /// Creates an instance from JSON.
   factory AccountClosureResponse.fromJson(