input-output-hk
diff --git a/‎.config/dictionaries/project.dic‎
Lines changed: 4 additions & 0 deletions b/‎.config/dictionaries/project.dic‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎catalyst_voices/.gitignore‎
Lines changed: 2 additions & 1 deletion b/‎catalyst_voices/.gitignore‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎catalyst_voices/Earthfile‎
Lines changed: 0 additions & 10 deletions b/‎catalyst_voices/Earthfile‎
Lines changed: 0 additions & 10 deletions
diff --git a/‎catalyst_voices/apps/voices/lib/common/constants/constants.dart‎
Lines changed: 6 additions & 4 deletions b/‎catalyst_voices/apps/voices/lib/common/constants/constants.dart‎
Lines changed: 6 additions & 4 deletions
diff --git a/‎catalyst_voices/apps/voices/lib/common/ext/active_fund_number_selector_ext.dart‎
Lines changed: 8 additions & 0 deletions b/‎catalyst_voices/apps/voices/lib/common/ext/active_fund_number_selector_ext.dart‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎catalyst_voices/apps/voices/lib/dependency/dependencies.dart‎
Lines changed: 15 additions & 0 deletions b/‎catalyst_voices/apps/voices/lib/dependency/dependencies.dart‎
Lines changed: 15 additions & 0 deletions
diff --git a/‎catalyst_voices/apps/voices/lib/pages/campaign/stage/campaign_background.dart‎
Lines changed: 20 additions & 0 deletions b/‎catalyst_voices/apps/voices/lib/pages/campaign/stage/campaign_background.dart‎
Lines changed: 20 additions & 0 deletions
diff --git a/‎catalyst_voices/apps/voices/lib/pages/category/category_page.dart‎
Lines changed: 29 additions & 0 deletions b/‎catalyst_voices/apps/voices/lib/pages/category/category_page.dart‎
Lines changed: 29 additions & 0 deletions
diff --git a/‎catalyst_voices/apps/voices/lib/pages/dev_tools/cards/config_card.dart‎
Lines changed: 1 addition & 2 deletions b/‎catalyst_voices/apps/voices/lib/pages/dev_tools/cards/config_card.dart‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎catalyst_voices/apps/voices/lib/pages/discovery/sections/stay_involved.dart‎
Lines changed: 2 additions & 1 deletion b/‎catalyst_voices/apps/voices/lib/pages/discovery/sections/stay_involved.dart‎
Lines changed: 2 additions & 1 deletion
@@ -142,6 +142,7 @@ gethostname
 Gitbook
 gmtime
 gradlew
+hackathon
 Hackathons
 headful
 headlessui
@@ -209,6 +210,7 @@ libxkbcommon
 libxshmfence
 Lifetimeable
 lintfix
+litepaper
 localizable
 loguru
 lovelace
@@ -350,6 +352,7 @@ tablestats
 tabview
 tacho
 tailscale
+telehealth
 testcov
 testdocs
 testid
@@ -383,6 +386,7 @@ Unstaked
 Upsert
 Upserts
 upskilling
+USDM
 UTXO
 Utxos
 uuidv
 
@@ -17,9 +17,10 @@ docs/
 **/generated/*
 **/openapi/**
 
-# Un-ignore vit and cat-reviews openapi spec as they're not generated
+# Un-ignore vit, cat-reviews and cat-gateway openapi spec as they're not generated
 !**/openapi/vit.json
 !**/openapi/cat-reviews.json
+!**/openapi/cat-gateway.json
 
 # Un-ignore generated files in public packages
 !**/packages/libs/**/*.g.dart
 
@@ -32,12 +32,9 @@ code-generator:
 
     LET gen_code_path = lib/generated/api
     LET local_gen_code_path = packages/internal/catalyst_voices_repositories/lib/generated/api/
-    LET openapi_spec_path = packages/internal/catalyst_voices_repositories/openapi/cat-gateway.json
 
     WORKDIR packages/internal/catalyst_voices_repositories
 
-    COPY catalyst-gateway+build/doc/cat-gateway-api.json openapi/cat-gateway.json
-
     WORKDIR /frontend
 
     RUN melos l10n
@@ -67,13 +64,6 @@ code-generator:
 
     WORKDIR packages/internal/catalyst_voices_repositories
 
-    # Saves locally openapi json specs. Useful for local diagnostic.
-    IF [ $save_locally = true ]
-        SAVE ARTIFACT openapi/cat-gateway.json AS LOCAL $openapi_spec_path
-    ELSE
-        SAVE ARTIFACT openapi/cat-gateway.json
-    END
-
     # Saves generated OpenApi Services
     IF [ $save_locally = true ]
         SAVE ARTIFACT "$gen_code_path/*" AS LOCAL $local_gen_code_path
 
