chore(cat-voices): cherry-pick f15/cat-app changes (#3542)

* disable auto deploy on merge (#3540)

* chore(cat-voices): update registration acknowledgements (#3539)

* chore: remove drep checkbox

* chore: wording

* fix: failing test

Author: damian-molinski

catalyst_voices/apps/voices/lib/pages/registration/create_base_profile/stage/widgets/drep_approval_contingency_checkbox.dart

@@ -1,5 +1,4 @@
 import 'package:catalyst_voices/common/ext/build_context_ext.dart';
-import 'package:catalyst_voices/pages/registration/create_base_profile/stage/widgets/drep_approval_contingency_checkbox.dart';
 import 'package:catalyst_voices/pages/registration/create_base_profile/stage/widgets/registration_conditions_checkbox.dart';
 import 'package:catalyst_voices/pages/registration/create_base_profile/stage/widgets/tos_and_privacy_policy_checkbox.dart';
 import 'package:catalyst_voices_localization/catalyst_voices_localization.dart';
@@ -18,7 +17,6 @@ class InstructionsAcknowledgements extends StatelessWidget {
         _TitleText(),
         RegistrationConditionsCheckbox(),
         TosAndPrivacyPolicyCheckbox(),
-        DrepApprovalContingencyCheckbox(),
       ],
     );
   }

catalyst_voices/apps/voices/lib/pages/registration/create_base_profile/stage/widgets/drep_approval_contingency_rich_text.dart

@@ -26,7 +26,6 @@ project: {
 	}
 	deployment: {
 		on: {
-			merge: {}
 			tag: {}
 		}
 
@@ -136,7 +135,6 @@ project: {
 	release: {
 		docker: {
 			on: {
-				merge: {}
 				tag: {}
 			}
 			config: {

catalyst_voices/apps/voices/lib/pages/registration/create_base_profile/stage/widgets/instructions_acknowledgements.dart

@@ -16,7 +16,6 @@ final class BaseProfileCubit extends Cubit<BaseProfileStateData>
                 username: Username.dirty('Dev'),
                 conditionsAccepted: true,
                 tosAndPrivacyPolicyAccepted: true,
-                drepApprovalContingencyAccepted: true,
               )
             : const BaseProfileStateData(),
       );
@@ -35,13 +34,6 @@ final class BaseProfileCubit extends Cubit<BaseProfileStateData>
     emit(state.copyWith(conditionsAccepted: accepted));
   }
 
-  @override
-  void updateDrepApprovalContingency({
-    required bool accepted,
-  }) {
-    emit(state.copyWith(drepApprovalContingencyAccepted: accepted));
-  }
-
   @override
   void updateEmail(Email value) {
     final receiveEmails = state.receiveEmails.copyWith(
@@ -74,8 +66,6 @@ final class BaseProfileCubit extends Cubit<BaseProfileStateData>
 abstract interface class BaseProfileManager {
   void updateConditions({required bool accepted});
 
-  void updateDrepApprovalContingency({required bool accepted});
-
   void updateEmail(Email value);
 
   void updateReceiveEmails({required bool isAccepted});

catalyst_voices/blueprint.cue

@@ -7,19 +7,16 @@ final class BaseProfileStateData extends Equatable {
   final Username username;
   final bool conditionsAccepted;
   final bool tosAndPrivacyPolicyAccepted;
-  final bool drepApprovalContingencyAccepted;
 
   const BaseProfileStateData({
     this.email = const Email.pure(),
     this.receiveEmails = const ReceiveEmails(),
     this.username = const Username.pure(),
     this.conditionsAccepted = false,
     this.tosAndPrivacyPolicyAccepted = false,
-    this.drepApprovalContingencyAccepted = false,
   });
 
-  bool get arAcknowledgementsAccepted =>
-      conditionsAccepted && tosAndPrivacyPolicyAccepted && drepApprovalContingencyAccepted;
+  bool get arAcknowledgementsAccepted => conditionsAccepted && tosAndPrivacyPolicyAccepted;
 
   bool get isBaseProfileDataValid {
     if (!email.isValid || !username.isValid) {
@@ -42,7 +39,6 @@ final class BaseProfileStateData extends Equatable {
     receiveEmails,
     conditionsAccepted,
     tosAndPrivacyPolicyAccepted,
-    drepApprovalContingencyAccepted,
   ];
 
   BaseProfileStateData copyWith({
@@ -51,16 +47,13 @@ final class BaseProfileStateData extends Equatable {
     Username? username,
     bool? conditionsAccepted,
     bool? tosAndPrivacyPolicyAccepted,
-    bool? drepApprovalContingencyAccepted,
   }) {
     return BaseProfileStateData(
       email: email ?? this.email,
       receiveEmails: receiveEmails ?? this.receiveEmails,
       username: username ?? this.username,
       conditionsAccepted: conditionsAccepted ?? this.conditionsAccepted,
       tosAndPrivacyPolicyAccepted: tosAndPrivacyPolicyAccepted ?? this.tosAndPrivacyPolicyAccepted,
-      drepApprovalContingencyAccepted:
-          drepApprovalContingencyAccepted ?? this.drepApprovalContingencyAccepted,
     );
   }
 }

catalyst_voices/packages/internal/catalyst_voices_blocs/lib/src/registration/cubits/base_profile_cubit.dart

@@ -49,32 +49,6 @@ void main() {
       ],
     );
 
-    blocTest<BaseProfileCubit, BaseProfileStateData>(
-      'emits updated drepApprovalContingencyAccepted when updateDrepApprovalContingency is called with true',
-      build: () => baseProfileCubit,
-      act: (cubit) => cubit.updateDrepApprovalContingency(accepted: true),
-      expect: () => [
-        isA<BaseProfileStateData>().having(
-          (e) => e.drepApprovalContingencyAccepted,
-          'drepApprovalContingencyAccepted',
-          true,
-        ),
-      ],
-    );
-
-    blocTest<BaseProfileCubit, BaseProfileStateData>(
-      'emits updated drepApprovalContingencyAccepted when updateDrepApprovalContingency is called with false',
-      build: () => baseProfileCubit,
-      act: (cubit) => cubit.updateDrepApprovalContingency(accepted: false),
-      expect: () => [
-        isA<BaseProfileStateData>().having(
-          (e) => e.drepApprovalContingencyAccepted,
-          'drepApprovalContingencyAccepted',
-          false,
-        ),
-      ],
-    );
-
     blocTest<BaseProfileCubit, BaseProfileStateData>(
       'emits updated email when updateEmail is called with valid email',
       build: () => baseProfileCubit,

catalyst_voices/packages/internal/catalyst_voices_blocs/lib/src/registration/state_data/base_profile_state_data.dart

@@ -414,11 +414,11 @@
   "@catalystKnowledgeBase": {
     "description": "Menu item text for accessing knowledge base"
   },
-  "catalystPrivacyPolicy": "Catalyst FC's Privacy Policy",
+  "catalystPrivacyPolicy": "Project Catalyst Platform Privacy Policy",
   "@catalystPrivacyPolicy": {
-    "description": "Link to the Catalyst FC's Privacy Policy"
+    "description": "Link to the Catalyst Privacy Policy"
   },
-  "catalystTos": "Project Catalyst Terms and Conditions",
+  "catalystTos": "Project Catalyst Platform Terms of Use",
   "@catalystTos": {
     "description": "Link to the Catalyst FC's Terms and Conditions"
   },
@@ -708,15 +708,6 @@
   "@createProfileCreatedTitle": {
     "description": "Title for the profile created"
   },
-  "createProfileDrepApprovalContingency": "I understand that for my proposal to move to Community Review and/or Voting and be eligible for funding, the Project Catalyst budget proposal must first be approved by the Cardano DReps, as detailed in the {fundProposalSubmissionNotice}. If the budget is not approved, my proposal will not move forward and no funding will be provided.",
-  "@createProfileDrepApprovalContingency": {
-    "description": "Text acknowledging that the user is aware of the Drep Approval Contingency",
-    "placeholders": {
-      "fundProposalSubmissionNotice": {
-        "type": "String"
-      }
-    }
-  },
   "createProfileInstructionsEmailRequest": "Email request",
   "@createProfileInstructionsEmailRequest": {
     "description": "Request to provide email address"