Merge branch 'main' into age-page-readable

.github/workflows/main_deploy.yaml

@@ -28,6 +28,7 @@ jobs:
         run: ./scripts/prepare-web.sh
       - name: Build Release Web
         run: ./scripts/build-web.sh
+        
       - name: Upload files
         uses: actions/upload-artifact@v3
         with:
@@ -64,19 +65,19 @@ jobs:
     environment: staging
     env:
       SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-      SENTRY_BASE_TOKEN: ${{ secrets.SENTRY_BASE_TOKEN }}
-      SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
-      SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
-      CI_COMMIT_SHA: ${{ github.sha }}
+      SENTRY_RELEASE: ${{ github.sha }}
+      SENTRY_PROJECT: ${{ vars.SENTRY_PROJECT }}
+      SENTRY_ORG: ${{ vars.SENTRY_ORG }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+      - run: cat .github/workflows/versions.env >> $GITHUB_ENV
+      - uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ env.FLUTTER_VERSION }}
       - name: Download web
         uses: actions/download-artifact@v3
         with:
           name: web
           path: build/web
-      - name: Install sentry CLI
-        run: |
-          curl -sL https://sentry.io/get-cli/ | bash
       - name: Update sentry
-        run: ./scripts/upload-sentry.sh
+        run: flutter packages pub run sentry_dart_plugin

lib/pangea/models/choreo_record.dart

@@ -247,22 +247,27 @@ class ChoreoRecord {
       choreoSteps.isNotEmpty ? choreoSteps.last.text : "";
 }
 
-/// new step are saved
+/// A new ChoreoRecordStep is saved in the following cases:
 /// 1) before every system-provided text is accepted, if final text is different
 /// from last step
 /// 2) on the acceptance of system-provided text
 /// 3) on message send, if final text is different from last step
+/// 4) on the acceptance of an it step
+/// 5) on the start of it
 ///
-/// user edit
-/// "hey ther"
+/// Example 1:
+/// the user types "hey ther"
+/// IGC suggests "there"
 /// user accepts "there" correction
-/// "hey there"
-/// step made for user edits and step made for system suggestion
-/// user goes through IT, chooses "hola"
-/// "hola"
-/// step saved
-/// adds "amigo"
-/// step saved
+/// text is now "hey there"
+/// A step is made for the original input 'hey there' and a step is made for system suggestion
+///
+/// Example 2:
+/// user write "hi friend"
+/// a step is made for the original input 'hi friend'
+/// the user selects IT and a step is made
+/// the user chooses "hola" and a step is saved
+/// adds "amigo" and a step saved
 class ChoreoRecordStep {
   /// text after changes have been made
   String text;

pubspec.yaml

@@ -132,6 +132,7 @@ dev_dependencies:
     sdk: flutter
   license_checker: ^1.6.0
   msix: ^3.6.2
+  sentry_dart_plugin: ^1.0.0
   translations_cleaner: ^0.0.5
 
 flutter_native_splash:

scripts/upload-sentry.sh

@@ -1,23 +0,0 @@
-#!/bin/sh -ve
-
-# Build a release version of the app for a platform and upload symbols
-export OUTPUT_FOLDER_WEB=./build/web/
-export SENTRY_RELEASE=$CI_COMMIT_SHA
-export SENTRY_PROJECT="${SENTRY_PROJECT:-client}"
-export SENTRY_ORG="${SENTRY_ORG:-pangea-chat}"
-
-echo "[run] Uploading sourcemaps for $SENTRY_RELEASE"
-echo "[run] $SENTRY_PROJECT @ $SENTRY_ORG / $OUTPUT_FOLDER_WEB"
-sentry-cli releases new $SENTRY_RELEASE --org $SENTRY_ORG
-sentry-cli releases set-commits $CI_COMMIT_SHA --auto
-sentry-cli releases files $SENTRY_RELEASE upload-sourcemaps . \
-    --ext dart \
-    --rewrite
-
-(cd $OUTPUT_FOLDER_WEB
-sentry-cli releases files $SENTRY_RELEASE upload-sourcemaps . \
-    --ext map \
-    --ext js \
-    --rewrite)
-
-sentry-cli releases finalize $SENTRY_RELEASE

sentry.properties

@@ -0,0 +1,6 @@
+upload_debug_symbols=true
+upload_source_maps=true
+upload_sources=true
+wait_for_processing=false
+log_level=info
+commits=auto