Merge branch 'dev' of https://github.com/KomodoPlatform/komodo-wallet into codex/check-if-user-is-signed-in-on-app-resume

Author: CharlVS

.devcontainer/Dockerfile

@@ -1,6 +1,6 @@
 FROM docker.io/ubuntu:22.04
 
-ENV FLUTTER_VERSION="3.32.2"
+ENV FLUTTER_VERSION="3.32.5"
 ENV USER="komodo"
 ENV USER_ID=1000
 ENV PATH=$PATH:/opt/flutter/bin

.docker/build.sh

@@ -40,10 +40,13 @@ docker build $PLATFORM_FLAG -f .docker/komodo-wallet-android.dockerfile . -t kom
 # Create the build directory ourselves to prevent it from being created by the Docker daemon (as root)
 mkdir -p ./build
 
+COMMIT_HASH=$(git rev-parse --short HEAD | cut -c1-7)
+
 ENV_ARGS=""
 ENV_VARS="GITHUB_API_PUBLIC_READONLY_TOKEN TRELLO_API_KEY \
 TRELLO_TOKEN TRELLO_BOARD_ID TRELLO_LIST_ID \
-FEEDBACK_API_KEY FEEDBACK_PRODUCTION_URL FEEDBACK_TEST_URL"
+FEEDBACK_API_KEY FEEDBACK_PRODUCTION_URL FEEDBACK_TEST_URL \
+COMMIT_HASH"
 
 for VAR in $ENV_VARS; do
   case "$VAR" in
@@ -55,6 +58,7 @@ for VAR in $ENV_VARS; do
     FEEDBACK_API_KEY) VALUE=$FEEDBACK_API_KEY ;;
     FEEDBACK_PRODUCTION_URL) VALUE=$FEEDBACK_PRODUCTION_URL ;;
     FEEDBACK_TEST_URL) VALUE=$FEEDBACK_TEST_URL ;;
+    COMMIT_HASH) VALUE=$COMMIT_HASH ;;
     *) VALUE= ;;
   esac
 
@@ -68,4 +72,4 @@ docker run $PLATFORM_FLAG --rm -v ./build:/app/build \
   -u "$HOST_UID:$HOST_GID" \
   $ENV_ARGS \
   komodo/komodo-wallet:latest sh -c \
-  "sudo chown -R komodo:komodo /app/build; flutter pub get --enforce-lockfile; flutter build web --no-pub || true; flutter build $BUILD_TARGET --config-only; flutter build $BUILD_TARGET --no-pub --$BUILD_MODE"
+  "sudo chown -R komodo:komodo /app/build; flutter pub get --enforce-lockfile; flutter build web --no-pub || true; flutter build $BUILD_TARGET --config-only; flutter build $BUILD_TARGET --no-pub --dart-define=COMMIT_HASH=$COMMIT_HASH --$BUILD_MODE"

.docker/komodo-wallet-android.dockerfile

@@ -1,6 +1,6 @@
 FROM komodo/android-sdk:35 AS final
 
-ENV FLUTTER_VERSION="3.32.2"
+ENV FLUTTER_VERSION="3.32.5"
 ENV HOME="/home/komodo"
 ENV USER="komodo"
 ENV PATH=$PATH:$HOME/flutter/bin

.github/actions/flutter-deps/action.yml

@@ -7,7 +7,7 @@ runs:
       uses: subosito/flutter-action@v2
       with:
         # NB! Keep up-to-date with the flutter version used for development
-        flutter-version: "3.32.2"
+        flutter-version: "3.32.5"
         channel: "stable"
 
     - name: Prepare build directory

.github/actions/generate-assets/action.yml

@@ -45,6 +45,22 @@ inputs:
 runs:
   using: "composite"
   steps:
+    - name: Determine commit hash
+      shell: bash
+      run: |
+        echo "Determining commit hash..."
+        if [ "$GITHUB_EVENT_NAME" = "pull_request" ]; then
+          # For PRs, use the HEAD of the feature branch
+          PR_SHA=$(jq -r .pull_request.head.sha "$GITHUB_EVENT_PATH")
+          COMMIT_HASH=${PR_SHA:0:7}
+          echo "Detected pull_request event. Using PR HEAD SHA: $COMMIT_HASH"
+        else
+          # Otherwise use the current checked-out HEAD
+          COMMIT_HASH=$(git rev-parse --short HEAD | cut -c1-7)
+          echo "Using git HEAD SHA: $COMMIT_HASH"
+        fi
+        # Export for subsequent steps
+        echo "COMMIT_HASH=$COMMIT_HASH" >> $GITHUB_ENV
     - name: Fetch packages and generate assets
       shell: bash
       env:
@@ -66,8 +82,7 @@ runs:
           unset GITHUB_API_PUBLIC_READONLY_TOKEN
         fi
 
-        # Get the current commit hash
-        COMMIT_HASH=$(git rev-parse --short HEAD)
+        # Now COMMIT_HASH comes from the previous step, not recalculated here.
 
         # Prepare build command with feedback service credentials
         BUILD_CMD="${{ inputs.BUILD_COMMAND }}"

.github/workflows/mobile-builds.yml

@@ -69,7 +69,7 @@ jobs:
           FEEDBACK_TEST_URL: ${{ secrets.FEEDBACK_TEST_URL }}
 
       # Flutter build with `--no-pub` flag fails on Android due to a
-      # known regression with the build system in 3.32.2.
+      # known regression with the build system in 3.32.5.
       # https://github.com/flutter/flutter/issues/169336
       - name: Temporary workaround for Android build issue
         if: ${{ matrix.platform == 'Android' }}

.github/workflows/roll-sdk-packages.yml

@@ -45,7 +45,7 @@ jobs:
         uses: subosito/flutter-action@v2
         with:
           # NB! Keep up-to-date with the flutter version used for development
-          flutter-version: "3.32.2"
+          flutter-version: "3.32.5"
           channel: "stable"
 
       - name: Determine configuration

app_theme/lib/src/dark/theme_global_dark.dart

@@ -5,15 +5,6 @@ ThemeData get themeGlobalDark {
   const Color inputBackgroundColor = Color.fromRGBO(51, 57, 72, 1);
   const Color textColor = Color.fromRGBO(255, 255, 255, 1);
 
-  SnackBarThemeData snackBarThemeLight() => const SnackBarThemeData(
-        elevation: 12.0,
-        shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.all(Radius.circular(4)),
-        ),
-        actionTextColor: Colors.green,
-        behavior: SnackBarBehavior.floating,
-      );
-
   OutlineInputBorder outlineBorderLight(Color lightAccentColor) =>
       OutlineInputBorder(
         borderSide: BorderSide(color: lightAccentColor),
@@ -55,15 +46,32 @@ ThemeData get themeGlobalDark {
       fontWeight: FontWeight.w300,
     ),
     labelLarge: const TextStyle(fontSize: 16.0, color: textColor),
-    bodyLarge:
-        TextStyle(fontSize: 14.0, color: textColor.withAlpha(128)), // 0.5 * 255
+    bodyLarge: TextStyle(
+      fontSize: 14.0,
+      color: textColor.withAlpha(128),
+    ), // 0.5 * 255
     bodySmall: TextStyle(
       fontSize: 12.0,
       color: textColor.withAlpha(204), // 0.8 * 255
       fontWeight: FontWeight.w400,
     ),
   );
 
