chore: update to charts dev branch

balakrishna-deriv · balakrishna-deriv · commit fc3c6ccbf438 · 2024-06-18T14:18:22.000+08:00
diff --git a/.github/workflows/generate_preview_link.yml b/.github/workflows/generate_preview_link.yml
@@ -1,8 +1,8 @@
 name: Generate preview link
 
 on:
-  pull_request_target:
-    types: [opened, synchronize]
+    pull_request_target:
+        types: [opened, synchronize]
 
 concurrency:
     group: cloudflare-pages-build-${{ github.head_ref }}
@@ -12,116 +12,116 @@ jobs:
     build_and_deploy_preview_link:
         runs-on: Ubuntu-latest
         permissions:
-          checks: write
-          pull-requests: write
+            checks: write
+            pull-requests: write
         steps:
-          - name: Verify user
-            uses: "deriv-com/shared-actions/.github/actions/verify_user_in_organization@v1"
-            with:
-              username: ${{github.event.pull_request.user.login}}
-              token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}    
-
-          - name: Post preview build comment
-            id: post_preview_build_comment
-            uses: 'deriv-com/shared-actions/.github/actions/post_preview_build_comment@v1'
-            with:
+            - name: Verify user
+              uses: 'deriv-com/shared-actions/.github/actions/verify_user_in_organization@v1'
+              with:
+                  username: ${{github.event.pull_request.user.login}}
+                  token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
+
+            - name: Post preview build comment
+              id: post_preview_build_comment
+              uses: 'deriv-com/shared-actions/.github/actions/post_preview_build_comment@v1'
+              with:
                   issue_number: ${{github.event.number}}
                   head_sha: ${{github.event.pull_request.head.sha}}
 
-          - name: Checkout SmartCharts     
-            uses: 'binary-com/SmartCharts/.github/actions/checkout@master'
-            with:
+            - name: Checkout SmartCharts
+              uses: 'binary-com/SmartCharts/.github/actions/checkout@master'
+              with:
                   repository: ${{github.event.pull_request.user.login}}/SmartCharts
                   path: SmartCharts
                   ref: ${{github.head_ref}}
                   alternate_repository: 'binary-com/SmartCharts'
                   alternate_ref: master
 
-          - name: Checkout deriv-app
-            id:   deriv_app
-            uses: 'binary-com/SmartCharts/.github/actions/checkout@master'
-            with:
+            - name: Checkout deriv-app
+              id: deriv_app
+              uses: 'binary-com/SmartCharts/.github/actions/checkout@master'
+              with:
                   repository: ${{github.event.pull_request.user.login}}/deriv-app
                   path: deriv-app
                   ref: ${{github.head_ref}}
                   alternate_repository: 'binary-com/deriv-app'
                   alternate_ref: master
 
-          - name: Custom flutter-chart
-            id:   flutter_chart
-            uses: 'binary-com/SmartCharts/.github/actions/checkout@master'
-            with:
+            - name: Custom flutter-chart
+              id: flutter_chart
+              uses: 'binary-com/SmartCharts/.github/actions/checkout@master'
+              with:
                   repository: ${{github.event.pull_request.user.login}}/flutter-chart
                   path: flutter-chart
                   ref: ${{github.head_ref}}
                   alternate_repository: 'regentmarkets/flutter-chart'
-                  alternate_ref: fe-changes
+                  alternate_ref: dev
                   token: ${{ secrets.REPO_READ_TOKEN }}
 
-          - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf
-            with:
+            - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf
+              with:
                   flutter-version: '3.10.6'
                   channel: 'stable'
                   cache: true
 
-          - name: Add SSH key
-            run: |
-              mkdir -p ~/.ssh
-              echo "${{ secrets.SSH_KEY }}" > ~/.ssh/github_action_key
-              chmod 600 ~/.ssh/github_action_key
+            - name: Add SSH key
+              run: |
+                  mkdir -p ~/.ssh
+                  echo "${{ secrets.SSH_KEY }}" > ~/.ssh/github_action_key
+                  chmod 600 ~/.ssh/github_action_key
 
-          - name: Build flutter
-            env:
-              GIT_SSH_COMMAND: 'ssh -i ~/.ssh/github_action_key'  
-            run: |
+            - name: Build flutter
+              env:
+                  GIT_SSH_COMMAND: 'ssh -i ~/.ssh/github_action_key'
+              run: |
                   cd SmartCharts/chart_app
                   flutter pub get
                   flutter build web --web-renderer html --release
 
-          - name: Setup Node
-            uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8
-            with:
+            - name: Setup Node
+              uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8
+              with:
                   node-version: 18.x
 
-          - name: Setup deriv-app
-            run: cd deriv-app && npm i -g lerna@^5.5.1 && npm run bootstrap
+            - name: Setup deriv-app
+              run: cd deriv-app && npm i -g lerna@^5.5.1 && npm run bootstrap
 
-          - name: Remove @deriv-charts in deriv-app
-            run: rm -rf deriv-app/node_modules/@deriv/deriv-charts/dist
+            - name: Remove @deriv-charts in deriv-app
+              run: rm -rf deriv-app/node_modules/@deriv/deriv-charts/dist
 
-          - name: Setup SmartCharts
-            run: cd SmartCharts && npm install
+            - name: Setup SmartCharts
+              run: cd SmartCharts && npm install
 
