feat(feedback): comprehensive feedback system overhaul with screenshot protection

.github/workflows/docker-android-build.yml

@@ -46,6 +46,13 @@ jobs:
       - name: Build Android image
         env:
           GITHUB_API_PUBLIC_READONLY_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # Optional feedback provider secrets to embed dart-defines
+          TRELLO_API_KEY: ${{ secrets.TRELLO_API_KEY }}
+          TRELLO_TOKEN: ${{ secrets.TRELLO_TOKEN }}
+          TRELLO_BOARD_ID: ${{ secrets.TRELLO_BOARD_ID }}
+          TRELLO_LIST_ID: ${{ secrets.TRELLO_LIST_ID }}
+          FEEDBACK_API_KEY: ${{ secrets.FEEDBACK_API_KEY }}
+          FEEDBACK_PRODUCTION_URL: ${{ secrets.FEEDBACK_PRODUCTION_URL }}
         run: |
           chmod +x .docker/build.sh
           sh .docker/build.sh apk release

.github/workflows/mobile-builds.yml

@@ -58,6 +58,15 @@ jobs:
           store-password: ${{ secrets.ANDROID_STORE_PASSWORD }}
           key-password: ${{ secrets.ANDROID_KEY_PASSWORD }}
 
+      # Flutter build with `--no-pub` flag fails on Android due to a
+      # known regression with the build system in 3.32.5.
+      # https://github.com/flutter/flutter/issues/169336
+      # Run config-only before the full double-build to ensure success.
+      - name: Temporary workaround for Android build issue
+        if: ${{ matrix.platform == 'Android' }}
+        run: |
+          flutter build apk --config-only
+
       - name: Fetch packages and generate assets
         uses: ./.github/actions/generate-assets
         with:
@@ -68,19 +77,7 @@ jobs:
           TRELLO_LIST_ID: ${{ secrets.TRELLO_LIST_ID }}
           FEEDBACK_API_KEY: ${{ secrets.FEEDBACK_API_KEY }}
           FEEDBACK_PRODUCTION_URL: ${{ secrets.FEEDBACK_PRODUCTION_URL }}
-
-      # Flutter build with `--no-pub` flag fails on Android due to a
-      # 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' }}
-        run: |
-          flutter build apk --config-only
-
-      - name: Build for ${{ matrix.platform }}
-        env:
-          GITHUB_API_PUBLIC_READONLY_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ${{ matrix.build_command }}
+          BUILD_COMMAND: ${{ matrix.build_command }}
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4

analysis_options.yaml

@@ -11,6 +11,11 @@ include:
   - package:bloc_lint/recommended.yaml
   - package:flutter_lints/flutter.yaml
 
+analyzer:
+  exclude:
+    - "**/*.freezed.dart"
+    - "**/*.g.dart"
+
 linter:
   # The lint rules applied to this project can be customized in the
   # section below to disable rules from the `package:flutter_lints/flutter.yaml`

assets/translations/en.json

@@ -303,9 +303,28 @@
   "feedbackFormDescription": "Our mission to improve the wallet never stops, and your feedback is highly appreciated!",
   "feedbackFormThanksTitle": "Thank you for your feedback",
   "feedbackFormThanksDescription": "We will send a response to your email address as soon as possible",
+  "feedbackFormKindQuestion": "What kind of feedback do you want to give?",
+  "feedbackFormDescribeTitle": "Your feedback",
+  "feedbackFormContactRequired": "How can we contact you?",
+  "feedbackFormContactOptional": "How can we contact you? (Optional)",
+  "feedbackFormMessageHint": "Enter your feedback here...",
+  "feedbackFormBugReport": "Bug Report",
+  "feedbackFormFeatureRequest": "Feature Request",
+  "feedbackFormSupportRequest": "Support Request",
+  "feedbackFormOther": "Other",
+  "feedbackFormDiscord": "Discord",
+  "feedbackFormMatrix": "Matrix",
+  "feedbackFormTelegram": "Telegram",
+  "feedbackFormSelectContactMethod": "Select contact method",
+  "feedbackFormDiscordHint": "Discord username (e.g., username123)",
+  "feedbackFormMatrixHint": "Matrix ID (e.g., @user:matrix.org)",
+  "feedbackFormTelegramHint": "Telegram username (e.g., @username)",
+  "feedbackFormEmailHint": "Your email address",
+  "feedbackFormContactHint": "Enter your contact details",
+  "feedbackFormContactOptOut": "I don't want to share contact info",
   "email": "Email",
   "emailValidatorError": "Please enter a valid email address",
-  "contactRequiredError": "Contact details are required for support requests",
+  "contactRequiredError": "Please provide both contact method and details",
   "contactDetailsMaxLengthError": "Contact details must be {} characters or less",
   "discordUsernameValidatorError": "Please enter a valid Discord username (2-32 characters, letters, numbers, dots, underscores)",
   "telegramUsernameValidatorError": "Please enter a valid Telegram username (5-32 characters, letters, numbers, underscores)",