+  SnackBarThemeData snackBarThemeLight() => SnackBarThemeData(
+        elevation: 12.0,
+        shape: const RoundedRectangleBorder(
+          borderRadius: BorderRadius.all(Radius.circular(18)),
+        ),
+        behavior: SnackBarBehavior.floating,
+        backgroundColor: colorScheme.primaryContainer,
+        contentTextStyle: textTheme.bodyLarge!.copyWith(
+          color: colorScheme.onPrimaryContainer,
+        ),
+        actionTextColor: colorScheme.onPrimaryContainer,
+        showCloseIcon: true,
+        closeIconColor: colorScheme.onPrimaryContainer.withAlpha(179), // 70%
+      );
+
   final customTheme = ThemeCustomDark();
   final theme = ThemeData(
     useMaterial3: false,
@@ -81,23 +89,26 @@ ThemeData get themeGlobalDark {
     dividerColor: const Color.fromRGBO(56, 67, 108, 1),
     appBarTheme: AppBarTheme(color: colorScheme.surface),
     iconTheme: IconThemeData(color: colorScheme.primary),
-    progressIndicatorTheme:
-        ProgressIndicatorThemeData(color: colorScheme.primary),
+    progressIndicatorTheme: ProgressIndicatorThemeData(
+      color: colorScheme.primary,
+    ),
     dialogTheme: const DialogThemeData(
       backgroundColor: Color.fromRGBO(14, 16, 27, 1),
       shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.all(
-          Radius.circular(16),
-        ),
+        borderRadius: BorderRadius.all(Radius.circular(16)),
       ),
     ),
     canvasColor: colorScheme.surface,
     hintColor: const Color.fromRGBO(183, 187, 191, 1),
     snackBarTheme: snackBarThemeLight(),
     textSelectionTheme: TextSelectionThemeData(
       cursorColor: const Color.fromRGBO(57, 161, 238, 1),
-      selectionColor:
-          const Color.fromRGBO(57, 161, 238, 1).withAlpha(77), // 0.3 * 255
+      selectionColor: const Color.fromRGBO(
+        57,
+        161,
+        238,
+        1,
+      ).withAlpha(77), // 0.3 * 255
       selectionHandleColor: const Color.fromRGBO(57, 161, 238, 1),
     ),
     inputDecorationTheme: InputDecorationTheme(
@@ -122,12 +133,12 @@ ThemeData get themeGlobalDark {
     ),
     elevatedButtonTheme: ElevatedButtonThemeData(
       style: ButtonStyle(
-        backgroundColor: WidgetStateProperty.resolveWith<Color?>(
-          (Set<WidgetState> states) {
-            if (states.contains(WidgetState.disabled)) return Colors.grey;
-            return colorScheme.primary;
-          },
-        ),
+        backgroundColor: WidgetStateProperty.resolveWith<Color?>((
+          Set<WidgetState> states,
+        ) {
+          if (states.contains(WidgetState.disabled)) return Colors.grey;
+          return colorScheme.primary;
+        }),
       ),
     ),
     segmentedButtonTheme: SegmentedButtonThemeData(
@@ -138,19 +149,14 @@ ThemeData get themeGlobalDark {
         foregroundColor: textColor.withAlpha(179), // 0.7 * 255
         selectedForegroundColor: textColor,
         side: BorderSide(color: colorScheme.outlineVariant),
-        shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(8),
-        ),
+        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
         padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 4),
       ),
     ),
     tabBarTheme: TabBarThemeData(
       labelColor: textColor,
       indicator: UnderlineTabIndicator(
-        borderSide: BorderSide(
-          width: 2.0,
-          color: colorScheme.primary,
-        ),
+        borderSide: BorderSide(width: 2.0, color: colorScheme.primary),
         // Match the card's border radius
         insets: const EdgeInsets.symmetric(horizontal: 18),
       ),
@@ -184,14 +190,16 @@ ThemeData get themeGlobalDark {
       backgroundColor: colorScheme.surface,
       selectedItemColor: textColor,
       unselectedItemColor: const Color.fromRGBO(173, 175, 198, 1),
-      unselectedLabelStyle:
-          const TextStyle(fontSize: 12, fontWeight: FontWeight.w600),
-      selectedLabelStyle:
-          const TextStyle(fontSize: 12, fontWeight: FontWeight.w700),
-    ),
-    extensions: [
-      customTheme,
-    ],
+      unselectedLabelStyle: const TextStyle(
+        fontSize: 12,
+        fontWeight: FontWeight.w600,
+      ),
+      selectedLabelStyle: const TextStyle(
+        fontSize: 12,
+        fontWeight: FontWeight.w700,
+      ),
+    ),
+    extensions: [customTheme],
   );
 
   // Initialize theme-dependent colors after theme creation