-          - name: Build SmartCharts
-            run: cd SmartCharts && npm run build -- --output-path ../deriv-app/node_modules/@deriv/deriv-charts/dist
+            - name: Build SmartCharts
+              run: cd SmartCharts && npm run build -- --output-path ../deriv-app/node_modules/@deriv/deriv-charts/dist
 
-          - name: Run Tests
-            run: cd SmartCharts && npm run test
+            - name: Run Tests
+              run: cd SmartCharts && npm run test
 
-          - name: Build deriv-app
-            env:
-              NODE_ENV: 'production'
-            run: cd deriv-app && npm run build:all
+            - name: Build deriv-app
+              env:
+                  NODE_ENV: 'production'
+              run: cd deriv-app && npm run build:all
 
-          - name: Setup Node
-            uses: actions/setup-node@9ced9a43a244f3ac94f13bfd896db8c8f30da67a
-            with:
-                node-version: 20
+            - name: Setup Node
+              uses: actions/setup-node@9ced9a43a244f3ac94f13bfd896db8c8f30da67a
+              with:
+                  node-version: 20
 
-          - name: Publish to CF pages branch
-            id: publish_to_pages_branch
-            uses: 'deriv-com/shared-actions/.github/actions/publish_to_pages_branch@v1'
-            with:
+            - name: Publish to CF pages branch
+              id: publish_to_pages_branch
+              uses: 'deriv-com/shared-actions/.github/actions/publish_to_pages_branch@v1'
+              with:
                   CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_TEST_LINKS_API_TOKEN }}
                   CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_TEST_LINKS_ACCOUNT_ID }}
                   project_name: 'smartcharts-preview'
                   branch_name: pr-${{github.event.number}}${{ steps.deriv_app.outputs.ref_exists == 'true' && '-dtra' || ''}}${{ steps.flutter_chart.outputs.ref_exists == 'true' && '-flutt' || ''}}
                   output_dir: deriv-app/packages/core/dist
 
-          - name: 'Generate preview link comment'
-            if: always() && steps.post_preview_build_comment.outcome == 'success'
-            uses: 'deriv-com/shared-actions/.github/actions/post_preview_link_comment@v1'
-            with:
+            - name: 'Generate preview link comment'
+              if: always() && steps.post_preview_build_comment.outcome == 'success'
+              uses: 'deriv-com/shared-actions/.github/actions/post_preview_link_comment@v1'
+              with:
                   issue_number: ${{github.event.number}}
                   check_run_id: ${{steps.post_preview_build_comment.outputs.check_run_id}}
                   preview_url: ${{steps.publish_to_pages_branch.outputs.cf_pages_url}}
diff --git a/.github/workflows/publish_deriv_charts_and_update_deriv_app.yml b/.github/workflows/publish_deriv_charts_and_update_deriv_app.yml
@@ -21,7 +21,7 @@ jobs:
               with:
                   repository: 'regentmarkets/flutter-chart'
                   path: flutter-chart
-                  ref: fe-changes
+                  ref: dev
                   token: ${{ secrets.REPO_READ_TOKEN }}
 
             - uses: subosito/flutter-action@62f096cacda5168a3bd7b95793373be14fa4fbaf
diff --git a/chart_app/lib/deriv_chart_wrapper.dart b/chart_app/lib/deriv_chart_wrapper.dart
@@ -359,8 +359,10 @@ class DerivChartWrapperState extends State<DerivChartWrapper> {
                       isLive: configModel.isLive,
                       onCrosshairDisappeared: JsInterop.onCrosshairDisappeared,
                       onCrosshairHover: _onCrosshairHover,
-                      maxCurrentTickOffset:
-                          _getMaxCurrentTickOffset(rightPadding),
+                      chartAxisConfig: ChartAxisConfig(
+                        maxCurrentTickOffset:
+                            _getMaxCurrentTickOffset(rightPadding),
+                      ),
                       msPerPx: configModel.startWithDataFitMode
                           ? null
                           : configModel.msPerPx,
diff --git a/chart_app/lib/src/painters/blink_tick_painter.dart b/chart_app/lib/src/painters/blink_tick_painter.dart
@@ -26,17 +26,17 @@ class BlinkingTickPainter<T extends BlinkingTickIndicator>
     double? dotX;
 
     if (series.previousObject == null) {
-      animatedValue = series.value;
+      animatedValue = series.quote;
       if (series.epoch != null) {
         dotX = epochToX(series.epoch!);
       }
     } else {
       final BarrierObject previousBarrier = series.previousObject!;
-      animatedValue = series.value;
+      animatedValue = series.quote;
 
       animatedValue = ui.lerpDouble(
-        previousBarrier.value,
-        series.value,
+        previousBarrier.quote,
+        series.quote,
         animationInfo.currentTickPercent,
       );
 
diff --git a/chart_app/lib/src/series/time_interval_painter.dart b/chart_app/lib/src/series/time_interval_painter.dart
@@ -32,7 +32,7 @@ class TimeIntervalPainter<T extends TimeIntervalIndicator>
       ..strokeWidth = 1
       ..color = style.color;
 
-    double y = quoteToY(series.value as double);
+    double y = quoteToY(series.quote as double);
 
     final double labelHalfHeight = style.labelHeight / 2;
 
@@ -50,7 +50,6 @@ class TimeIntervalPainter<T extends TimeIntervalIndicator>
     //set Y axis below the marker
     y = y + style.labelHeight;
 
-
     // creating labelArea rectangle
     final Rect labelArea = Rect.fromCenter(
       center: Offset(