@@ -491,7 +510,6 @@
   "feedback": "Feedback",
   "feedbackViewTitle": "Send us your feedback",
   "feedbackPageDescription": "Help us improve by sharing your suggestions, reporting bugs, or giving general feedback.",
-  "sendFeedbackButton": "Share your feedback",
   "feedbackThankyou": "Thank you for your feedback!",
   "feedbackError": "Failed to submit feedback",
   "selectAToken": "Select a token",

lib/bloc/feedback_form/feedback_form_bloc.dart

@@ -15,6 +15,7 @@ class FeedbackFormBloc extends Bloc<FeedbackFormEvent, FeedbackFormState> {
     on<FeedbackFormMessageChanged>(_onMessageChanged);
     on<FeedbackFormContactMethodChanged>(_onContactMethodChanged);
     on<FeedbackFormContactDetailsChanged>(_onContactDetailsChanged);
+    on<FeedbackFormContactOptOutChanged>(_onContactOptOutChanged);
     on<FeedbackFormSubmitted>(_onSubmitted);
   }
 
@@ -29,21 +30,25 @@ class FeedbackFormBloc extends Bloc<FeedbackFormEvent, FeedbackFormState> {
       event.type,
       state.contactMethod,
     );
-    emit(state.copyWith(
-      feedbackType: event.type,
-      contactDetailsError: contactError,
-    ));
+    emit(
+      state.copyWith(
+        feedbackType: event.type,
+        contactDetailsError: contactError,
+      ),
+    );
   }
 
   void _onMessageChanged(
     FeedbackFormMessageChanged event,
     Emitter<FeedbackFormState> emit,
   ) {
     final text = _sanitizeInput(event.message);
-    emit(state.copyWith(
-      feedbackText: text,
-      feedbackTextError: _validateFeedbackText(text),
-    ));
+    emit(
+      state.copyWith(
+        feedbackText: text,
+        feedbackTextError: _validateFeedbackText(text),
+      ),
+    );
   }
 
   void _onContactMethodChanged(
@@ -55,8 +60,9 @@ class FeedbackFormBloc extends Bloc<FeedbackFormEvent, FeedbackFormState> {
       state.feedbackType,
       event.method,
     );
-    emit(state.copyWith(
-        contactMethod: event.method, contactDetailsError: error));
+    emit(
+      state.copyWith(contactMethod: event.method, contactDetailsError: error),
+    );
   }
 
   void _onContactDetailsChanged(
@@ -72,6 +78,33 @@ class FeedbackFormBloc extends Bloc<FeedbackFormEvent, FeedbackFormState> {
     emit(state.copyWith(contactDetails: details, contactDetailsError: error));
   }
 
+  void _onContactOptOutChanged(
+    FeedbackFormContactOptOutChanged event,
+    Emitter<FeedbackFormState> emit,
+  ) {
+    if (event.optOut && !state.isSupportType) {
+      emit(
+        state.copyWith(
+          contactOptOut: true,
+          contactMethod: null,
+          contactDetails: '',
+          contactDetailsError: null,
+        ),
+      );
+      return;
+    }
+
+    final error = _validateContactDetails(
+      state.contactDetails,
+      state.feedbackType,
+      state.contactMethod,
+      contactOptOut: event.optOut,
+    );
+    emit(
+      state.copyWith(contactOptOut: event.optOut, contactDetailsError: error),
+    );
+  }
+
   Future<void> _onSubmitted(
     FeedbackFormSubmitted event,
     Emitter<FeedbackFormState> emit,
@@ -86,10 +119,12 @@ class FeedbackFormBloc extends Bloc<FeedbackFormEvent, FeedbackFormState> {
     if (state.feedbackType == null ||
         feedbackErr != null ||
         contactErr != null) {
-      emit(state.copyWith(
-        feedbackTextError: feedbackErr,
-        contactDetailsError: contactErr,
-      ));
+      emit(
+        state.copyWith(
+          feedbackTextError: feedbackErr,
+          contactDetailsError: contactErr,
+        ),
+      );
       return;
     }
 
@@ -99,17 +134,16 @@ class FeedbackFormBloc extends Bloc<FeedbackFormEvent, FeedbackFormState> {
         feedbackType: state.feedbackType,
         feedbackText: state.feedbackText,
         contactMethod: state.contactMethod,
-        contactDetails:
-            state.contactDetails.isNotEmpty ? state.contactDetails : null,
-      );
-      await _onSubmit(
-        data.toFormattedDescription(),
-        extras: data.toMap(),
+        contactDetails: state.contactDetails.isNotEmpty
+            ? state.contactDetails
+            : null,
       );
+      await _onSubmit(data.toFormattedDescription(), extras: data.toMap());
       emit(state.copyWith(status: FeedbackFormStatus.success));
     } catch (e) {
-      emit(state.copyWith(
-          status: FeedbackFormStatus.failure, errorMessage: '$e'));
+      emit(
+        state.copyWith(status: FeedbackFormStatus.failure, errorMessage: '$e'),
+      );
     }
   }
 
@@ -129,19 +163,27 @@ class FeedbackFormBloc extends Bloc<FeedbackFormEvent, FeedbackFormState> {
   String? _validateContactDetails(
     String value,
     FeedbackType? type,
-    ContactMethod? method,
-  ) {
+    ContactMethod? method, {
+    bool? contactOptOut,
+  }) {
     final trimmed = value.trim();
     final hasMethod = method != null;
     final hasDetails = trimmed.isNotEmpty;
+    final optedOut = contactOptOut ?? state.contactOptOut;
 
     if (type == FeedbackType.support || type == FeedbackType.missingCoins) {
       if (!hasMethod || !hasDetails) {
         return LocaleKeys.contactRequiredError.tr();
       }
     } else {
-      if ((hasMethod && !hasDetails) || (!hasMethod && hasDetails)) {
-        return LocaleKeys.contactRequiredError.tr();
+      if (!optedOut) {
+        if (!hasMethod || !hasDetails) {
+          return LocaleKeys.contactRequiredError.tr();
+        }
+      } else {
+        if ((hasMethod && !hasDetails) || (!hasMethod && hasDetails)) {
+          return LocaleKeys.contactRequiredError.tr();
+        }
       }
     }
 
@@ -187,9 +229,12 @@ class FeedbackFormBloc extends Bloc<FeedbackFormEvent, FeedbackFormState> {
         .trim()
         .replaceAll(RegExp(r'<[^>]*>'), '')
         .replaceAll(
-            RegExp(r'<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>',
-                caseSensitive: false),
-            '')
+          RegExp(
+            r'<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>',
+            caseSensitive: false,
+          ),
+          '',
+        )
         .replaceAll(RegExp(r'javascript:', caseSensitive: false), '')
         .replaceAll(RegExp(r'data:[^,]*script[^,]*,', caseSensitive: false), '')
         .replaceAll(RegExp(r'\n{3,}'), '\n\n');

lib/bloc/feedback_form/feedback_form_event.dart

@@ -43,6 +43,15 @@ class FeedbackFormContactDetailsChanged extends FeedbackFormEvent {
   List<Object?> get props => [details];
 }
 
+class FeedbackFormContactOptOutChanged extends FeedbackFormEvent {
+  const FeedbackFormContactOptOutChanged(this.optOut);
+
+  final bool optOut;
+
+  @override
+  List<Object?> get props => [optOut];
+}
+
 class FeedbackFormSubmitted extends FeedbackFormEvent {
   const FeedbackFormSubmitted();
 }

lib/bloc/feedback_form/feedback_form_state.dart

@@ -10,6 +10,7 @@ class FeedbackFormState extends Equatable {
     this.contactMethod,
     this.contactDetails = '',
     this.contactDetailsError,
+    this.contactOptOut = false,
     this.status = FeedbackFormStatus.initial,
     this.errorMessage,
   });
@@ -20,6 +21,7 @@ class FeedbackFormState extends Equatable {
   final ContactMethod? contactMethod;
   final String contactDetails;
   final String? contactDetailsError;
+  final bool contactOptOut;
   final FeedbackFormStatus status;
   final String? errorMessage;
 
@@ -29,13 +31,27 @@ class FeedbackFormState extends Equatable {
       contactDetailsError == null &&
       feedbackText.trim().isNotEmpty;
 
+  bool get isSubmitting => status == FeedbackFormStatus.submitting;
+
+  bool get isSupportType =>
+      feedbackType == FeedbackType.support ||
+      feedbackType == FeedbackType.missingCoins;
+
+  bool get isContactOptOutVisible => !isSupportType;
+
+  bool get isContactRequired => isSupportType || !contactOptOut;
+
+  bool get isContactRowDisabled =>
+      isSubmitting || (isContactOptOutVisible && contactOptOut);
+
   FeedbackFormState copyWith({
     FeedbackType? feedbackType,
     String? feedbackText,
     String? feedbackTextError,
     ContactMethod? contactMethod,
     String? contactDetails,
     String? contactDetailsError,
+    bool? contactOptOut,
     FeedbackFormStatus? status,
     String? errorMessage,
   }) {
@@ -46,20 +62,22 @@ class FeedbackFormState extends Equatable {
       contactMethod: contactMethod ?? this.contactMethod,
       contactDetails: contactDetails ?? this.contactDetails,
       contactDetailsError: contactDetailsError,
+      contactOptOut: contactOptOut ?? this.contactOptOut,
       status: status ?? this.status,
       errorMessage: errorMessage ?? this.errorMessage,
     );
   }
 
   @override
   List<Object?> get props => [
-        feedbackType,
-        feedbackText,
-        feedbackTextError,
-        contactMethod,
-        contactDetails,
-        contactDetailsError,
-        status,
-        errorMessage,
-      ];
+    feedbackType,
+    feedbackText,
+    feedbackTextError,
+    contactMethod,
+    contactDetails,
+    contactDetailsError,
+    contactOptOut,
+    status,
+    errorMessage,
+  ];
 }