@@ -8,8 +8,6 @@ abstract class VoicesConstants {
 
   /// External urls
   static const supportedWalletsUrl = '$_docs/current-fund/voter-registration/supported-wallets';
-  static const f14ProposalSubmissionNoticeUrl =
-      '$_docs/current-fund/fund-basics/fund14-proposal-submission-notice';
   static const tosUrl =
       '$_docs/current-fund/fund-basics/project-catalyst-terms-and-conditions/project-catalyst-platform-terms-of-use';
   static const conditionsUrl =
@@ -46,9 +44,8 @@ abstract class VoicesConstants {
   static const campaignTimeline = '$_docs/current-fund/fund-basics/fund-timeline';
   static const milestoneGuideline =
       '$_docs/current-fund/project-onboarding/milestone-based-proposals';
-  static const projectCatalystFund14Url = '$_projectCatalyst/funds/14';
 
-  VoicesConstants._();
+  const VoicesConstants._();
 
   static String cardanoScanStakeAddressUrl(ShelleyAddress stakeAddress) {
     switch (stakeAddress.network) {
@@ -58,4 +55,9 @@ abstract class VoicesConstants {
         return 'https://preprod.cardanoscan.io/stakekey/${stakeAddress.toBech32()}';
     }
   }
+
+  static String fundProposalSubmissionNoticeUrl(int fundNumber) =>
+      '$_docs/current-fund/fund-basics/fund$fundNumber-proposal-submission-notice';
+
+  static String projectCatalystFundUrl(int fundNumber) => '$_projectCatalyst/funds/$fundNumber';
 }
@@ -0,0 +1,8 @@
+import 'package:catalyst_voices_blocs/catalyst_voices_blocs.dart';
+import 'package:flutter/material.dart';
+
+extension ActiveFundNumberSelectorExt on BuildContext {
+  int get activeCampaignFundNumber {
+    return select<CampaignPhaseAwareCubit, int>((cubit) => cubit.state.fundNumber);
+  }
+}
@@ -353,6 +353,7 @@ final class Dependencies extends DependencyProvider {
         return UserService(
           get<UserRepository>(),
           get<UserObserver>(),
+          get<RegistrationStatusPoller>(),
         );
       },
       dispose: (service) => unawaited(service.dispose()),
@@ -480,14 +481,23 @@ final class Dependencies extends DependencyProvider {
       },
       dispose: (storage) async => storage.dispose(),
     );
+    registerLazySingleton<AppMetaStorage>(
+      () {
+        return AppMetaStorageLocalStorage(
+          sharedPreferences: get<SharedPreferencesAsync>(),
+        );
+      },
+    );
   }
 
   void _registerUtils() {
     registerLazySingleton<SyncManager>(
       () {
         return SyncManager(
+          get<AppMetaStorage>(),
           get<SyncStatsStorage>(),
           get<DocumentsService>(),
+          get<CampaignService>(),
         );
       },
       dispose: (manager) async => manager.dispose(),
@@ -511,6 +521,11 @@ final class Dependencies extends DependencyProvider {
     );
     registerLazySingleton<CastedVotesObserver>(CastedVotesObserverImpl.new);
     registerLazySingleton<VotingBallotBuilder>(VotingBallotLocalBuilder.new);
+
+    // Not a singleton
+    registerFactory<RegistrationStatusPoller>(
+      () => RegistrationStatusPoller(get<UserRepository>()),
+    );
     registerLazySingleton<DeviceInfoPlugin>(DeviceInfoPlugin.new);
     registerLazySingleton<PermissionHandler>(
       () => PermissionHandlerImpl(
 
@@ -1,6 +1,8 @@
 import 'dart:math';
 
 import 'package:catalyst_voices/widgets/painter/bubble_painter.dart';
+import 'package:catalyst_voices_assets/catalyst_voices_assets.dart';
+import 'package:catalyst_voices_brands/catalyst_voices_brands.dart';
 import 'package:flutter/material.dart';
 
 class CampaignBackground extends StatelessWidget {
@@ -16,6 +18,7 @@ class CampaignBackground extends StatelessWidget {
         children: [
           const _Background(),
           const _BubbleShapes(),
+          const _Logo(),
           child,
         ],
       ),
@@ -119,3 +122,20 @@ class _BubbleShapes extends StatelessWidget {
     ];
   }
 }
+
+class _Logo extends StatelessWidget {
+  const _Logo();
+
+  @override
+  Widget build(BuildContext context) {
+    return Positioned(
+      left: 60,
+      top: 40,
+      child: Theme.of(context).brandAssets.brand
+          .logo(context)
+          .buildPicture(
+            height: 35,
+          ),
+    );
+  }
+}
@@ -5,6 +5,7 @@ import 'package:catalyst_voices/pages/campaign_phase_aware/proposal_submission_p
 import 'package:catalyst_voices/pages/category/card_information.dart';
 import 'package:catalyst_voices/pages/category/category_detail_view.dart';
 import 'package:catalyst_voices/pages/category/draggable_sheet_category_information.dart';
+import 'package:catalyst_voices/routes/routing/spaces_route.dart';
 import 'package:catalyst_voices/widgets/common/infrastructure/voices_wide_screen_constrained.dart';
 import 'package:catalyst_voices/widgets/indicators/voices_error_indicator.dart';
 import 'package:catalyst_voices_blocs/catalyst_voices_blocs.dart';
@@ -177,6 +178,8 @@ class _CategoryDetailLoadingOrDataSelector extends StatelessWidget {
 }
 
 class _CategoryPageState extends State<CategoryPage> {
+  StreamSubscription<DocumentRef?>? _categoryRefSub;
+
   @override
   Widget build(BuildContext context) {
     return ProposalSubmissionPhaseAware(
@@ -202,12 +205,38 @@ class _CategoryPageState extends State<CategoryPage> {
     }
   }
 
+  @override
+  void dispose() {
+    unawaited(_categoryRefSub?.cancel());
+    _categoryRefSub = null;
+    super.dispose();
+  }
+
   @override
   void initState() {
     super.initState();
     unawaited(context.read<CategoryDetailCubit>().getCategories());
     unawaited(
       context.read<CategoryDetailCubit>().getCategoryDetail(widget.categoryId),
     );
+    _listenForProposalRef(context.read<CategoryDetailCubit>());
+  }
+
+  void _listenForProposalRef(CategoryDetailCubit cubit) {
+    // listen for updates
+    _categoryRefSub = cubit.stream
+        .map((event) => event.category?.id)
+        .distinct()
+        .listen(_onCategoryRefChanged);
+  }
+
+  void _onCategoryRefChanged(DocumentRef? categoryRef) {
+    if (categoryRef == null || categoryRef is! SignedDocumentRef) {
+      return;
+    }
+
+    Router.neglect(context, () {
+      CategoryDetailRoute.fromRef(categoryRef: categoryRef).replace(context);
+    });
   }
 }
@@ -3,7 +3,6 @@ import 'package:catalyst_voices/pages/dev_tools/cards/info_card.dart';
 import 'package:catalyst_voices/pages/dev_tools/widgets/value_text.dart';
 import 'package:catalyst_voices_blocs/catalyst_voices_blocs.dart';
 import 'package:catalyst_voices_models/catalyst_voices_models.dart';
-import 'package:catalyst_voices_shared/catalyst_voices_shared.dart';
 import 'package:flutter/material.dart';
 
 class ConfigCard extends StatelessWidget {
@@ -65,7 +64,7 @@ extension on TransactionBuilderConfig {
       },
       'maxTxSize': maxTxSize,
       'maxValueSize': maxValueSize,
-      'coinsPerUtxoByte': CryptocurrencyFormatter.formatExactAmount(coinsPerUtxoByte),
+      'coinsPerUtxoByte': coinsPerUtxoByte.value,
       'selectionStrategy': selectionStrategy.runtimeType.toString(),
     };
   }
 
@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:catalyst_voices/common/constants/constants.dart';
+import 'package:catalyst_voices/common/ext/active_fund_number_selector_ext.dart';
 import 'package:catalyst_voices/common/ext/build_context_ext.dart';
 import 'package:catalyst_voices/pages/discovery/sections/session_account_catalyst_id.dart';
 import 'package:catalyst_voices/share/share_manager.dart';
@@ -297,7 +298,7 @@ class _VoterCard extends StatelessWidget {
   Widget build(BuildContext context) {
     return _StayInvolvedCard(
       icon: VoicesAssets.icons.vote,
-      title: context.l10n.registerToVoteFund14,
+      title: context.l10n.registerToVoteFund(context.activeCampaignFundNumber),
       description: context.l10n.stayInvolvedContributorDescription,
       actions: Column(
         crossAxisAlignment: CrossAxisAlignment.start,