Merge branch 'main' into 2091-map-proposal-elements-for-testing

emiride · emiride · commit 29f7d4d3570d · 2025-04-15T11:40:35.000+02:00
diff --git a/catalyst_voices/apps/voices/lib/pages/proposal_builder/proposal_builder_navigation_panel.dart b/catalyst_voices/apps/voices/lib/pages/proposal_builder/proposal_builder_navigation_panel.dart
@@ -12,7 +12,6 @@ class ProposalBuilderNavigationPanel extends StatelessWidget {
   Widget build(BuildContext context) {
     return SpaceSidePanel(
       isLeft: true,
-      name: context.l10n.workspaceProposalNavigation,
       onCollapseTap: () {},
       tabs: [
         SpaceSidePanelTab(
diff --git a/catalyst_voices/apps/voices/lib/pages/proposal_builder/proposal_builder_page.dart b/catalyst_voices/apps/voices/lib/pages/proposal_builder/proposal_builder_page.dart
@@ -181,7 +181,7 @@ class _ProposalBuilderPageState extends State<ProposalBuilderPage>
   void _dontShowCampaignSubmissionClosingDialog(bool value) {
     context
         .read<SessionCubit>()
-        .updateShowSubmissionClosingWarning(value: value);
+        .updateShowSubmissionClosingWarning(value: !value);
   }
 
   void _handleSegmentsControllerChange() {
diff --git a/catalyst_voices/apps/voices/lib/pages/proposal_builder/proposal_builder_setup_panel.dart b/catalyst_voices/apps/voices/lib/pages/proposal_builder/proposal_builder_setup_panel.dart
@@ -10,7 +10,6 @@ class ProposalBuilderSetupPanel extends StatelessWidget {
   Widget build(BuildContext context) {
     return SpaceSidePanel(
       isLeft: false,
-      name: context.l10n.workspaceProposalSetup,
       onCollapseTap: () {},
       tabs: [
         SpaceSidePanelTab(
diff --git a/catalyst_voices/apps/voices/lib/pages/registration/create_base_profile/stage/setup_panel.dart b/catalyst_voices/apps/voices/lib/pages/registration/create_base_profile/stage/setup_panel.dart
@@ -8,35 +8,11 @@ import 'package:catalyst_voices_shared/catalyst_voices_shared.dart';
 import 'package:catalyst_voices_view_models/catalyst_voices_view_models.dart';
 import 'package:flutter/material.dart';
 
-class SetupPanel extends StatelessWidget {
+class SetupPanel extends StatefulWidget {
   const SetupPanel({super.key});
 
   @override
-  Widget build(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        const SizedBox(height: 24),
-        const _Title(),
-        Expanded(
-          child: FocusScope(
-            child: ListView(
-              padding: const EdgeInsets.symmetric(vertical: 24),
-              children: const [
-                _DisplayNameSelector(),
-                SizedBox(height: 24),
-                _EmailSelector(),
-              ],
-            ),
-          ),
-        ),
-        const SizedBox(height: 24),
-        const _IdeascaleInfoCard(),
-        const SizedBox(height: 24),
-        const _NavigationSelector(),
-      ],
-    );
-  }
+  State<SetupPanel> createState() => _SetupPanelState();
 }
 
 class _DisplayNameSelector extends StatelessWidget {
@@ -186,6 +162,55 @@ class _NavigationSelector extends StatelessWidget {
   }
 }
 
+class _SetupPanelState extends State<SetupPanel> {
+  late final ScrollController _scrollController;
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        const SizedBox(height: 24),
+        const _Title(),
+        Expanded(
+          child: FocusScope(
+            child: VoicesScrollbar(
+              controller: _scrollController,
+              alwaysVisible: true,
+              padding: const EdgeInsets.only(left: 10),
+              child: ListView(
+                controller: _scrollController,
+                padding: const EdgeInsets.symmetric(vertical: 24),
+                children: const [
+                  _DisplayNameSelector(),
+                  SizedBox(height: 24),
+                  _EmailSelector(),
+                ],
+              ),
+            ),
+          ),
+        ),
+        const SizedBox(height: 24),
+        const _IdeascaleInfoCard(),
+        const SizedBox(height: 24),
+        const _NavigationSelector(),
+      ],
+    );
+  }
+
+  @override
+  void dispose() {
+    _scrollController.dispose();
+    super.dispose();
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _scrollController = ScrollController();
+  }
+}
+
 class _Title extends StatelessWidget {
   const _Title();
 
diff --git a/catalyst_voices/apps/voices/lib/pages/registration/widgets/unlock_password_form.dart b/catalyst_voices/apps/voices/lib/pages/registration/widgets/unlock_password_form.dart
@@ -114,4 +114,4 @@ class _PasswordStrength extends StatelessWidget {
       ),
     );
   }
-}
+}
diff --git a/catalyst_voices/apps/voices/lib/pages/registration/widgets/wallet_summary.dart b/catalyst_voices/apps/voices/lib/pages/registration/widgets/wallet_summary.dart
@@ -249,4 +249,4 @@ class _WalletSummaryName extends StatelessWidget {
       ),
     );
   }
-}
+}
diff --git a/catalyst_voices/apps/voices/lib/pages/treasury/treasury_details_panel.dart b/catalyst_voices/apps/voices/lib/pages/treasury/treasury_details_panel.dart
@@ -8,7 +8,6 @@ class TreasuryDetailsPanel extends StatelessWidget {
   Widget build(BuildContext context) {
     return SpaceSidePanel(
       isLeft: false,
-      name: 'Campaign comments',
       onCollapseTap: () {},
       tabs: [
         SpaceSidePanelTab(
diff --git a/catalyst_voices/apps/voices/lib/pages/treasury/treasury_navigation_panel.dart b/catalyst_voices/apps/voices/lib/pages/treasury/treasury_navigation_panel.dart
@@ -11,7 +11,6 @@ class TreasuryNavigationPanel extends StatelessWidget {
   Widget build(BuildContext context) {
     return SpaceSidePanel(
       isLeft: true,
-      name: context.l10n.treasuryCampaignBuilder,
       onCollapseTap: () {},
       tabs: [
         SpaceSidePanelTab(
diff --git a/catalyst_voices/apps/voices/lib/pages/workspace/page/workspace_page.dart b/catalyst_voices/apps/voices/lib/pages/workspace/page/workspace_page.dart
@@ -88,7 +88,7 @@ class _WorkspacePageState extends State<WorkspacePage>
   void _dontShowCampaignSubmissionClosingDialog(bool value) {
     context
         .read<SessionCubit>()
-        .updateShowSubmissionClosingWarning(value: value);
+        .updateShowSubmissionClosingWarning(value: !value);
   }
 
   void _showDeleteErrorSnackBar() {
diff --git a/catalyst_voices/apps/voices/lib/widgets/containers/sidebar/space_side_panel.dart b/catalyst_voices/apps/voices/lib/widgets/containers/sidebar/space_side_panel.dart
@@ -1,17 +1,16 @@
-import 'package:catalyst_voices/widgets/buttons/voices_buttons.dart';
+import 'package:catalyst_voices/widgets/buttons/voices_icon_button.dart';
 import 'package:catalyst_voices/widgets/common/tab_bar_stack_view.dart';
-import 'package:catalyst_voices/widgets/headers/section_header.dart';
 import 'package:catalyst_voices/widgets/widgets.dart' show SidebarScaffold;
+import 'package:catalyst_voices_assets/catalyst_voices_assets.dart';
 import 'package:catalyst_voices_brands/catalyst_voices_brands.dart';
 import 'package:flutter/material.dart';
 
 /// Defines usual space panel. This widget is opinionated and should
 /// be used together with [SidebarScaffold].
 ///
-/// Always have [name], [tabs] and tabs content [SpaceSidePanelTab.body].
+/// Always have [tabs] and tabs content [SpaceSidePanelTab.body].
 class SpaceSidePanel extends StatefulWidget {
   final bool isLeft;
-  final String name;
   final VoidCallback? onCollapseTap;
   final TabController? tabController;
   final List<SpaceSidePanelTab> tabs;
@@ -20,7 +19,6 @@ class SpaceSidePanel extends StatefulWidget {
   const SpaceSidePanel({
     super.key,
     required this.isLeft,
-    required this.name,
     this.onCollapseTap,
     this.tabController,
     required this.tabs,
@@ -75,24 +73,24 @@ class _Container extends StatelessWidget {
 }
 
 class _Header extends StatelessWidget {
-  final String name;
   final VoidCallback? onCollapseTap;
   final bool isLeft;
 
   const _Header({
-    required this.name,
     this.onCollapseTap,
     required this.isLeft,
   });
 
   @override
   Widget build(BuildContext context) {
-    return SectionHeader(
-      leading: isLeft ? LeftArrowButton(onTap: onCollapseTap) : null,
-      title: Text(name),
-      trailing: [
-        if (!isLeft) RightArrowButton(onTap: onCollapseTap),
-      ],
+    return Align(
+      alignment: isLeft ? Alignment.centerLeft : Alignment.centerRight,
+      child: VoicesIconButton(
+        onTap: onCollapseTap,
+        child: isLeft
+            ? VoicesAssets.icons.leftRailToggle.buildIcon()
+            : VoicesAssets.icons.rightRailToggle.buildIcon(),
+      ),
     );
   }
 }
@@ -109,19 +107,21 @@ class _SpaceSidePanelState extends State<SpaceSidePanel>
         children: [
           if (widget.isLeft)
             Positioned(
-              top: 28,
-              left: 24,
-              child: RightArrowButton(
+              top: 24,
+              left: 16,
+              child: VoicesIconButton(
+                child: VoicesAssets.icons.leftRailToggle.buildIcon(),
                 onTap: () {
                   _controller.reverse();
                 },
               ),
             )
           else
             Positioned(
-              top: 28,
+              top: 24,
               right: 16,
-              child: LeftArrowButton(
+              child: VoicesIconButton(
+                child: VoicesAssets.icons.rightRailToggle.buildIcon(),
                 onTap: () {
                   _controller.reverse();
                 },
@@ -140,7 +140,6 @@ class _SpaceSidePanelState extends State<SpaceSidePanel>
                   mainAxisSize: MainAxisSize.max,
                   children: [
                     _Header(
-                      name: widget.name,
                       onCollapseTap: () {
                         _controller.forward();
                         widget.onCollapseTap?.call();
diff --git a/catalyst_voices/packages/internal/catalyst_voices_models/lib/src/campaign/campaign_timeline.dart b/catalyst_voices/packages/internal/catalyst_voices_models/lib/src/campaign/campaign_timeline.dart
@@ -50,7 +50,7 @@ extension CampaignTimelineX on CampaignTimeline {
           '''Participants submit initial proposals for ideas to solve challenges. A set amount of ada is allocated to the new funding round.''',
       timeline: DateRange(
         from: DateTime(2025, 3, 28, 16, 50),
-        to: DateTime(2025, 4, 15),
+        to: DateTime(2025, 4, 31),
       ),
       stage: CampaignTimelineStage.proposalSubmission,
     ),

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ class _ProposalBuilderPageState extends State<ProposalBuilderPage>`
`181`	`181`	`void _dontShowCampaignSubmissionClosingDialog(bool value) {`
`182`	`182`	`context`
`183`	`183`	`.read<SessionCubit>()`
`184`		`- .updateShowSubmissionClosingWarning(value: value);`
	`184`	`+ .updateShowSubmissionClosingWarning(value: !value);`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`void _handleSegmentsControllerChange() {`
Original file line number	Diff line number	Diff line change
`@@ -114,4 +114,4 @@ class _PasswordStrength extends StatelessWidget {`
`114`	`114`	`),`
`115`	`115`	`);`
`116`	`116`	`}`
`117`		`-}`
	`117`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -249,4 +249,4 @@ class _WalletSummaryName extends StatelessWidget {`
`249`	`249`	`),`
`250`	`250`	`);`
`251`	`251`	`}`
`252`		`-}`
	`252`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ class _WorkspacePageState extends State<WorkspacePage>`
`88`	`88`	`void _dontShowCampaignSubmissionClosingDialog(bool value) {`
`89`	`89`	`context`
`90`	`90`	`.read<SessionCubit>()`
`91`		`- .updateShowSubmissionClosingWarning(value: value);`
	`91`	`+ .updateShowSubmissionClosingWarning(value: !value);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`void _showDeleteErrorSnackBar() {`