diff --git a/.env.example b/.env.example
index 4bf673e2..3df68e3a 100644
--- a/.env.example
+++ b/.env.example
@@ -1,5 +1,5 @@
 ENV = development
 
 # Full base URL including protocol (http or https), host and optionally the port and the base api path without trailing forward slash
-BASE_API_ENDPOINT_URL = 
-BASE_STATIC_ENDPOINT_URL = 
+BASE_API_ENDPOINT_URL =
+BASE_STATIC_ENDPOINT_URL =
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a62c966f..6791942f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -61,7 +61,7 @@ jobs:
 
       - name: Statically analyze the Dart code
         run: |
-          echo "" | base64 -d > .env
+          echo ${{ github.ref == 'refs/heads/master' && secrets.ENV_PROD || secrets.ENV_DEV }} | base64 -d > .env
           flutter analyze .
 
   test:
@@ -96,7 +96,7 @@ jobs:
 
       - name: Run tests and generate coverage
         run: |
-          echo "" | base64 -d > .env
+          echo ${{ github.ref == 'refs/heads/master' && secrets.ENV_PROD || secrets.ENV_DEV }} | base64 -d > .env
           flutter test --coverage -r expanded .
 
       - name: Upload coverage to codecov
@@ -107,7 +107,6 @@ jobs:
 
   build_android:
     if: ${{ github.ref == 'refs/heads/development' || github.ref == 'refs/heads/master' }}
-    environment: ${{ github.ref == 'refs/heads/master' && 'production' || 'development' }}
     needs: [analyze, test]
     runs-on: macos-latest
     timeout-minutes: 60
@@ -160,9 +159,9 @@ jobs:
 
       - name: Build appbundle
         env:
-          GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}
+          GOOGLE_SERVICES_JSON: ${{ github.ref == 'refs/heads/master' && secrets.ANDROID_GOOGLE_SERVICES_JSON || secrets.ANDROID_GOOGLE_SERVICES_JSON_DEV }}
         run: |
-          echo ${{ secrets.ENV }} | base64 -d > .env
+          echo ${{ github.ref == 'refs/heads/master' && secrets.ENV_PROD || secrets.ENV_DEV }} | base64 -d > .env
           echo $GOOGLE_SERVICES_JSON | base64 -d > android/app/google-services.json
           flutter build appbundle --release --build-number $GITHUB_RUN_NUMBER --no-tree-shake-icons
           cp release_notes.txt build/app/outputs/
@@ -190,7 +189,6 @@ jobs:
 
   build_ios:
     if: ${{ github.ref == 'refs/heads/development' || github.ref == 'refs/heads/master' }}
-    environment: ${{ github.ref == 'refs/heads/master' && 'production' || 'development' }}
     needs: [analyze, test]
     runs-on: macos-latest
     timeout-minutes: 60
@@ -267,9 +265,8 @@ jobs:
 
       - name: Build iOS app
         env:
-          IOS_GOOGLESERVICE_INFO_PLIST: ${{ secrets.IOS_GOOGLESERVICE_INFO_PLIST }}
+          IOS_GOOGLESERVICE_INFO_PLIST: ${{ github.ref == 'refs/heads/master' && secrets.IOS_GOOGLESERVICE_INFO_PLIST || secrets.IOS_GOOGLESERVICE_INFO_PLIST_DEV }}
         run: |
-          echo ${{ secrets.ENV }} | base64 -d > .env
           echo $IOS_GOOGLESERVICE_INFO_PLIST | base64 --decode > ios/Runner/GoogleService-Info.plist
           flutter build ipa --release --export-options-plist=ExportOptions.plist --build-number $GITHUB_RUN_NUMBER --no-tree-shake-icons
           cp release_notes.txt build/ios/ipa/
@@ -327,7 +324,7 @@ jobs:
 
       - name: Build web
         run: |
-          echo ${{ secrets.ENV }} | base64 -d > .env
+          echo ${{ github.ref == 'refs/heads/master' && secrets.ENV_PROD || secrets.ENV_DEV }} | base64 -d > .env
           flutter build web -t lib/widgetbook/app.widgetbook.dart
 
       - name: Publish to Widgetbook
@@ -335,7 +332,6 @@ jobs:
         run: widgetbook publish --api-key $WIDGETBOOK_API_KEY
 
   distribute_android:
-    environment: ${{ github.ref == 'refs/heads/master' && 'production' || 'development' }}
     needs: [build_android]
     runs-on: ubuntu-latest
     steps:
@@ -354,7 +350,6 @@ jobs:
           releaseNotesFile: release_notes.txt
 
   distribute_ios:
-    environment: ${{ github.ref == 'refs/heads/master' && 'production' || 'development' }}
     needs: [build_ios]
     runs-on: macos-latest
     steps:
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 6216794d..dc27d4f8 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -39,7 +39,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "org.collaction.collaction_app"
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 73d5e1e6..ff7bab9f 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -10,8 +10,7 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize"
-            android:exported="true">
+            android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
diff --git a/android/build.gradle b/android/build.gradle
index 6b74e344..2a330ec6 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -6,10 +6,10 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
+        classpath 'com.android.tools.build:gradle:4.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.3.15'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.4'
+        classpath 'com.google.gms:google-services:4.3.10'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
     }
 }
 
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index cb24abda..939efa29 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/assets/fonts/icons/CollactionIcons.ttf b/assets/fonts/icons/CollactionIcons.ttf
index 244092cc..fc4ea67c 100644
Binary files a/assets/fonts/icons/CollactionIcons.ttf and b/assets/fonts/icons/CollactionIcons.ttf differ
diff --git a/assets/fonts/icons/config.json b/assets/fonts/icons/config.json
index 827383cd..68df9cd4 100644
--- a/assets/fonts/icons/config.json
+++ b/assets/fonts/icons/config.json
@@ -691,20 +691,6 @@
       "search": [
         "heart-sm"
       ]
-    },
-    {
-      "uid": "6555d0250a6170b636ae88f62a3bf3a4",
-      "css": "logo",
-      "code": 59491,
-      "src": "custom_icons",
-      "selected": true,
-      "svg": {
-        "path": "M42.8 785.8L419.3 998.5 417.2 777.7C416.8 734.2 393.3 694.3 355.6 672.8H355.6C317.6 651.1 270.9 651.5 233.2 673.7L42.8 785.8ZM867.6 783.9L493 1000 493.1 779.2C493.1 735.8 516.2 695.6 553.8 673.7H553.8C591.6 651.7 638.3 651.6 676.2 673.5L867.6 783.9ZM0.7 720.3L0 287.9 191.4 398C229 419.6 252.4 459.7 252.6 503.1H252.6C252.8 546.9 229.6 587.4 191.8 609.4L0.7 720.3ZM870.1 214.2L493.5 1.5 495.6 222.3C496 265.8 519.5 305.7 557.2 327.2H557.2C595.2 348.9 641.9 348.5 679.6 326.3L870.1 214.2ZM45.2 216.1L419.8 0 419.7 220.8C419.7 264.2 396.6 304.4 359 326.3H359C321.2 348.3 274.5 348.4 236.6 326.5L45.2 216.1Z",
-        "width": 870
-      },
-      "search": [
-        "logo"
-      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/assets/images/build_info.png b/assets/images/build_info.png
deleted file mode 100644
index c362d5b4..00000000
Binary files a/assets/images/build_info.png and /dev/null differ
diff --git a/assets/images/collaction.png b/assets/images/collaction.png
new file mode 100644
index 00000000..1f77c9b2
Binary files /dev/null and b/assets/images/collaction.png differ
diff --git a/assets/images/logo.png b/assets/images/logo.png
deleted file mode 100644
index 92bdb93d..00000000
Binary files a/assets/images/logo.png and /dev/null differ
diff --git a/assets/images/unauthenticated_bg.png b/assets/images/unauthenticated_bg.png
deleted file mode 100644
index 3a8f1b83..00000000
Binary files a/assets/images/unauthenticated_bg.png and /dev/null differ
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index b3ff3ce2..b41523c5 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1,59 +1,48 @@
 PODS:
   - country_codes (0.0.1):
     - Flutter
-  - Firebase/Auth (10.6.0):
+  - Firebase/Auth (10.3.0):
     - Firebase/CoreOnly
-    - FirebaseAuth (~> 10.6.0)
-  - Firebase/CoreOnly (10.6.0):
-    - FirebaseCore (= 10.6.0)
-  - Firebase/Crashlytics (10.6.0):
+    - FirebaseAuth (~> 10.3.0)
+  - Firebase/CoreOnly (10.3.0):
+    - FirebaseCore (= 10.3.0)
+  - Firebase/Crashlytics (10.3.0):
     - Firebase/CoreOnly
-    - FirebaseCrashlytics (~> 10.6.0)
+    - FirebaseCrashlytics (~> 10.3.0)
   - firebase_auth (4.2.2):
-    - Firebase/Auth (= 10.6.0)
+    - Firebase/Auth (= 10.3.0)
     - firebase_core
     - Flutter
-  - firebase_core (2.8.0):
-    - Firebase/CoreOnly (= 10.6.0)
+  - firebase_core (2.4.1):
+    - Firebase/CoreOnly (= 10.3.0)
     - Flutter
-  - firebase_crashlytics (3.0.17):
-    - Firebase/Crashlytics (= 10.6.0)
+  - firebase_crashlytics (3.0.11):
+    - Firebase/Crashlytics (= 10.3.0)
     - firebase_core
     - Flutter
-  - FirebaseAuth (10.6.0):
+  - FirebaseAuth (10.3.0):
     - FirebaseCore (~> 10.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 7.8)
     - GoogleUtilities/Environment (~> 7.8)
     - GTMSessionFetcher/Core (< 4.0, >= 2.1)
-  - FirebaseCore (10.6.0):
+  - FirebaseCore (10.3.0):
     - FirebaseCoreInternal (~> 10.0)
     - GoogleUtilities/Environment (~> 7.8)
     - GoogleUtilities/Logger (~> 7.8)
-  - FirebaseCoreExtension (10.7.0):
-    - FirebaseCore (~> 10.0)
-  - FirebaseCoreInternal (10.7.0):
+  - FirebaseCoreInternal (10.5.0):
     - "GoogleUtilities/NSData+zlib (~> 7.8)"
-  - FirebaseCrashlytics (10.6.0):
-    - FirebaseCore (~> 10.5)
+  - FirebaseCrashlytics (10.3.0):
+    - FirebaseCore (~> 10.0)
     - FirebaseInstallations (~> 10.0)
-    - FirebaseSessions (~> 10.5)
     - GoogleDataTransport (~> 9.2)
     - GoogleUtilities/Environment (~> 7.8)
     - nanopb (< 2.30910.0, >= 2.30908.0)
     - PromisesObjC (~> 2.1)
-  - FirebaseInstallations (10.7.0):
+  - FirebaseInstallations (10.5.0):
     - FirebaseCore (~> 10.0)
     - GoogleUtilities/Environment (~> 7.8)
     - GoogleUtilities/UserDefaults (~> 7.8)
     - PromisesObjC (~> 2.1)
-  - FirebaseSessions (10.7.0):
-    - FirebaseCore (~> 10.5)
-    - FirebaseCoreExtension (~> 10.0)
-    - FirebaseInstallations (~> 10.0)
-    - GoogleDataTransport (~> 9.2)
-    - GoogleUtilities/Environment (~> 7.10)
-    - nanopb (< 2.30910.0, >= 2.30908.0)
-    - PromisesSwift (~> 2.1)
   - Flutter (1.0.0)
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
@@ -99,9 +88,7 @@ PODS:
     - Flutter
     - PhoneNumberKit/PhoneNumberKitCore (= 3.3.4)
   - PhoneNumberKit/PhoneNumberKitCore (3.3.4)
-  - PromisesObjC (2.2.0)
-  - PromisesSwift (2.2.0):
-    - PromisesObjC (= 2.2.0)
+  - PromisesObjC (2.1.1)
   - rive_common (0.0.1):
     - Flutter
   - share_plus (0.0.1):
@@ -141,11 +128,9 @@ SPEC REPOS:
     - Firebase
     - FirebaseAuth
     - FirebaseCore
-    - FirebaseCoreExtension
     - FirebaseCoreInternal
     - FirebaseCrashlytics
     - FirebaseInstallations
-    - FirebaseSessions
     - FMDB
     - GoogleDataTransport
     - GoogleUtilities
@@ -153,7 +138,6 @@ SPEC REPOS:
     - nanopb
     - PhoneNumberKit
     - PromisesObjC
-    - PromisesSwift
     - TOCropViewController
 
 EXTERNAL SOURCES:
@@ -192,38 +176,35 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   country_codes: b0900f46ad686281d5dab438e354e44ad10f5941
-  Firebase: f13680471b021937f2230ea8503c7809d8c29806
-  firebase_auth: 6458eb53a07d21569d335553ebd8c02ce11d345b
-  firebase_core: 58542d7399889ebdbb034baa72d081e54c5c814d
-  firebase_crashlytics: 5f6296621a0e8ed7d15a7499c8131fbdcf176e3b
-  FirebaseAuth: 743e5cd568af59d6d99a91ea9300843672515cf7
-  FirebaseCore: fa80ad16a62d52f67274b5b88304c3a318bbf9a4
-  FirebaseCoreExtension: f17247ba8c61e4d3c8d136b5e2de3cb4ac6a85b6
-  FirebaseCoreInternal: 8845798510aae74703467480f71ac613788d0696
-  FirebaseCrashlytics: ede07e7f433a0a2270112baf2d156b111cfb422d
-  FirebaseInstallations: 59c0e4c7a816a0f76710d83f77e5369b3e45eb96
-  FirebaseSessions: 34e5c084da010ef3802cbc062b822e513c9e6318
+  Firebase: f92fc551ead69c94168d36c2b26188263860acd9
+  firebase_auth: d1a0302ad8f1d642fc1cb53c43d25a951d70e190
+  firebase_core: bf59c32d2e53814f558efa20840c1902fa2fe461
+  firebase_crashlytics: b19405931669c882e0d08542e69ae9e86633c636
+  FirebaseAuth: 0e415d29d846c1dce2fb641e46f35e9888d9bec6
+  FirebaseCore: 988754646ab3bd4bdcb740f1bfe26b9f6c0d5f2a
+  FirebaseCoreInternal: e463f41bb935cd049505bf7e9a5bdd7dcea90df6
+  FirebaseCrashlytics: f20d956f8229010b645e534693c39e0b7843c268
+  FirebaseInstallations: 935bc4abb6f7a035cab7a0c31cb777b2be3dd254
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   GoogleDataTransport: ea169759df570f4e37bdee1623ec32a7e64e67c4
   GoogleUtilities: c2bdc4cf2ce786c4d2e6b3bcfd599a25ca78f06f
   GTMSessionFetcher: c9e714f7eec91a55641e2bab9f45fd83a219b882
   image_cropper: 60c2789d1f1a78c873235d4319ca0c34a69f2d98
-  image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
+  image_picker_ios: b786a5dcf033a8336a657191401bfdf12017dabb
   nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
   package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
-  path_provider_foundation: c68054786f1b4f3343858c1e1d0caaded73f0be9
+  path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852
   phone_number: ad6f917e4fd2e507a198b93dca5eadcb463ec8c2
   PhoneNumberKit: 441e8b26ec88d598e3591de9061eff18f5dd12e8
-  PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef
-  PromisesSwift: cf9eb58666a43bbe007302226e510b16c1e10959
-  rive_common: b5b1aa30c63b8f0f00f32cddc9ea394d3d3473b5
+  PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb
+  rive_common: e35144d3b86972f8760b6c9f8b120dfd5fadfa13
   share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
-  shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472
+  shared_preferences_foundation: 297b3ebca31b34ec92be11acd7fb0ba932c822ca
   sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
   TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
-  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
-  webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a
+  url_launcher_ios: fb12c43172927bb5cf75aeebd073f883801f1993
+  webview_flutter_wkwebview: b7e70ef1ddded7e69c796c7390ee74180182971f
 
 PODFILE CHECKSUM: f10c0438b63bc24e6bbc207956dc27d16c4408f2
 
diff --git a/lib/application/auth/auth_bloc.dart b/lib/application/auth/auth_bloc.dart
index fb746907..67a74711 100644
--- a/lib/application/auth/auth_bloc.dart
+++ b/lib/application/auth/auth_bloc.dart
@@ -14,7 +14,9 @@ import '../../domain/user/i_user_repository.dart';
 import '../../domain/user/user.dart';
 
 part 'auth_bloc.freezed.dart';
+
 part 'auth_event.dart';
+
 part 'auth_state.dart';
 
 @injectable
@@ -26,7 +28,6 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   String? _phone;
   StreamSubscription<Either<AuthFailure, AuthSuccess>>?
       _verifyStreamSubscription;
-  StreamSubscription? _authenticationStateSubscription;
 
   AuthBloc(
     this._authRepository,
@@ -35,7 +36,6 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     on<AuthEvent>(
       (event, emit) async {
         await event.map(
-          initial: (event) async => await _mapObserveUserToState(emit, event),
           verifyPhone: (event) async =>
               await _mapVerifyPhoneToState(emit, event),
           signInWithPhone: (event) async =>
@@ -53,18 +53,6 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     );
   }
 
-  Future<void> _mapObserveUserToState(
-    Emitter<AuthState> emit,
-    _InitialEvent event,
-  ) async {
-    _authenticationStateSubscription =
-        _authRepository.observeUser().listen((event) {
-      if (event is User && event.isAnonymous) {
-        emit(const AuthState.unauthenticated());
-      }
-    });
-  }
-
   FutureOr<void> _mapResendCodeToState(
     Emitter<AuthState> emit,
     _ResendCode event,
@@ -195,7 +183,6 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   @override
   Future<void> close() async {
     _verifyStreamSubscription?.cancel();
-    _authenticationStateSubscription?.cancel();
     super.close();
   }
 }
diff --git a/lib/application/auth/auth_event.dart b/lib/application/auth/auth_event.dart
index ed9a3f2a..6b11b16f 100644
--- a/lib/application/auth/auth_event.dart
+++ b/lib/application/auth/auth_event.dart
@@ -2,8 +2,6 @@ part of 'auth_bloc.dart';
 
 @freezed
 class AuthEvent with _$AuthEvent {
-  const factory AuthEvent.initial() = _InitialEvent;
-
   const factory AuthEvent.verifyPhone(String phoneNumber) = _VerifyPhone;
 
   const factory AuthEvent.updated(
diff --git a/lib/application/participation/participation_bloc.dart b/lib/application/participation/participation_bloc.dart
index c9befcf7..6716d617 100644
--- a/lib/application/participation/participation_bloc.dart
+++ b/lib/application/participation/participation_bloc.dart
@@ -31,12 +31,12 @@ class ParticipationBloc extends Bloc<ParticipationEvent, ParticipationState> {
         checkIn: () {
           // TODO: Implement once the backend has implemented it
         },
-        toggleParticipation: (crowdActionId, commitments) async {
+        toggleParticipation: (crowdActionId, commitmentOptions) async {
           emit(const ParticipationState.loading());
 
           await participationRepository.toggleParticipation(
             crowdActionId: crowdActionId,
-            commitments: commitments,
+            commitmentOptions: commitmentOptions,
           );
 
           add(
diff --git a/lib/application/participation/participation_event.dart b/lib/application/participation/participation_event.dart
index 587341b2..a2306840 100644
--- a/lib/application/participation/participation_event.dart
+++ b/lib/application/participation/participation_event.dart
@@ -8,6 +8,6 @@ class ParticipationEvent with _$ParticipationEvent {
   const factory ParticipationEvent.checkIn() = _CheckIn;
   const factory ParticipationEvent.toggleParticipation({
     required String crowdActionId,
-    List<String>? commitments,
+    List<String>? commitmentOptions,
   }) = _ToggleParticipation;
 }
diff --git a/lib/application/user/profile/profile_bloc.dart b/lib/application/user/profile/profile_bloc.dart
index fe7ce549..99784a81 100644
--- a/lib/application/user/profile/profile_bloc.dart
+++ b/lib/application/user/profile/profile_bloc.dart
@@ -25,45 +25,24 @@ class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
         await userOrFailure.fold(
           (failure) => const ProfileState(
             userProfile: null,
-            isPicEditing: false,
-            isBioEditing: false,
+            isEditing: false,
           ),
           (userProfile) => state.copyWith(
             userProfile: userProfile,
-            isPicEditing: false,
-            isBioEditing: false,
+            isEditing: false,
           ),
         ),
       );
     });
 
-    on<EditBio>((event, emit) {
-      emit(state.copyWith(isBioEditing: true));
+    on<EditProfile>((event, emit) {
+      emit(state.copyWith(isEditing: true));
     });
 
-    on<EditProfilePic>((event, emit) {
-      emit(state.copyWith(isPicEditing: true));
-    });
-
-    on<SaveBio>((event, emit) async {
+    on<SaveProfile>((event, emit) async {
       if (event.bio != null) {
         await _profileRepository.saveProfile(bio: event.bio);
       }
-
-      final userOrFailure = await _profileRepository.getUserProfile();
-
-      emit(
-        userOrFailure.fold(
-          (failure) => state.copyWith(isBioEditing: false),
-          (userProfile) => state.copyWith(
-            userProfile: userProfile,
-            isBioEditing: false,
-          ),
-        ),
-      );
-    });
-
-    on<SaveProfilePic>((event, emit) async {
       final wasImageUpdated = event.image != null;
       if (wasImageUpdated) {
         await _avatarRepository.uploadAvatar(event.image!);
@@ -74,18 +53,18 @@ class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
 
       emit(
         userOrFailure.fold(
-          (failure) => state.copyWith(isPicEditing: false),
+          (failure) => state.copyWith(isEditing: false),
           (userProfile) => state.copyWith(
             userProfile: userProfile,
-            isPicEditing: false,
+            isEditing: false,
             wasProfilePictureUpdated: wasImageUpdated,
           ),
         ),
       );
     });
 
-    on<CancelEditProfilePic>((event, emit) {
-      emit(state.copyWith(isPicEditing: false));
+    on<CancelEditProfile>((event, emit) {
+      emit(state.copyWith(isEditing: false));
     });
   }
 }
diff --git a/lib/application/user/profile/profile_event.dart b/lib/application/user/profile/profile_event.dart
index a7f0dac6..4780c65e 100644
--- a/lib/application/user/profile/profile_event.dart
+++ b/lib/application/user/profile/profile_event.dart
@@ -4,25 +4,16 @@ abstract class ProfileEvent {}
 
 class GetUserProfile extends ProfileEvent {}
 
-class EditBio extends ProfileEvent {}
+class EditProfile extends ProfileEvent {}
 
-class SaveBio extends ProfileEvent {
+class SaveProfile extends ProfileEvent {
   final String? bio;
-  SaveBio({
-    this.bio,
-  });
-}
-
-class CancelBio extends ProfileEvent {}
-
-class EditProfilePic extends ProfileEvent {}
-
-class SaveProfilePic extends ProfileEvent {
   final File? image;
 
-  SaveProfilePic({
+  SaveProfile({
+    this.bio,
     this.image,
   });
 }
 
-class CancelEditProfilePic extends ProfileEvent {}
+class CancelEditProfile extends ProfileEvent {}
diff --git a/lib/application/user/profile/profile_state.dart b/lib/application/user/profile/profile_state.dart
index da4fbbd1..57646fcf 100644
--- a/lib/application/user/profile/profile_state.dart
+++ b/lib/application/user/profile/profile_state.dart
@@ -3,39 +3,33 @@ part of 'profile_bloc.dart';
 class ProfileState extends Equatable {
   const ProfileState({
     required this.userProfile,
-    this.isPicEditing,
-    this.isBioEditing,
+    this.isEditing,
     this.wasProfilePictureUpdated,
   });
 
   final UserProfile? userProfile;
-  final bool? isPicEditing;
-  final bool? isBioEditing;
+  final bool? isEditing;
   final bool? wasProfilePictureUpdated;
 
   factory ProfileState.initial() => const ProfileState(
         userProfile: null,
-        isPicEditing: false,
-        isBioEditing: false,
+        isEditing: false,
         wasProfilePictureUpdated: false,
       );
 
   ProfileState copyWith({
     UserProfile? userProfile,
-    bool? isPicEditing,
-    bool? isBioEditing,
+    bool? isEditing,
     bool? wasProfilePictureUpdated,
   }) {
     return ProfileState(
       userProfile: userProfile ?? this.userProfile,
-      isPicEditing: isPicEditing ?? this.isPicEditing,
-      isBioEditing: isBioEditing ?? this.isBioEditing,
+      isEditing: isEditing ?? this.isEditing,
       wasProfilePictureUpdated:
           wasProfilePictureUpdated ?? false, // Reset state implicitly
     );
   }
 
   @override
-  List<Object?> get props =>
-      [userProfile, isPicEditing, isBioEditing, wasProfilePictureUpdated];
+  List<Object?> get props => [userProfile, isEditing, wasProfilePictureUpdated];
 }
diff --git a/lib/application/user/profile_tab/profile_tab_bloc.dart b/lib/application/user/profile_tab/profile_tab_bloc.dart
index 9b53aceb..39227e7c 100644
--- a/lib/application/user/profile_tab/profile_tab_bloc.dart
+++ b/lib/application/user/profile_tab/profile_tab_bloc.dart
@@ -11,7 +11,7 @@ part 'profile_tab_state.dart';
 class ProfileTabBloc extends Bloc<ProfileTabEvent, ProfileTabState> {
   final ICrowdActionRepository crowdActionRepository;
 
-  ProfileTabBloc(this.crowdActionRepository)
+  ProfileTabBloc({required this.crowdActionRepository})
       : super(ProfileTabState.initial()) {
     on<FetchProfileTabInfo>((event, emit) async {
       final crowdActionsOrFailure =
diff --git a/lib/core/config/network_config.dart b/lib/core/config/network_config.dart
index 479cc14b..a22f3128 100644
--- a/lib/core/config/network_config.dart
+++ b/lib/core/config/network_config.dart
@@ -5,7 +5,3 @@ part of '../core.dart';
 final baseStaticUrl = dotenv.get('BASE_STATIC_ENDPOINT_URL');
 
 final nullStaticUrl = '$baseStaticUrl/${null}';
-
-extension ImageExtension on String {
-  String get imageUrl => '$baseStaticUrl/$this';
-}
diff --git a/lib/core/utils/firebase_crashlytics_extension.dart b/lib/core/utils/firebase_crashlytics_extension.dart
deleted file mode 100644
index 4136d5d4..00000000
--- a/lib/core/utils/firebase_crashlytics_extension.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-import 'package:firebase_crashlytics/firebase_crashlytics.dart';
-
-extension FirebaseCrashlyticsLogger on FirebaseCrashlytics {
-  static Future<void> log(String message) async {
-    FirebaseCrashlytics.instance.log(message);
-  }
-
-  static Future<void> warn(
-    Exception exception,
-    StackTrace? stackTrace, {
-    String? message,
-    bool fatal = true,
-  }) async {
-    FirebaseCrashlytics.instance.recordError(
-      exception,
-      stackTrace,
-      reason: message,
-      fatal: fatal,
-    );
-  }
-}
diff --git a/lib/domain/auth/i_auth_repository.dart b/lib/domain/auth/i_auth_repository.dart
index dfb77ee2..3e48b3f4 100644
--- a/lib/domain/auth/i_auth_repository.dart
+++ b/lib/domain/auth/i_auth_repository.dart
@@ -6,7 +6,7 @@ import 'auth_failures.dart';
 import 'auth_success.dart';
 
 abstract class IAuthRepository {
-  Stream<User?> observeUser();
+  Stream<User> observeUser();
 
   /// TODO - Choose to either observe or getSignedInUser
   /// Returns [User] if already authenticated
@@ -48,7 +48,4 @@ abstract class IAuthRepository {
 
   /// Sign out of the user's account
   Future<void> signOut();
-
-  /// Get current user
-  User get currentUser;
 }
diff --git a/lib/domain/crowdaction/crowdaction.dart b/lib/domain/crowdaction/crowdaction.dart
index d6a50be7..08a25339 100644
--- a/lib/domain/crowdaction/crowdaction.dart
+++ b/lib/domain/crowdaction/crowdaction.dart
@@ -14,11 +14,12 @@ class CrowdAction with _$CrowdAction {
 
   const factory CrowdAction({
     required String id,
+    required String type,
     required String title,
     required String description,
     required String category,
     required Location location,
-    required List<Commitment> commitments,
+    required List<CommitmentOption> commitmentOptions,
     required Images images,
     required int participantCount,
     required Status status,
@@ -53,10 +54,10 @@ class CrowdAction with _$CrowdAction {
               : 'Finished';
 
   // Crowdaction banner url
-  String get bannerUrl => images.banner.imageUrl;
+  String get bannerUrl => '$baseStaticUrl/${images.banner}';
 
   // Crowdaction card url
-  String get cardUrl => images.card.imageUrl;
+  String get cardUrl => '$baseStaticUrl/${images.card}';
 }
 
 @freezed
@@ -92,17 +93,18 @@ enum JoinStatus {
 }
 
 @freezed
-class Commitment with _$Commitment {
-  const Commitment._();
+class CommitmentOption with _$CommitmentOption {
+  const CommitmentOption._();
 
-  factory Commitment({
+  factory CommitmentOption({
     required String id,
+    required String type,
     required String label,
     required int points,
     required List<String> blocks,
     String? description,
     String? iconId,
-  }) = _Commitment;
+  }) = _CommitmentOption;
 
   IconData get icon => iconId != null
       ? IconUtil.fromString(iconId!)
diff --git a/lib/domain/crowdaction/i_crowdaction_repository.dart b/lib/domain/crowdaction/i_crowdaction_repository.dart
index 7492c669..1ead614c 100644
--- a/lib/domain/crowdaction/i_crowdaction_repository.dart
+++ b/lib/domain/crowdaction/i_crowdaction_repository.dart
@@ -16,6 +16,16 @@ abstract class ICrowdActionRepository {
   Future<Either<CrowdActionFailure, List<CrowdAction>>>
       getSpotlightCrowdActions();
 
+  Future<Either<CrowdActionFailure, Unit>> subscribeToCrowdAction(
+    CrowdAction crowdAction,
+    List<String> commitments,
+    String? password,
+  );
+
+  Future<Either<CrowdActionFailure, Unit>> unsubscribeFromCrowdAction(
+    CrowdAction crowdAction,
+  );
+
   Future<Either<CrowdActionFailure, List<CrowdAction>>>
       getCrowdActionsForUser();
 }
diff --git a/lib/domain/participation/i_participation_repository.dart b/lib/domain/participation/i_participation_repository.dart
index 1e8280d9..23e7dea4 100644
--- a/lib/domain/participation/i_participation_repository.dart
+++ b/lib/domain/participation/i_participation_repository.dart
@@ -10,7 +10,7 @@ abstract class IParticipationRepository {
 
   Future<Either<ParticipationFailure, Unit>> toggleParticipation({
     required String crowdActionId,
-    List<String>? commitments,
+    List<String>? commitmentOptions,
   });
 
   Future<Either<ParticipationFailure, PaginatedParticipations>>
diff --git a/lib/domain/participation/participation.dart b/lib/domain/participation/participation.dart
index ccfcd0eb..26a55751 100644
--- a/lib/domain/participation/participation.dart
+++ b/lib/domain/participation/participation.dart
@@ -14,11 +14,11 @@ class Participation with _$Participation {
     required String fullName,
     required String avatar,
     required String userId,
-    required List<String> commitments,
+    required List<String> commitmentOptions,
     required DateTime joinDate,
     required int dailyCheckIns,
   }) = _Participation;
 
   // Participation avatar url
-  String get avatarUrl => avatar.imageUrl;
+  String get avatarUrl => '$baseStaticUrl/$avatar';
 }
diff --git a/lib/domain/user/user.dart b/lib/domain/user/user.dart
index d5b80ec5..7548b019 100644
--- a/lib/domain/user/user.dart
+++ b/lib/domain/user/user.dart
@@ -19,6 +19,7 @@ class User with _$User {
 
   bool get isAnonymous => this == anonymous;
 
+  /// TODO: Refactor after MVP to only neccessary fields (use profile microservice for details)
   const factory User({
     required String id,
     required Future<String?> Function([bool forceRefresh]) getIdToken,
diff --git a/lib/infrastructure/auth/firebase_auth_repository.dart b/lib/infrastructure/auth/firebase_auth_repository.dart
index 4679c81e..919cd437 100644
--- a/lib/infrastructure/auth/firebase_auth_repository.dart
+++ b/lib/infrastructure/auth/firebase_auth_repository.dart
@@ -17,7 +17,7 @@ import 'firebase_auth_mapper.dart';
 @LazySingleton(as: IAuthRepository)
 class FirebaseAuthRepository implements IAuthRepository, Disposable {
   final firebase_auth.FirebaseAuth firebaseAuth;
-  final _userSubject = BehaviorSubject<User?>();
+  final _userSubject = BehaviorSubject<User>.seeded(User.anonymous);
   late final StreamSubscription _userStreamSubscription;
 
   FirebaseAuthRepository({required this.firebaseAuth}) {
@@ -210,10 +210,7 @@ class FirebaseAuthRepository implements IAuthRepository, Disposable {
   }
 
   @override
-  Stream<User?> observeUser() => _userSubject.stream.distinct();
-
-  @override
-  User get currentUser => _firebaseUserToUser(firebaseAuth.currentUser);
+  Stream<User> observeUser() => _userSubject.stream.distinct();
 
   @override
   FutureOr onDispose() {
diff --git a/lib/infrastructure/crowdaction/crowdaction_dto.dart b/lib/infrastructure/crowdaction/crowdaction_dto.dart
index f7107328..f97dcf17 100644
--- a/lib/infrastructure/crowdaction/crowdaction_dto.dart
+++ b/lib/infrastructure/crowdaction/crowdaction_dto.dart
@@ -14,11 +14,12 @@ class CrowdActionDto with _$CrowdActionDto {
 
   const factory CrowdActionDto({
     required String id,
+    required String type,
     required String title,
     required String description,
     required String category,
     required LocationDto location,
-    required List<CommitmentDto> commitments,
+    required List<CommitmentOptionDto> commitmentOptions,
     required ImagesDto images,
     required int participantCount,
     required Status status,
@@ -31,11 +32,13 @@ class CrowdActionDto with _$CrowdActionDto {
   CrowdAction toDomain() {
     return CrowdAction(
       id: id,
+      type: type,
       title: title,
       description: description,
       category: category,
       location: location.toDomain(),
-      commitments: commitments.map((c) => c.toDomain()).toList(),
+      commitmentOptions:
+          commitmentOptions.map((option) => option.toDomain()).toList(),
       images: images.toDomain(),
       participantCount: participantCount,
       status: status,
@@ -91,21 +94,23 @@ class LocationDto with _$LocationDto {
 }
 
 @freezed
-class CommitmentDto with _$CommitmentDto {
-  const CommitmentDto._();
+class CommitmentOptionDto with _$CommitmentOptionDto {
+  const CommitmentOptionDto._();
 
-  factory CommitmentDto({
+  factory CommitmentOptionDto({
     required String id,
+    required String type,
     required String label,
     required int points,
     required List<String> blocks,
     String? description,
     String? icon,
-  }) = _CommitmentDto;
+  }) = _CommitmentOptionDto;
 
-  Commitment toDomain() {
-    return Commitment(
+  CommitmentOption toDomain() {
+    return CommitmentOption(
       id: id,
+      type: type,
       label: label,
       points: points,
       blocks: blocks,
@@ -114,6 +119,6 @@ class CommitmentDto with _$CommitmentDto {
     );
   }
 
-  factory CommitmentDto.fromJson(Map<String, dynamic> json) =>
-      _$CommitmentDtoFromJson(json);
+  factory CommitmentOptionDto.fromJson(Map<String, dynamic> json) =>
+      _$CommitmentOptionDtoFromJson(json);
 }
diff --git a/lib/infrastructure/crowdaction/crowdaction_repository.dart b/lib/infrastructure/crowdaction/crowdaction_repository.dart
index 0c8e948e..638601c4 100644
--- a/lib/infrastructure/crowdaction/crowdaction_repository.dart
+++ b/lib/infrastructure/crowdaction/crowdaction_repository.dart
@@ -91,6 +91,78 @@ class CrowdActionRepository implements ICrowdActionRepository {
     }
   }
 
+  @override
+  Future<Either<CrowdActionFailure, Unit>> subscribeToCrowdAction(
+    CrowdAction crowdAction,
+    List<String> commitments,
+    String? password,
+  ) async {
+    try {
+      final user = (await _authRepository.getSignedInUser())
+          .getOrElse(() => throw NotAuthenticatedError());
+      final tokenId = await user.getIdToken();
+
+      final uri = Uri.parse(
+        '${await _settingsRepository.baseApiEndpointUrl}/v1/participations',
+      );
+
+      final response = await _client.post(
+        uri,
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': 'Bearer $tokenId'
+        },
+        body: jsonEncode({
+          'crowdActionId': crowdAction.id,
+          'password': password,
+          'commitmentOptions': commitments
+        }),
+      );
+
+      if (response.statusCode == 200) {
+        return right(unit);
+      } else {
+        return left(const CrowdActionFailure.networkRequestFailed());
+      }
+    } catch (e) {
+      return left(const CrowdActionFailure.networkRequestFailed());
+    }
+  }
+
+  @override
+  Future<Either<CrowdActionFailure, Unit>> unsubscribeFromCrowdAction(
+    CrowdAction crowdAction,
+  ) async {
+    try {
+      final user = (await _authRepository.getSignedInUser())
+          .getOrElse(() => throw NotAuthenticatedError());
+      final tokenId = await user.getIdToken();
+
+      final uri = Uri.parse(
+        '${await _settingsRepository.baseApiEndpointUrl}/v1/participations',
+      );
+
+      final response = await _client.post(
+        uri,
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': 'Bearer $tokenId'
+        },
+        body: jsonEncode({
+          'crowdActionId': crowdAction.id,
+        }),
+      );
+
+      if (response.statusCode == 200) {
+        return right(unit);
+      } else {
+        return left(const CrowdActionFailure.networkRequestFailed());
+      }
+    } catch (e) {
+      return left(const CrowdActionFailure.networkRequestFailed());
+    }
+  }
+
   @override
   Future<Either<CrowdActionFailure, List<CrowdAction>>>
       getSpotlightCrowdActions() async {
diff --git a/lib/infrastructure/participation/participation_dto.dart b/lib/infrastructure/participation/participation_dto.dart
index 145c3485..905312fc 100644
--- a/lib/infrastructure/participation/participation_dto.dart
+++ b/lib/infrastructure/participation/participation_dto.dart
@@ -15,7 +15,7 @@ class ParticipationDto with _$ParticipationDto {
     required String userId,
     required String fullName,
     required String avatar,
-    required List<String> commitments,
+    required List<String> commitmentOptions,
     required String joinDate,
     required int dailyCheckIns,
   }) = _ParticipationDto;
@@ -27,7 +27,7 @@ class ParticipationDto with _$ParticipationDto {
       userId: userId,
       fullName: fullName,
       avatar: avatar,
-      commitments: commitments,
+      commitmentOptions: commitmentOptions,
       joinDate: DateTime.parse(joinDate),
       dailyCheckIns: dailyCheckIns,
     );
diff --git a/lib/infrastructure/participation/participation_repository.dart b/lib/infrastructure/participation/participation_repository.dart
index c2e2beda..00498cbb 100644
--- a/lib/infrastructure/participation/participation_repository.dart
+++ b/lib/infrastructure/participation/participation_repository.dart
@@ -12,6 +12,7 @@ import '../../domain/participation/paginated_participations.dart';
 import '../../domain/participation/participation.dart';
 import '../../domain/participation/participation_failures.dart';
 import '../core/page_info_dto.dart';
+import 'paginated_participations_dto.dart';
 import 'participation_dto.dart';
 
 @LazySingleton(as: IParticipationRepository)
@@ -66,7 +67,7 @@ class ParticipationRepository implements IParticipationRepository {
   @override
   Future<Either<ParticipationFailure, Unit>> toggleParticipation({
     required String crowdActionId,
-    List<String>? commitments,
+    List<String>? commitmentOptions,
   }) async {
     try {
       final user = (await authRepository.getSignedInUser())
@@ -81,7 +82,7 @@ class ParticipationRepository implements IParticipationRepository {
         uri,
         body: json.encode({
           'crowdActionId': crowdActionId,
-          'commitments': commitments,
+          'commitmentOptions': commitmentOptions,
         }),
         headers: {
           'Content-Type': 'application/json',
@@ -120,66 +121,17 @@ class ParticipationRepository implements IParticipationRepository {
 
       final participations = itemsJson
           .map(
-            (item) => ParticipationDto.fromJson(item as Map<String, dynamic>)
-                .toDomain(),
+            (item) => ParticipationDto.fromJson(item as Map<String, dynamic>),
           )
           .toList();
 
       final pageInfo = PageInfoDto.fromJson(pageInfoJson);
 
-      // To display user as first participant,
-      // Get user participation for first page
-      if (pageNumber == 1) {
-        int index = participations.indexWhere(
-          (p) => p.userId == authRepository.currentUser.id,
-        );
-
-        // If user already among participants
-        // skip fetching user participation
-        if (index > -1) {
-          // If user participation is in list,
-          // and not first, swap with first user
-          if (index > 0) {
-            final temp = participations[index];
-            participations[index] = participations.first;
-            participations[0] = temp;
-          }
-
-          return right(
-            PaginatedParticipations(
-              participations: participations,
-              pageInfo: pageInfo.toDomain(),
-            ),
-          );
-        }
-
-        // Fetch user participation
-        final participationResult =
-            await getParticipation(crowdActionId: crowdActionId);
-
-        if (participationResult.isRight()) {
-          // prepend user as first participant
-          final participation =
-              participationResult.getOrElse(() => throw Exception());
-
-          participations.insert(0, participation);
-        }
-      } else {
-        // Check if user exists among current participants and remove
-        int index = participations.indexWhere(
-          (p) => p.userId == authRepository.currentUser.id,
-        );
-
-        if (index > -1) {
-          participations.removeAt(index);
-        }
-      }
-
       return right(
-        PaginatedParticipations(
+        PaginatedParticipationsDto(
           participations: participations,
-          pageInfo: pageInfo.toDomain(),
-        ),
+          pageInfo: pageInfo,
+        ).toDomain(),
       );
     } catch (ex) {
       return left(const ParticipationFailure.networkRequestFailed());
diff --git a/lib/presentation/auth/auth_screen.dart b/lib/presentation/auth/auth_screen.dart
index f066cb25..551ad4b2 100644
--- a/lib/presentation/auth/auth_screen.dart
+++ b/lib/presentation/auth/auth_screen.dart
@@ -66,7 +66,9 @@ class AuthPageState extends State<AuthPage> {
       },
       child: Scaffold(
         resizeToAvoidBottomInset: true,
-        appBar: CustomAppBar(closable: _currentPage == 0),
+        appBar: _currentPage == 0
+            ? const CustomAppBar(closable: true)
+            : AppBar(backgroundColor: Colors.transparent, elevation: 0.0),
         body: SafeArea(
           child: SingleChildScrollView(
             child: Padding(
diff --git a/lib/presentation/auth/unauthenticated_screen.dart b/lib/presentation/auth/unauthenticated_screen.dart
deleted file mode 100644
index f5e91a29..00000000
--- a/lib/presentation/auth/unauthenticated_screen.dart
+++ /dev/null
@@ -1,72 +0,0 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:flutter/material.dart';
-
-import '../routes/app_routes.gr.dart';
-import '../shared_widgets/pill_button.dart';
-import '../themes/constants.dart';
-import '../../domain/core/i_settings_repository.dart';
-import '../../infrastructure/core/injection.dart';
-
-class UnauthenticatedPage extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      checkAndMaybeShowOnboarding(context);
-    });
-
-    return Scaffold(
-      backgroundColor: kAccentColor,
-      body: Container(
-        decoration: BoxDecoration(
-          image: DecorationImage(
-            fit: BoxFit.cover,
-            image: AssetImage(
-              "assets/images/unauthenticated_bg.png",
-            ),
-          ),
-        ),
-        child: Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 20),
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.end,
-            children: [
-              Text(
-                "Start acting",
-                style: TextStyle(
-                  fontWeight: FontWeight.w700,
-                  fontSize: 28.0,
-                  color: Colors.white,
-                ),
-              ),
-              const SizedBox(height: 8),
-              Text(
-                "We are ready, join us and others in taking action for a better life, by doing good and having fun!",
-                textAlign: TextAlign.center,
-                style: TextStyle(
-                  color: Colors.white,
-                ),
-              ),
-              const SizedBox(height: 48),
-              PillButton(
-                text: 'Log In',
-                isEnabled: true,
-                isLoading: false,
-                onTap: () => context.router.push(const AuthRoute()),
-                lightBackground: true,
-              ),
-              const SizedBox(height: 80),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  Future<void> checkAndMaybeShowOnboarding(BuildContext context) async {
-    // Push onboarding screen if first time launching application
-    final settingsRepository = getIt<ISettingsRepository>();
-    if (!(await settingsRepository.getWasUserOnboarded())) {
-      context.router.push(const OnboardingRoute());
-    }
-  }
-}
diff --git a/lib/presentation/core/app_widget.dart b/lib/presentation/core/app_widget.dart
index db9b4925..9b3d9cdb 100644
--- a/lib/presentation/core/app_widget.dart
+++ b/lib/presentation/core/app_widget.dart
@@ -16,7 +16,7 @@ class AppWidget extends StatelessWidget {
     return MultiBlocProvider(
       providers: [
         BlocProvider<AuthBloc>(
-          create: (_) => getIt<AuthBloc>()..add(AuthEvent.initial()),
+          create: (_) => getIt<AuthBloc>(),
         ),
         BlocProvider<ProfileBloc>(
           create: (_) => getIt<ProfileBloc>()..add(GetUserProfile()),
@@ -29,12 +29,6 @@ class AppWidget extends StatelessWidget {
         listener: (context, state) {
           BlocProvider.of<ProfileBloc>(context).add(GetUserProfile());
           BlocProvider.of<ProfileTabBloc>(context).add(FetchProfileTabInfo());
-
-          state.whenOrNull(
-            unauthenticated: () {
-              _appRouter.replaceAll([const UnauthenticatedRoute()]);
-            },
-          );
         },
         child: MaterialApp.router(
           color: Colors.white,
diff --git a/lib/presentation/core/collaction_icons.dart b/lib/presentation/core/collaction_icons.dart
index 10522270..000c8e86 100644
--- a/lib/presentation/core/collaction_icons.dart
+++ b/lib/presentation/core/collaction_icons.dart
@@ -17,6 +17,8 @@
 import 'package:flutter/widgets.dart';
 
 class CollactionIcons {
+  const CollactionIcons._();
+
   static const _kFontFam = 'CollactionIcons';
 
   static const IconData eye = IconData(0xe800, fontFamily: _kFontFam);
@@ -70,5 +72,4 @@ class CollactionIcons {
   static const IconData trash = IconData(0xe832, fontFamily: _kFontFam);
   static const IconData heart_filled = IconData(0xe833, fontFamily: _kFontFam);
   static const IconData heart = IconData(0xe834, fontFamily: _kFontFam);
-  static const IconData logo = IconData(0xe863, fontFamily: _kFontFam);
 }
diff --git a/lib/presentation/crowdaction/crowdaction_details/crowdaction_details_screen.dart b/lib/presentation/crowdaction/crowdaction_details/crowdaction_details_screen.dart
index cea76a9d..d1da17dd 100644
--- a/lib/presentation/crowdaction/crowdaction_details/crowdaction_details_screen.dart
+++ b/lib/presentation/crowdaction/crowdaction_details/crowdaction_details_screen.dart
@@ -1,6 +1,7 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:shimmer/shimmer.dart';
 
 import '../../../../domain/crowdaction/crowdaction.dart';
 import '../../../../infrastructure/core/injection.dart';
@@ -10,11 +11,11 @@ import '../../../application/participation/participation_bloc.dart';
 import '../../../application/user/profile_tab/profile_tab_bloc.dart';
 import '../../routes/app_routes.gr.dart';
 import '../../shared_widgets/commitments/commitment_card_list.dart';
+import '../../shared_widgets/expandable_text.dart';
 import '../../shared_widgets/pill_button.dart';
 import '../../themes/constants.dart';
 import 'widgets/confirm_participation.dart';
 import 'widgets/crowdaction_chips.dart';
-import 'widgets/crowdaction_description.dart';
 import 'widgets/crowdaction_details_banner.dart';
 import 'widgets/crowdaction_title.dart';
 import 'widgets/participants.dart';
@@ -35,18 +36,19 @@ class CrowdActionDetailsPage extends StatefulWidget {
 }
 
 class CrowdActionDetailsPageState extends State<CrowdActionDetailsPage> {
-  final List<Commitment> selectedCommitments = [];
+  final List<CommitmentOption> selectedCommitments = [];
+  CrowdAction? crowdAction;
   late final ParticipationBloc participationBloc;
-  late final String id;
   late Function(BuildContext) participate;
-  CrowdAction? crowdAction;
+
+  late final String id;
 
   @override
   void initState() {
     super.initState();
     participationBloc = getIt<ParticipationBloc>();
-    id = widget.crowdActionId ?? widget.crowdAction!.id;
     participate = _signUpModal;
+    id = widget.crowdActionId ?? widget.crowdAction!.id;
     crowdAction = widget.crowdAction;
   }
 
@@ -84,9 +86,10 @@ class CrowdActionDetailsPageState extends State<CrowdActionDetailsPage> {
                 participating: (p) {
                   setState(() {
                     selectedCommitments.clear();
-                    for (final id in p.commitments) {
+                    for (final id in p.commitmentOptions) {
                       selectedCommitments.add(
-                        crowdAction!.commitments.firstWhere((c) => c.id == id),
+                        crowdAction!.commitmentOptions
+                            .firstWhere((c) => c.id == id),
                       );
                     }
                   });
@@ -182,7 +185,7 @@ class CrowdActionDetailsPageState extends State<CrowdActionDetailsPage> {
                                   ),
                                   const SizedBox(height: 20),
                                   CrowdActionDescription(
-                                    description: crowdAction?.description,
+                                    crowdAction: crowdAction,
                                   ),
                                 ],
                               ),
@@ -228,7 +231,7 @@ class CrowdActionDetailsPageState extends State<CrowdActionDetailsPage> {
                             ),
                             CommitmentCardList(
                               isEnded: crowdAction?.isClosed ?? true,
-                              commitments: crowdAction?.commitments,
+                              commitmentOptions: crowdAction?.commitmentOptions,
                               selectedCommitments: selectedCommitments,
                             ),
 
@@ -352,3 +355,40 @@ class CrowdActionDetailsPageState extends State<CrowdActionDetailsPage> {
     context.router.push(const AuthRoute());
   }
 }
+
+class CrowdActionDescription extends StatelessWidget {
+  const CrowdActionDescription({
+    super.key,
+    required this.crowdAction,
+  });
+
+  final CrowdAction? crowdAction;
+
+  @override
+  Widget build(BuildContext context) {
+    if (crowdAction == null) {
+      return Shimmer.fromColors(
+        baseColor: kPrimaryColor100,
+        highlightColor: kPrimaryColor200,
+        child: Container(
+          height: 150,
+          width: double.infinity,
+          decoration: BoxDecoration(
+            color: kPrimaryColor100,
+            borderRadius: BorderRadius.circular(10),
+          ),
+        ),
+      );
+    }
+
+    return ExpandableText(
+      crowdAction!.description,
+      trimLines: 5,
+      style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+            fontSize: 17,
+            fontWeight: FontWeight.w300,
+            height: 1.5,
+          ),
+    );
+  }
+}
diff --git a/lib/presentation/crowdaction/crowdaction_details/widgets/confirm_participation.dart b/lib/presentation/crowdaction/crowdaction_details/widgets/confirm_participation.dart
index d6cbf014..38b39bfa 100644
--- a/lib/presentation/crowdaction/crowdaction_details/widgets/confirm_participation.dart
+++ b/lib/presentation/crowdaction/crowdaction_details/widgets/confirm_participation.dart
@@ -10,7 +10,7 @@ import '../../../themes/constants.dart';
 
 class ConfirmParticipation extends StatelessWidget {
   final CrowdAction crowdAction;
-  final List<Commitment> selectedCommitments;
+  final List<CommitmentOption> selectedCommitments;
 
   const ConfirmParticipation({
     super.key,
@@ -116,7 +116,7 @@ class ParticipationSuccess extends StatelessWidget {
 
 class ParticipationDialog extends StatelessWidget {
   final CrowdAction crowdAction;
-  final List<Commitment> selectedCommitments;
+  final List<CommitmentOption> selectedCommitments;
   final bool isLoading;
 
   const ParticipationDialog({
@@ -213,7 +213,8 @@ class ParticipationDialog extends StatelessWidget {
               BlocProvider.of<ParticipationBloc>(context).add(
                 ParticipationEvent.toggleParticipation(
                   crowdActionId: crowdAction.id,
-                  commitments: selectedCommitments.map((c) => c.id).toList(),
+                  commitmentOptions:
+                      selectedCommitments.map((c) => c.id).toList(),
                 ),
               );
             },
diff --git a/lib/presentation/crowdaction/crowdaction_details/widgets/crowdaction_description.dart b/lib/presentation/crowdaction/crowdaction_details/widgets/crowdaction_description.dart
deleted file mode 100644
index 5c6e6a76..00000000
--- a/lib/presentation/crowdaction/crowdaction_details/widgets/crowdaction_description.dart
+++ /dev/null
@@ -1,42 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:shimmer/shimmer.dart';
-
-import '../../../shared_widgets/expandable_markdown_text.dart';
-import '../../../themes/constants.dart';
-
-class CrowdActionDescription extends StatefulWidget {
-  final String? description;
-
-  const CrowdActionDescription({
-    super.key,
-    required this.description,
-  });
-
-  @override
-  State<CrowdActionDescription> createState() => _CrowdActionDescriptionState();
-}
-
-class _CrowdActionDescriptionState extends State<CrowdActionDescription> {
-  @override
-  Widget build(BuildContext context) {
-    if (widget.description == null) {
-      return Shimmer.fromColors(
-        baseColor: kPrimaryColor100,
-        highlightColor: kPrimaryColor200,
-        child: Container(
-          height: 150,
-          width: double.infinity,
-          decoration: BoxDecoration(
-            color: kPrimaryColor100,
-            borderRadius: BorderRadius.circular(10),
-          ),
-        ),
-      );
-    }
-
-    return ExpandableMarkdown(
-      data: widget.description!,
-      themeData: Theme.of(context),
-    );
-  }
-}
diff --git a/lib/presentation/crowdaction/crowdaction_details/widgets/crowdaction_details_banner.dart b/lib/presentation/crowdaction/crowdaction_details/widgets/crowdaction_details_banner.dart
index b7d20feb..63f58090 100644
--- a/lib/presentation/crowdaction/crowdaction_details/widgets/crowdaction_details_banner.dart
+++ b/lib/presentation/crowdaction/crowdaction_details/widgets/crowdaction_details_banner.dart
@@ -6,19 +6,18 @@ import 'package:shimmer/shimmer.dart';
 import '../../../../core/core.dart';
 import '../../../../domain/crowdaction/crowdaction.dart';
 import '../../../core/collaction_icons.dart';
-import '../../../shared_widgets/country_icon.dart';
 import '../../../shared_widgets/custom_fab.dart';
 import '../../../shared_widgets/image_skeleton_loader.dart';
 import '../../../themes/constants.dart';
 
 class CrowdActionDetailsBanner extends StatelessWidget {
-  final CrowdAction? crowdAction;
-
   const CrowdActionDetailsBanner({
     super.key,
     required this.crowdAction,
   });
 
+  final CrowdAction? crowdAction;
+
   @override
   Widget build(BuildContext context) {
     return SliverAppBar(
@@ -74,34 +73,21 @@ class CrowdActionDetailsBanner extends StatelessWidget {
                       ),
                     ),
             ),
-            Positioned(
+            if (crowdAction?.hasPassword ?? false) ...[
+              const Positioned(
                 bottom: 10,
                 right: 10,
-                child: Row(
-                  children: [
-                    if (crowdAction?.hasPassword ?? false) ...[
-                      CustomFAB(
-                        heroTag: 'locked',
-                        isMini: true,
-                        color: kSecondaryColor,
-                        child: Icon(
-                          CollactionIcons.lock,
-                          color: kPrimaryColor300,
-                        ),
-                      ),
-                    ],
-                    if ((crowdAction?.hasPassword ?? false) &&
-                        (crowdAction?.location != null)) ...[
-                      const SizedBox(width: 6),
-                    ],
-                    if (crowdAction?.location != null) ...[
-                      CountryIcon(
-                        countryCode: crowdAction?.location.code ?? 'nl',
-                        radius: 20,
-                      ),
-                    ],
-                  ],
-                )),
+                child: CustomFAB(
+                  heroTag: 'locked',
+                  isMini: true,
+                  color: kSecondaryColor,
+                  child: Icon(
+                    CollactionIcons.lock,
+                    color: kPrimaryColor300,
+                  ),
+                ),
+              ),
+            ],
           ],
         ),
       ),
diff --git a/lib/presentation/crowdaction/crowdaction_details/widgets/participants.dart b/lib/presentation/crowdaction/crowdaction_details/widgets/participants.dart
index b3a3fc67..c7793668 100644
--- a/lib/presentation/crowdaction/crowdaction_details/widgets/participants.dart
+++ b/lib/presentation/crowdaction/crowdaction_details/widgets/participants.dart
@@ -25,7 +25,8 @@ class Participants extends StatelessWidget {
       ),
       child: Row(
         children: [
-          if (crowdAction?.hasParticipants == true) ...[
+          if (crowdAction != null &&
+              (crowdAction?.participantCount ?? 0) > 0) ...[
             TopParticipantAvatars(
               crowdActionId: crowdAction!.id,
             ),
diff --git a/lib/presentation/crowdaction/crowdaction_details/widgets/withdraw_participation.dart b/lib/presentation/crowdaction/crowdaction_details/widgets/withdraw_participation.dart
index 513b3f92..5caaafb4 100644
--- a/lib/presentation/crowdaction/crowdaction_details/widgets/withdraw_participation.dart
+++ b/lib/presentation/crowdaction/crowdaction_details/widgets/withdraw_participation.dart
@@ -93,6 +93,7 @@ class WithdrawParticipation extends StatelessWidget {
                                   fontSize: 28,
                                 ),
                       ),
+
                       const SizedBox(
                         height: 20,
                       ),
@@ -104,6 +105,10 @@ class WithdrawParticipation extends StatelessWidget {
                         margin: EdgeInsets.zero,
                       ),
                       const SizedBox(height: 20),
+                      //TODO - Add message to change commitments const Divider(),
+                      // const SizedBox(
+                      //   height: 15,
+                      // ),
                     ],
                   ),
                 );
diff --git a/lib/presentation/crowdaction/crowdaction_participants/crowdaction_participants_screen.dart b/lib/presentation/crowdaction/crowdaction_participants/crowdaction_participants_screen.dart
index 5ced5712..aaab2124 100644
--- a/lib/presentation/crowdaction/crowdaction_participants/crowdaction_participants_screen.dart
+++ b/lib/presentation/crowdaction/crowdaction_participants/crowdaction_participants_screen.dart
@@ -8,7 +8,7 @@ import '../../../domain/participation/participation.dart';
 import '../../../infrastructure/core/injection.dart';
 import '../../themes/constants.dart';
 
-class CrowdActionParticipantsPage extends StatefulWidget {
+class CrowdActionParticipantsPage extends StatelessWidget {
   final String crowdActionId;
 
   CrowdActionParticipantsPage({
@@ -16,26 +16,8 @@ class CrowdActionParticipantsPage extends StatefulWidget {
     required this.crowdActionId,
   });
 
-  @override
-  State<CrowdActionParticipantsPage> createState() =>
-      _CrowdActionParticipantsPageState();
-}
-
-class _CrowdActionParticipantsPageState
-    extends State<CrowdActionParticipantsPage> {
-  late final PagingController<int, Participation> pagingController;
-
-  @override
-  void initState() {
-    super.initState();
-    pagingController = PagingController(firstPageKey: 1);
-  }
-
-  @override
-  void dispose() {
-    pagingController.dispose();
-    super.dispose();
-  }
+  final PagingController<int, Participation> pagingController =
+      PagingController(firstPageKey: 1);
 
   @override
   Widget build(BuildContext context) {
@@ -50,7 +32,7 @@ class _CrowdActionParticipantsPageState
               pagingController.addPageRequestListener((pageKey) {
                 BlocProvider.of<CrowdActionParticipantsBloc>(context).add(
                   CrowdActionParticipantsEvent.getParticipants(
-                    crowdActionId: widget.crowdActionId,
+                    crowdActionId: crowdActionId,
                     pageNumber: pageKey,
                   ),
                 );
@@ -58,7 +40,7 @@ class _CrowdActionParticipantsPageState
 
               BlocProvider.of<CrowdActionParticipantsBloc>(context).add(
                 CrowdActionParticipantsEvent.getParticipants(
-                  crowdActionId: widget.crowdActionId,
+                  crowdActionId: crowdActionId,
                   pageNumber: 1,
                 ),
               );
diff --git a/lib/presentation/demo/components_demo/components_demo_screen.dart b/lib/presentation/demo/components_demo/components_demo_screen.dart
index c89d83b6..965b3899 100644
--- a/lib/presentation/demo/components_demo/components_demo_screen.dart
+++ b/lib/presentation/demo/components_demo/components_demo_screen.dart
@@ -50,6 +50,7 @@ class ComponentsDemoPageState extends State<ComponentsDemoPage> {
               CrowdActionCard(
                 crowdAction: CrowdAction(
                   id: "",
+                  type: "",
                   title:
                       "This is the headline for a crowdaction with three lines",
                   images: const Images(
@@ -58,16 +59,18 @@ class ComponentsDemoPageState extends State<ComponentsDemoPage> {
                   ),
                   category: "Sustainability",
                   subcategory: "Community",
-                  commitments: [
-                    Commitment(
+                  commitmentOptions: [
+                    CommitmentOption(
                       id: "",
+                      type: "food",
                       label: "no-beef",
                       description: "Don't eat beef for 30 days!",
                       points: 0,
                       blocks: [],
                     ),
-                    Commitment(
+                    CommitmentOption(
                       id: "",
+                      type: "food",
                       label: "vegetarian",
                       description: "Don't eat meat for 30 days!",
                       points: 0,
@@ -89,6 +92,7 @@ class ComponentsDemoPageState extends State<ComponentsDemoPage> {
               CrowdActionCard(
                 crowdAction: CrowdAction(
                   id: "",
+                  type: "",
                   title:
                       "This is the headline for a crowdaction with three lines",
                   images: const Images(
@@ -97,16 +101,18 @@ class ComponentsDemoPageState extends State<ComponentsDemoPage> {
                   ),
                   category: "Sustainability",
                   subcategory: "Community",
-                  commitments: [
-                    Commitment(
+                  commitmentOptions: [
+                    CommitmentOption(
                       id: "",
+                      type: "food",
                       label: "no-beef",
                       description: "Don't eat beef for 30 days!",
                       points: 0,
                       blocks: [],
                     ),
-                    Commitment(
+                    CommitmentOption(
                       id: "",
+                      type: "food",
                       label: "vegetarian",
                       description: "Don't eat meat for 30 days!",
                       points: 0,
diff --git a/lib/presentation/demo/demo_screen.dart b/lib/presentation/demo/demo_screen.dart
index 26412a7f..9188a681 100644
--- a/lib/presentation/demo/demo_screen.dart
+++ b/lib/presentation/demo/demo_screen.dart
@@ -9,6 +9,7 @@ import 'components_demo/current_user_status_text.dart';
 
 class DemoPage extends StatelessWidget {
   DemoPage({super.key});
+
   final settingsRepository = getIt<ISettingsRepository>();
   final _pageScrollController = ScrollController();
 
diff --git a/lib/presentation/home/home_screen.dart b/lib/presentation/home/home_screen.dart
index cfa80edb..ba4cdac5 100644
--- a/lib/presentation/home/home_screen.dart
+++ b/lib/presentation/home/home_screen.dart
@@ -3,10 +3,27 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 import '../../../presentation/themes/constants.dart';
+import '../../domain/core/i_settings_repository.dart';
+import '../../infrastructure/core/injection.dart';
 import '../core/collaction_icons.dart';
 import '../routes/app_routes.gr.dart';
 
-class HomePage extends StatelessWidget {
+class HomePage extends StatefulWidget {
+  const HomePage({super.key});
+
+  @override
+  HomePageState createState() => HomePageState();
+}
+
+class HomePageState extends State<HomePage> {
+  @override
+  void initState() {
+    super.initState();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      checkAndMaybeShowOnboarding();
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     return AutoTabsScaffold(
@@ -16,11 +33,20 @@ class HomePage extends StatelessWidget {
         if (!kReleaseMode) ...[
           DemoScreenRouter(),
         ],
+        MenuScreenRouter()
       ],
       bottomNavigationBuilder: (_, tabsRouter) => bottomNavbar(tabsRouter),
     );
   }
 
+  Future<void> checkAndMaybeShowOnboarding() async {
+    // Push onboarding screen if first time launching application
+    final settingsRepository = getIt<ISettingsRepository>();
+    if (!(await settingsRepository.getWasUserOnboarded())) {
+      context.router.push(const OnboardingRoute());
+    }
+  }
+
   Widget bottomNavbar(TabsRouter tabsRouter) {
     return BottomNavigationBar(
       backgroundColor: Colors.white,
@@ -30,9 +56,9 @@ class HomePage extends StatelessWidget {
       unselectedItemColor: kDisabledButtonColor,
       type: BottomNavigationBarType.fixed,
       elevation: 0,
-      items: const [
+      items: [
         BottomNavigationBarItem(
-          icon: Icon(CollactionIcons.logo),
+          icon: Icon(CollactionIcons.collaction),
           label: '',
         ),
         BottomNavigationBarItem(
@@ -47,6 +73,12 @@ class HomePage extends StatelessWidget {
             label: '',
           ),
         ],
+        BottomNavigationBarItem(
+          icon: Icon(
+            Icons.grid_view,
+          ),
+          label: '',
+        ),
       ],
       currentIndex: tabsRouter.activeIndex,
       onTap: tabsRouter.setActiveIndex,
diff --git a/lib/presentation/home/widgets/password_modal.dart b/lib/presentation/home/widgets/password_modal.dart
index e2288136..26648b71 100644
--- a/lib/presentation/home/widgets/password_modal.dart
+++ b/lib/presentation/home/widgets/password_modal.dart
@@ -18,28 +18,6 @@ class PasswordModal extends StatefulWidget {
 
   @override
   State<PasswordModal> createState() => _PasswordModalState();
-
-  static Future<void> show(
-    BuildContext context,
-    CrowdAction crowdAction,
-  ) async {
-    final settingsRepository = getIt<ISettingsRepository>();
-    final accessList = await settingsRepository.getCrowdActionAccessList();
-
-    if (accessList.contains(crowdAction.id)) {
-      context.router.push(
-        CrowdActionDetailsRoute(crowdAction: crowdAction),
-      );
-    } else {
-      showModalBottomSheet(
-        context: context,
-        isScrollControlled: true,
-        backgroundColor: Colors.transparent,
-        constraints: const BoxConstraints(maxHeight: 350),
-        builder: (context) => PasswordModal(crowdAction: crowdAction),
-      );
-    }
-  }
 }
 
 class _PasswordModalState extends State<PasswordModal> {
@@ -114,7 +92,9 @@ class _PasswordModalState extends State<PasswordModal> {
                 borderRadius: BorderRadius.circular(20.0),
                 borderSide: const BorderSide(width: 2, color: Colors.red),
               ),
-              errorText: _validated == false ? "Invalid password" : null,
+              errorText: _validated != null && _validated == false
+                  ? "Invalid password"
+                  : null,
               errorBorder: OutlineInputBorder(
                 borderRadius: BorderRadius.circular(20.0),
                 borderSide: const BorderSide(width: 2, color: Colors.red),
@@ -167,7 +147,7 @@ class _PasswordModalState extends State<PasswordModal> {
 
       addCrowdActionAccess();
 
-      context.router.popAndPush(
+      context.router.replace(
         CrowdActionDetailsRoute(
           crowdAction: widget.crowdAction,
         ),
@@ -190,3 +170,25 @@ class _PasswordModalState extends State<PasswordModal> {
     super.dispose();
   }
 }
+
+Future<void> showPasswordModal(
+  BuildContext context,
+  CrowdAction crowdAction,
+) async {
+  final settingsRepository = getIt<ISettingsRepository>();
+  final accessList = await settingsRepository.getCrowdActionAccessList();
+
+  if (accessList.contains(crowdAction.id)) {
+    context.router.push(
+      CrowdActionDetailsRoute(crowdAction: crowdAction),
+    );
+  } else {
+    showModalBottomSheet(
+      context: context,
+      isScrollControlled: true,
+      backgroundColor: Colors.transparent,
+      constraints: const BoxConstraints(maxHeight: 350),
+      builder: (context) => PasswordModal(crowdAction: crowdAction),
+    );
+  }
+}
diff --git a/lib/presentation/menu/menu_screen.dart b/lib/presentation/menu/menu_screen.dart
new file mode 100644
index 00000000..b4cc027a
--- /dev/null
+++ b/lib/presentation/menu/menu_screen.dart
@@ -0,0 +1,260 @@
+import 'package:auto_route/auto_route.dart';
+import 'widgets/build_information_tile.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+import '../../application/auth/auth_bloc.dart';
+import '../../application/settings/build_information/build_information_bloc.dart';
+import '../../application/user/profile/profile_bloc.dart';
+import '../../infrastructure/core/injection.dart';
+import '../routes/app_routes.gr.dart';
+import '../utils/launch_url.dart';
+import 'widgets/avatar_info.dart';
+import 'widgets/header_bar.dart';
+import 'widgets/legal_info_policy_widget.dart';
+import 'package:flutter/material.dart';
+import '../themes/constants.dart';
+import '../core/collaction_icons.dart';
+import 'widgets/user_info_and_avatar.dart';
+
+class MenuPage extends StatelessWidget {
+  const MenuPage({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: SafeArea(
+        child: SingleChildScrollView(
+          child: BlocProvider<ProfileBloc>.value(
+            value: BlocProvider.of<ProfileBloc>(context),
+            child: BlocBuilder<ProfileBloc, ProfileState>(
+              builder: (context, state) => Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Padding(
+                    padding:
+                        const EdgeInsets.only(left: 20, top: 10, right: 22.5),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        HeaderBar(),
+                        UserInfoAndAvatar(
+                          pictureUrl: state.userProfile?.profile.avatar,
+                          name: state.userProfile?.profile.firstName,
+                        ),
+                        SizedBox(
+                          height: 30,
+                        ),
+                        SizedBox(
+                          height: 18,
+                        ),
+                        GestureDetector(
+                          onTap: () async {
+                            BlocProvider.of<AuthBloc>(context)
+                                .add(const AuthEvent.signedOut());
+                            BlocProvider.of<ProfileBloc>(context)
+                                .add(GetUserProfile());
+                            await context.router.pop();
+                          },
+                          child: Row(
+                            mainAxisAlignment: MainAxisAlignment.center,
+                            children: [
+                              Icon(
+                                Icons.logout,
+                                color: kErrorColor,
+                              ),
+                              SizedBox(
+                                width: 2.5,
+                              ),
+                              Text(
+                                "Log out",
+                                style: TextStyle(
+                                  color: kErrorColor,
+                                  fontSize: 15,
+                                  fontWeight: FontWeight.w700,
+                                ),
+                              )
+                            ],
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                  Subtitle(
+                    subTitle: "Account",
+                    paddingTop: 38.5,
+                    paddingBottom: 20,
+                  ),
+                  Padding(
+                    padding: const EdgeInsets.only(left: 22.25),
+                    child: GestureDetector(
+                      onTap: () {},
+                      child: Row(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Icon(
+                            Icons.account_circle,
+                            color: kPrimaryColor300,
+                            size: 19.5,
+                          ),
+                          SizedBox(
+                            width: 12.25,
+                          ),
+                          Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              Text(
+                                "Account Information",
+                                style: TextStyle(
+                                    fontSize: 12,
+                                    fontWeight: FontWeight.w500,
+                                    color: kPrimaryColor300),
+                              ),
+                              SizedBox(
+                                height: 5,
+                              ),
+                              SizedBox(
+                                width: 306,
+                                child: Text(
+                                  "View and update your account  and contact information that is associated with your CollAction account.",
+                                  style: TextStyle(
+                                      fontSize: 12,
+                                      color: kPrimaryColor300,
+                                      fontWeight: FontWeight.w400),
+                                ),
+                              ),
+                            ],
+                          )
+                        ],
+                      ),
+                    ),
+                  ),
+                  Subtitle(
+                      subTitle: "Feedback", paddingTop: 30, paddingBottom: 20),
+                  Padding(
+                    padding: const EdgeInsets.only(
+                      left: 22.5,
+                    ),
+                    child: GestureDetector(
+                      onTap: () {},
+                      child: Row(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Icon(
+                            CollactionIcons.message,
+                            color: kPrimaryColor300,
+                            size: 15,
+                          ),
+                          SizedBox(
+                            width: 16.25,
+                          ),
+                          Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              Text(
+                                "Contact us",
+                                style: TextStyle(
+                                    fontSize: 12,
+                                    fontWeight: FontWeight.w500,
+                                    color: kPrimaryColor300),
+                              ),
+                              SizedBox(
+                                height: 5,
+                              ),
+                              SizedBox(
+                                width: 305,
+                                child: Text(
+                                  "Have a general enquiry, business proposal, or simply want us to send your feedback or regards? Get in contact with us through our form.",
+                                  style: TextStyle(
+                                      fontSize: 12,
+                                      color: kPrimaryColor300,
+                                      fontWeight: FontWeight.w400),
+                                ),
+                              ),
+                            ],
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+                  Subtitle(
+                      subTitle: "Legal information and policies",
+                      paddingBottom: 24,
+                      paddingTop: 30),
+                  LegalInfoAndPoliciesWidget(
+                      onTap: () async {
+                        launchUrl(
+                          'https://www.collaction.org/privacy',
+                          useWebView: true,
+                          context: context,
+                        );
+                      },
+                      iconWidget: CollactionIcons.lock,
+                      label: "Privacy Policy"),
+                  LegalInfoAndPoliciesWidget(
+                      onTap: () => launchUrl(
+                            'https://www.collaction.org/terms',
+                            useWebView: true,
+                            context: context,
+                          ),
+                      iconWidget: CollactionIcons.file,
+                      label: "Terms & conditions"),
+                  LegalInfoAndPoliciesWidget(
+                      onTap: () => context.router.push(const LicensesRoute()),
+                      iconWidget: CollactionIcons.opensource,
+                      label: "Open-source libraries"),
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      BlocBuilder<BuildInformationBloc, BuildInformationState>(
+                        bloc: getIt<BuildInformationBloc>()
+                          ..add(const BuildInformationEvent.fetch()),
+                        builder: (context, state) {
+                          return state.when(
+                            loading: () => const SizedBox(),
+                            fetched: (buildInfo) =>
+                                BuildInformationTile(information: buildInfo),
+                          );
+                        },
+                      ),
+                    ],
+                  )
+                ],
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class Subtitle extends StatelessWidget {
+  final double paddingTop;
+
+  final double paddingBottom;
+
+  final String subTitle;
+
+  const Subtitle(
+      {Key? key,
+      required this.paddingTop,
+      required this.paddingBottom,
+      required this.subTitle})
+      : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding:
+          EdgeInsets.only(left: 20, top: paddingTop, bottom: paddingBottom),
+      child: Text(
+        subTitle,
+        style: TextStyle(
+          fontSize: 15,
+          fontWeight: FontWeight.w700,
+          color: kPrimaryColor300,
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/presentation/menu/widgets/avatar_info.dart b/lib/presentation/menu/widgets/avatar_info.dart
new file mode 100644
index 00000000..e93319eb
--- /dev/null
+++ b/lib/presentation/menu/widgets/avatar_info.dart
@@ -0,0 +1,77 @@
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
+
+import '../../../domain/user/i_user_repository.dart';
+import '../../../domain/user/user.dart';
+import '../../../infrastructure/core/injection.dart';
+import '../../profile/widget/profile_picture.dart';
+import '../../themes/constants.dart';
+
+class AvatarAndInfo extends StatefulWidget {
+  final String? pictureUrl;
+  final String? name;
+
+  const AvatarAndInfo({
+    Key? key,
+    required this.pictureUrl,
+    required this.name,
+  }) : super(key: key);
+
+  @override
+  State<AvatarAndInfo> createState() => _AvatarAndInfoState();
+}
+
+class _AvatarAndInfoState extends State<AvatarAndInfo> {
+  late final IUserRepository _userRepository;
+  File? _image;
+  late String number;
+
+  @override
+  void initState() {
+    super.initState();
+    _userRepository = getIt<IUserRepository>();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: [
+        ProfilePicture(
+          image: _image,
+          profileImage: widget.pictureUrl != null
+              ? '${dotenv.get('BASE_STATIC_ENDPOINT_URL')}/${widget.pictureUrl}'
+              : null,
+          maxRadius: 50,
+        ),
+        SizedBox(
+          width: 10,
+        ),
+        Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              widget.name ?? "",
+              style: nameTextStyle,
+            ),
+            StreamBuilder(
+              builder: (context, AsyncSnapshot<User> snapshot) {
+                if (snapshot.hasData) {
+                  number = snapshot.data!.phoneNumber ?? 'no phone number';
+                }
+                return Text(
+                  number,
+                  style: phoneNumberTextStyle,
+                );
+              },
+              stream: _userRepository.observeUser(),
+            ),
+          ],
+        )
+      ],
+    );
+  }
+}
diff --git a/lib/presentation/settings/widgets/build_information_tile.dart b/lib/presentation/menu/widgets/build_information_tile.dart
similarity index 95%
rename from lib/presentation/settings/widgets/build_information_tile.dart
rename to lib/presentation/menu/widgets/build_information_tile.dart
index 1092d7e6..2d2c575e 100644
--- a/lib/presentation/settings/widgets/build_information_tile.dart
+++ b/lib/presentation/menu/widgets/build_information_tile.dart
@@ -15,7 +15,7 @@ class BuildInformationTile extends StatelessWidget {
         const SizedBox(height: 50),
         const SizedBox(
           width: 56,
-          child: Image(image: AssetImage('assets/images/build_info.png')),
+          child: Image(image: AssetImage('assets/images/collaction.png')),
         ),
         const SizedBox(height: 5),
         Text(
diff --git a/lib/presentation/menu/widgets/header_bar.dart b/lib/presentation/menu/widgets/header_bar.dart
new file mode 100644
index 00000000..f6a0bdd1
--- /dev/null
+++ b/lib/presentation/menu/widgets/header_bar.dart
@@ -0,0 +1,32 @@
+import 'package:flutter/material.dart';
+
+import '../../themes/constants.dart';
+
+class HeaderBar extends StatelessWidget {
+  const HeaderBar({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: [
+        Text(
+          "Menu",
+          style: TextStyle(
+            fontSize: 28,
+            fontWeight: FontWeight.w700,
+          ),
+        ),
+        IconButton(
+          onPressed: () {},
+          icon: Icon(
+            Icons.search,
+            color: kPrimaryColor600,
+            size: 21.08,
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/presentation/menu/widgets/legal_info_policy_widget.dart b/lib/presentation/menu/widgets/legal_info_policy_widget.dart
new file mode 100644
index 00000000..9cb21908
--- /dev/null
+++ b/lib/presentation/menu/widgets/legal_info_policy_widget.dart
@@ -0,0 +1,53 @@
+import 'package:flutter/material.dart';
+
+import '../../themes/constants.dart';
+
+class LegalInfoAndPoliciesWidget extends StatefulWidget {
+  final Function onTap;
+  final IconData iconWidget;
+  final String label;
+
+  const LegalInfoAndPoliciesWidget(
+      {Key? key,
+      required this.onTap,
+      required this.iconWidget,
+      required this.label})
+      : super(key: key);
+
+  @override
+  State<LegalInfoAndPoliciesWidget> createState() =>
+      _LegalInfoAndPoliciesWidgetState();
+}
+
+class _LegalInfoAndPoliciesWidgetState
+    extends State<LegalInfoAndPoliciesWidget> {
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.only(left: 20, bottom: 27.6),
+      child: InkWell(
+        onTap: () => widget.onTap(),
+        child: Row(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Icon(
+              widget.iconWidget,
+              size: 20,
+            ),
+            SizedBox(
+              width: 14,
+            ),
+            Text(
+              widget.label,
+              style: TextStyle(
+                fontSize: 12,
+                fontWeight: FontWeight.w500,
+                color: kPrimaryColor300,
+              ),
+            )
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/presentation/menu/widgets/user_info_and_avatar.dart b/lib/presentation/menu/widgets/user_info_and_avatar.dart
new file mode 100644
index 00000000..eeb1ddf5
--- /dev/null
+++ b/lib/presentation/menu/widgets/user_info_and_avatar.dart
@@ -0,0 +1,55 @@
+import 'package:flutter/material.dart';
+
+import '../../themes/constants.dart';
+import 'avatar_info.dart';
+
+class UserInfoAndAvatar extends StatelessWidget {
+  final String? pictureUrl;
+
+  final String? name;
+
+  const UserInfoAndAvatar({Key? key, this.pictureUrl, this.name})
+      : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      height: 85,
+      decoration: avatarInfoDecorationBox,
+      child: Padding(
+        padding: EdgeInsets.only(
+          left: 20,
+          top: 10,
+          bottom: 10,
+          right: 25.5,
+        ),
+        child: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            AvatarAndInfo(
+              pictureUrl: pictureUrl,
+              name: name,
+            ),
+            GestureDetector(
+              onTap: () {},
+              child: Container(
+                child: Padding(
+                  padding: const EdgeInsets.all(3.0),
+                  child: Icon(
+                    Icons.settings,
+                    color: kPrimaryColor600,
+                    size: 21,
+                  ),
+                ),
+                decoration: BoxDecoration(
+                  color: Colors.white,
+                  shape: BoxShape.circle,
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/presentation/profile/profile_screen.dart b/lib/presentation/profile/profile_screen.dart
index 4129265c..c327b8d6 100644
--- a/lib/presentation/profile/profile_screen.dart
+++ b/lib/presentation/profile/profile_screen.dart
@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:share_plus/share_plus.dart';
 
 import '../../application/user/profile/profile_bloc.dart';
@@ -70,33 +71,6 @@ class _UserProfilePageState extends State<UserProfilePage> {
                   ),
                 ),
                 const SizedBox(height: 10),
-                ElevatedButton(
-                  onPressed: () => context.router.push(const SettingsRoute()),
-                  style: ElevatedButton.styleFrom(
-                    foregroundColor: kPrimaryColor0,
-                    backgroundColor: Colors.white,
-                    shape: const CircleBorder(),
-                    tapTargetSize: MaterialTapTargetSize.padded,
-                  ).merge(
-                    ButtonStyle(
-                      elevation: MaterialStateProperty.resolveWith<double?>(
-                        (Set<MaterialState> states) {
-                          if (states.contains(MaterialState.pressed)) {
-                            return 5;
-                          }
-                          return 4;
-                        },
-                      ),
-                    ),
-                  ),
-                  child: const Padding(
-                    padding: EdgeInsets.symmetric(vertical: 8.0, horizontal: 4),
-                    child: Icon(
-                      CollactionIcons.settings,
-                      color: kPrimaryColor300,
-                    ),
-                  ),
-                ),
               ],
             ),
             body: SafeArea(
@@ -120,11 +94,15 @@ class _UserProfilePageState extends State<UserProfilePage> {
                                   padding: const EdgeInsets.all(10.0),
                                   child: ProfilePicture(
                                     image: _image,
-                                    profileImage: state.userProfile?.avatarUrl,
+                                    profileImage: state
+                                                .userProfile?.profile.avatar !=
+                                            null
+                                        ? '${dotenv.get('BASE_STATIC_ENDPOINT_URL')}/${state.userProfile?.profile.avatar}'
+                                        : null,
                                     maxRadius: 50,
                                   ),
                                 ),
-                                if (state.userProfile != null) ...[
+                                if (state.isEditing == true) ...[
                                   Positioned(
                                     bottom: 0,
                                     right: 0,
@@ -134,17 +112,11 @@ class _UserProfilePageState extends State<UserProfilePage> {
                                         context,
                                         onSelected: (image) {
                                           setState(() => _image = image);
-                                          BlocProvider.of<ProfileBloc>(context)
-                                              .add(
-                                            SaveProfilePic(image: image),
-                                          );
                                         },
                                       ),
                                       backgroundColor: kAccentColor,
                                       mini: true,
-                                      child: const Icon(
-                                        Icons.drive_file_rename_outline,
-                                      ),
+                                      child: const Icon(Icons.add),
                                     ),
                                   ),
                                 ]
@@ -163,58 +135,17 @@ class _UserProfilePageState extends State<UserProfilePage> {
                           ),
                           if (state.userProfile != null) ...[
                             const SizedBox(height: 40),
-                            Row(
-                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                              children: [
-                                const Text(
-                                  'About me',
-                                  style: TextStyle(
-                                    fontWeight: FontWeight.w700,
-                                    fontSize: 11,
-                                    color: Color(0xFF666666),
-                                  ),
-                                  textAlign: TextAlign.left,
-                                ),
-                                TextButton(
-                                  key: const Key('save_edit_bio_button'),
-                                  style: ButtonStyle(
-                                    shape: MaterialStateProperty.all(
-                                      RoundedRectangleBorder(
-                                        borderRadius:
-                                            BorderRadius.circular(200),
-                                      ),
-                                    ),
-                                  ),
-                                  onPressed: () {
-                                    if (state.isBioEditing == true) {
-                                      /// TODO: Implement save profile image
-                                      BlocProvider.of<ProfileBloc>(context).add(
-                                        SaveBio(
-                                          bio: bioController.text,
-                                        ),
-                                      );
-                                    } else {
-                                      context
-                                          .read<ProfileBloc>()
-                                          .add(EditBio());
-                                    }
-                                  },
-                                  child: Text(
-                                    state.isBioEditing == true
-                                        ? 'Save'
-                                        : 'Edit',
-                                    style: const TextStyle(
-                                      fontSize: 11,
-                                      color: kAccentColor,
-                                      fontWeight: FontWeight.w700,
-                                    ),
-                                  ),
-                                ),
-                              ],
+                            const Text(
+                              'About me',
+                              style: TextStyle(
+                                fontWeight: FontWeight.w700,
+                                fontSize: 11,
+                                color: Color(0xFF666666),
+                              ),
+                              textAlign: TextAlign.left,
                             ),
                             const SizedBox(height: 10),
-                            if (state.isBioEditing == true) ...[
-                              //idhr bio editing start
+                            if (state.isEditing == true) ...[
                               Row(
                                 children: [
                                   Expanded(
@@ -257,9 +188,8 @@ class _UserProfilePageState extends State<UserProfilePage> {
                               ),
                               const SizedBox(height: 4),
                               Row(
-                                mainAxisAlignment:
-                                    MainAxisAlignment.spaceBetween,
                                 children: [
+                                  const SizedBox(width: 16),
                                   Text(
                                     'Maximum 150 characters',
                                     style: Theme.of(context)
@@ -308,7 +238,92 @@ class _UserProfilePageState extends State<UserProfilePage> {
                                 ],
                               ),
                             ),
+                            const SizedBox(height: 40),
+                            TextButton(
+                              key: const Key('save_edit_button'),
+                              style: ButtonStyle(
+                                overlayColor: MaterialStateColor.resolveWith(
+                                  (states) => state.isEditing == true
+                                      ? Colors.white.withOpacity(0.1)
+                                      : kAccentColor.withOpacity(0.1),
+                                ),
+                                backgroundColor: state.isEditing == true
+                                    ? MaterialStateProperty.all(
+                                        kAccentColor,
+                                      )
+                                    : null,
+                                minimumSize: MaterialStateProperty.all(
+                                  const Size(double.infinity * 0.75, 52),
+                                ),
+                                shape: MaterialStateProperty.all(
+                                  RoundedRectangleBorder(
+                                    borderRadius: BorderRadius.circular(200),
+                                    side: const BorderSide(
+                                      color: kAccentColor,
+                                    ),
+                                  ),
+                                ),
+                              ),
+                              onPressed: () {
+                                if (state.isEditing == true) {
+                                  BlocProvider.of<ProfileBloc>(context).add(
+                                    SaveProfile(
+                                      bio: bioController.text,
+                                      image: _image,
+                                    ),
+                                  );
+                                } else {
+                                  context
+                                      .read<ProfileBloc>()
+                                      .add(EditProfile());
+                                }
+                              },
+                              child: Text(
+                                state.isEditing == true
+                                    ? 'Save changes'
+                                    : 'Edit profile',
+                                style: TextStyle(
+                                  color: state.isEditing == true
+                                      ? Colors.white
+                                      : kAccentColor,
+                                  fontWeight: FontWeight.w700,
+                                ),
+                              ),
+                            ),
+                            if (state.isEditing == true) ...[
+                              const SizedBox(height: 10),
+                              TextButton(
+                                key: const Key('cancel_edit_button'),
+                                style: ButtonStyle(
+                                  minimumSize: MaterialStateProperty.all(
+                                    const Size(double.infinity * 0.75, 52),
+                                  ),
+                                  shape: MaterialStateProperty.all(
+                                    RoundedRectangleBorder(
+                                      borderRadius: BorderRadius.circular(200),
+                                    ),
+                                  ),
+                                ),
+                                onPressed: () {
+                                  BlocProvider.of<ProfileBloc>(context)
+                                      .add(CancelEditProfile());
+
+                                  _image = null;
+                                  bioController.value = TextEditingValue(
+                                    text: state.userProfile?.profile.bio ?? '',
+                                  );
+                                },
+                                child: const Text(
+                                  'Cancel',
+                                  style: TextStyle(
+                                    color: kAccentColor,
+                                    fontWeight: FontWeight.w700,
+                                  ),
+                                ),
+                              ),
+                            ],
                           ] else ...[
+                            // TODO only for MVP (remove later)
                             const SizedBox(height: 40),
                             PillButton(
                               text: 'Sign in',
diff --git a/lib/presentation/profile/widget/commitments_tab.dart b/lib/presentation/profile/widget/commitments_tab.dart
index f8ed87e1..bebbaa24 100644
--- a/lib/presentation/profile/widget/commitments_tab.dart
+++ b/lib/presentation/profile/widget/commitments_tab.dart
@@ -44,7 +44,7 @@ class CommitmentsTab extends StatelessWidget {
               ),
               const SizedBox(height: 20),
               ...crowdActions!
-                  .where((crowdAction) => !crowdAction.isClosed)
+                  .where((crowdAction) => crowdAction.isRunning)
                   .map(
                     (crowdAction) => GestureDetector(
                       onTap: () => context.router.push(
@@ -59,7 +59,7 @@ class CommitmentsTab extends StatelessWidget {
                               fontWeight: FontWeight.w500,
                             ),
                           ),
-                          ...crowdAction.commitments.map(
+                          ...crowdAction.commitmentOptions.map(
                             (co) => CommitmentCard(
                               commitment: co,
                               viewOnly: true,
@@ -70,12 +70,12 @@ class CommitmentsTab extends StatelessWidget {
                       ),
                     ),
                   ),
-            ],
-            if (user == null || (crowdActions?.isEmpty ?? false)) ...[
-              SignUpCTA(
-                user: user,
-                title: 'View your amazing commitments here',
-              ),
+              if (user == null || (crowdActions?.isEmpty ?? false)) ...[
+                SignUpCTA(
+                  user: user,
+                  title: 'View your amazing commitments here',
+                ),
+              ],
             ],
           ],
         ),
diff --git a/lib/presentation/routes/app_routes.dart b/lib/presentation/routes/app_routes.dart
index 4bfe0835..e07554de 100644
--- a/lib/presentation/routes/app_routes.dart
+++ b/lib/presentation/routes/app_routes.dart
@@ -2,7 +2,6 @@ import 'package:auto_route/auto_route.dart';
 import 'package:auto_route/empty_router_widgets.dart';
 
 import '../../../presentation/profile/profile_screen.dart';
-import '../auth/unauthenticated_screen.dart';
 import '../auth/auth_screen.dart';
 import '../auth/widgets/verified.dart';
 import '../contact_form/contact_form_screen.dart';
@@ -15,9 +14,8 @@ import '../demo/components_demo/components_demo_screen.dart';
 import '../demo/demo_screen.dart';
 import '../home/home_screen.dart';
 import '../licenses/licenses_page.dart';
+import '../menu/menu_screen.dart';
 import '../onboarding/onboarding_screen.dart';
-import '../settings/settings_layout.dart';
-import '../settings/settings_screen.dart';
 import '../shared_widgets/web_view_page.dart';
 
 @MaterialAutoRouter(
@@ -65,17 +63,20 @@ import '../shared_widgets/web_view_page.dart';
             AutoRoute(path: 'comments', page: CrowdActionCommentsPage),
           ],
         ),
+        AutoRoute(
+          path: 'menu',
+          name: 'MenuScreenRouter',
+          page: EmptyRouterPage,
+          children: [AutoRoute(path: '', page: MenuPage)],
+        ),
       ],
     ),
     AutoRoute(path: 'onboarding', page: OnboardingPage),
     AutoRoute(path: 'auth', page: AuthPage),
     AutoRoute(path: 'verified', page: VerifiedPage),
-    AutoRoute(path: 'settings-page', page: SettingsPage),
     AutoRoute(path: 'licenses-page', page: LicensesPage),
-    AutoRoute(path: 'settings-layout', page: SettingsLayout),
     AutoRoute(path: 'contact-form', page: ContactFormPage),
     AutoRoute(path: 'webview', page: WebViewPage),
-    AutoRoute(path: 'unauthenticated', page: UnauthenticatedPage)
   ],
 )
 class $AppRouter {}
diff --git a/lib/presentation/settings/settings_layout.dart b/lib/presentation/settings/settings_layout.dart
deleted file mode 100644
index 56dbdbc1..00000000
--- a/lib/presentation/settings/settings_layout.dart
+++ /dev/null
@@ -1,46 +0,0 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:flutter/material.dart';
-
-import '../themes/constants.dart';
-
-class SettingsLayout extends StatelessWidget {
-  const SettingsLayout({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        elevation: 0,
-        backgroundColor: kSecondaryColor,
-        leading: RawMaterialButton(
-          elevation: 5,
-          onPressed: () => context.router.pop(),
-          child: const CircleAvatar(
-            backgroundColor: kSecondaryColor,
-            child: Icon(
-              Icons.arrow_back_ios_new_outlined,
-              color: kPrimaryColor300,
-            ),
-          ),
-        ),
-        actions: [
-          ElevatedButton(
-            style: ButtonStyle(
-              padding: MaterialStateProperty.all(const EdgeInsets.all(8)),
-              backgroundColor: MaterialStateProperty.all(kSecondaryColor),
-              elevation: MaterialStateProperty.all(2),
-            ),
-            onPressed: () => context.router.pop(),
-            child: const CircleAvatar(
-              backgroundColor: kSecondaryColor,
-              child: Icon(
-                Icons.close_outlined,
-                color: kPrimaryColor300,
-              ),
-            ),
-          )
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/presentation/settings/settings_screen.dart b/lib/presentation/settings/settings_screen.dart
deleted file mode 100644
index 1689e386..00000000
--- a/lib/presentation/settings/settings_screen.dart
+++ /dev/null
@@ -1,131 +0,0 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-import '/application/settings/build_information/build_information_bloc.dart';
-import '../../../presentation/utils/launch_url.dart';
-import '../../application/auth/auth_bloc.dart';
-import '../../application/user/profile/profile_bloc.dart';
-import '../../infrastructure/core/injection.dart';
-import '../core/collaction_icons.dart';
-import '../routes/app_routes.gr.dart';
-import '../shared_widgets/custom_app_bars/custom_appbar.dart';
-import '../themes/constants.dart';
-import 'widgets/build_information_tile.dart';
-import 'widgets/settings_list_tile.dart';
-import 'widgets/share_collaction_list_tile.dart';
-
-class SettingsPage extends StatelessWidget {
-  const SettingsPage({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: const CustomAppBar(closable: true),
-      body: Column(
-        children: [
-          Expanded(
-            child: SingleChildScrollView(
-              child: Padding(
-                padding:
-                    const EdgeInsets.symmetric(vertical: 20, horizontal: 20),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Column(
-                      children: [
-                        const ShareCollactionListTile(),
-                        const SizedBox(height: 15),
-                        SettingsListTile(
-                          title: 'Contact us',
-                          icon: CollactionIcons.message,
-                          trailingIcon: CollactionIcons.arrow_right,
-                          onTap: () =>
-                              context.router.push(const ContactFormRoute()),
-                        ),
-                        const SizedBox(height: 15),
-                        SettingsListTile(
-                          title: 'Onboarding',
-                          icon: CollactionIcons.rocket,
-                          trailingIcon: CollactionIcons.arrow_right,
-                          onTap: () =>
-                              context.router.push(const OnboardingRoute()),
-                        ),
-                        const SizedBox(height: 15),
-                        SettingsListTile(
-                          title: 'Open source libraries',
-                          icon: CollactionIcons.opensource,
-                          trailingIcon: CollactionIcons.arrow_right,
-                          onTap: () =>
-                              context.router.push(const LicensesRoute()),
-                        ),
-                        const SizedBox(height: 15),
-                        SettingsListTile(
-                          title: 'Terms of use',
-                          icon: CollactionIcons.lock,
-                          trailingIcon: CollactionIcons.external_link,
-                          onTap: () => launchUrl(
-                            'https://www.collaction.org/terms',
-                            useWebView: true,
-                            context: context,
-                          ),
-                        ),
-                        const SizedBox(height: 15),
-                        SettingsListTile(
-                          title: 'Privacy policy',
-                          icon: CollactionIcons.file,
-                          trailingIcon: CollactionIcons.external_link,
-                          onTap: () => launchUrl(
-                            'https://www.collaction.org/privacy',
-                            useWebView: true,
-                            context: context,
-                          ),
-                        ),
-                        BlocBuilder<ProfileBloc, ProfileState>(
-                          bloc: BlocProvider.of<ProfileBloc>(context),
-                          builder: (context, ProfileState state) => state
-                                      .userProfile ==
-                                  null
-                              ? const SizedBox()
-                              : Column(
-                                  children: [
-                                    const SizedBox(height: 15),
-                                    SettingsListTile(
-                                      title: 'Log out',
-                                      icon: CollactionIcons.logout,
-                                      iconColor: kErrorColor,
-                                      onTap: () async {
-                                        BlocProvider.of<AuthBloc>(context)
-                                            .add(const AuthEvent.signedOut());
-                                        BlocProvider.of<ProfileBloc>(context)
-                                            .add(GetUserProfile());
-                                        await context.router.pop();
-                                      },
-                                    ),
-                                  ],
-                                ),
-                        ),
-                        BlocBuilder<BuildInformationBloc,
-                            BuildInformationState>(
-                          bloc: getIt<BuildInformationBloc>()
-                            ..add(const BuildInformationEvent.fetch()),
-                          builder: (context, state) {
-                            return state.when(
-                              loading: () => const SizedBox(),
-                              fetched: (buildInfo) =>
-                                  BuildInformationTile(information: buildInfo),
-                            );
-                          },
-                        ),
-                      ],
-                    ),
-                  ],
-                ),
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/presentation/settings/widgets/settings_list_tile.dart b/lib/presentation/settings/widgets/settings_list_tile.dart
deleted file mode 100644
index 4f9e1307..00000000
--- a/lib/presentation/settings/widgets/settings_list_tile.dart
+++ /dev/null
@@ -1,44 +0,0 @@
-import 'package:flutter/material.dart';
-import '../../themes/constants.dart';
-
-class SettingsListTile extends StatelessWidget {
-  final String title;
-  final IconData icon;
-  final Color iconColor;
-  final Function() onTap;
-  final IconData? trailingIcon;
-
-  const SettingsListTile({
-    super.key,
-    required this.title,
-    required this.icon,
-    required this.onTap,
-    this.iconColor = kPrimaryColor300,
-    this.trailingIcon,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return ListTile(
-      onTap: onTap,
-      contentPadding: const EdgeInsets.symmetric(
-        vertical: 15,
-        horizontal: 20,
-      ),
-      tileColor: kAlmostTransparent,
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(20),
-      ),
-      leading: CircleAvatar(
-        radius: 32.5,
-        backgroundColor: kSecondaryColor,
-        child: Icon(
-          icon,
-          color: iconColor,
-        ),
-      ),
-      title: Text(title),
-      trailing: trailingIcon != null ? Icon(trailingIcon) : null,
-    );
-  }
-}
diff --git a/lib/presentation/settings/widgets/share_collaction_list_tile.dart b/lib/presentation/settings/widgets/share_collaction_list_tile.dart
deleted file mode 100644
index 3d3ef6ad..00000000
--- a/lib/presentation/settings/widgets/share_collaction_list_tile.dart
+++ /dev/null
@@ -1,85 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:share_plus/share_plus.dart';
-
-import '../../core/collaction_icons.dart';
-import '../../themes/constants.dart';
-import '../../utils/strings.dart';
-
-class ShareCollactionListTile extends StatefulWidget {
-  const ShareCollactionListTile({
-    super.key,
-    String? shareText,
-    String? shareEmailSubject,
-  })  : _shareText = shareText,
-        _shareEmailSubject = shareEmailSubject;
-
-  final String? _shareText;
-  final String? _shareEmailSubject;
-
-  @override
-  State<ShareCollactionListTile> createState() =>
-      ShareCollactionListTileState();
-}
-
-class ShareCollactionListTileState extends State<ShareCollactionListTile> {
-  late bool _isClicked;
-
-  void onFocusChange(bool focused) {
-    setState(() {
-      _isClicked = focused == false;
-    });
-  }
-
-  Future<void> _clickCallback() async {
-    setState(() {
-      _isClicked = true;
-    });
-
-    Share.share(
-      widget._shareText ?? defaultShareText,
-      subject: widget._shareEmailSubject ?? defaultShareEmailSubject,
-    );
-    await Future.delayed(const Duration(seconds: 1));
-
-    setState(() {
-      _isClicked = false;
-    });
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    _isClicked = false;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Focus(
-      onFocusChange: onFocusChange,
-      child: ListTile(
-        enabled: !_isClicked,
-        onTap: _clickCallback,
-        contentPadding: const EdgeInsets.symmetric(
-          vertical: 15,
-          horizontal: 20,
-        ),
-        tileColor: kAlmostTransparent,
-        shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(20),
-        ),
-        leading: const CircleAvatar(
-          radius: 32.5,
-          backgroundColor: kSecondaryColor,
-          child: Icon(
-            CollactionIcons.share,
-            color: kPrimaryColor300,
-          ),
-        ),
-        title: const Text(
-          'Share CollAction',
-        ),
-        trailing: const Icon(CollactionIcons.arrow_right),
-      ),
-    );
-  }
-}
diff --git a/lib/presentation/shared_widgets/commitment_card.dart b/lib/presentation/shared_widgets/commitment_card.dart
index 7a1d4941..30eae687 100644
--- a/lib/presentation/shared_widgets/commitment_card.dart
+++ b/lib/presentation/shared_widgets/commitment_card.dart
@@ -80,6 +80,9 @@ class _CommitmentCardState extends State<_CommitmentCard> {
 
   @override
   Widget build(BuildContext context) {
+    print(
+        'Commitment: ${widget.commitment.title} - Icon: ${widget.commitment.icon}');
+
     final textTheme = Theme.of(context).textTheme;
     return GestureDetector(
       onTap: () {
diff --git a/lib/presentation/shared_widgets/commitments/commitment_card.dart b/lib/presentation/shared_widgets/commitments/commitment_card.dart
index f3bf6376..d1923f87 100644
--- a/lib/presentation/shared_widgets/commitments/commitment_card.dart
+++ b/lib/presentation/shared_widgets/commitments/commitment_card.dart
@@ -10,9 +10,9 @@ import '../../themes/constants.dart';
 /// [onSelected] Callback function for when the card is selected,
 /// returns the id of the selected commitment
 class CommitmentCard extends StatelessWidget {
-  final Commitment commitment;
-  final Function(Commitment)? onSelected;
-  final Function(Commitment)? onDeSelected;
+  final CommitmentOption commitment;
+  final Function(CommitmentOption)? onSelected;
+  final Function(CommitmentOption)? onDeSelected;
   final bool active;
   final bool deactivated;
   final bool viewOnly;
diff --git a/lib/presentation/shared_widgets/commitments/commitment_card_list.dart b/lib/presentation/shared_widgets/commitments/commitment_card_list.dart
index 606901ad..f74db7fb 100644
--- a/lib/presentation/shared_widgets/commitments/commitment_card_list.dart
+++ b/lib/presentation/shared_widgets/commitments/commitment_card_list.dart
@@ -8,14 +8,14 @@ import 'commitment_card.dart';
 
 class CommitmentCardList extends StatefulWidget {
   final bool isEnded;
-  final List<Commitment>? commitments;
-  final List<Commitment> selectedCommitments;
+  final List<CommitmentOption>? commitmentOptions;
+  final List<CommitmentOption> selectedCommitments;
 
   /// Widget for easily creating a list of CommitmentCard(s)
   const CommitmentCardList({
     super.key,
     this.isEnded = false,
-    required this.commitments,
+    required this.commitmentOptions,
     required this.selectedCommitments,
   });
 
@@ -28,7 +28,7 @@ class _CommitmentCardListState extends State<CommitmentCardList> {
   Widget build(BuildContext context) {
     return BlocBuilder<ParticipationBloc, ParticipationState>(
       builder: (context, state) {
-        if (widget.commitments == null) {
+        if (widget.commitmentOptions == null) {
           return ListView(
             shrinkWrap: true,
             padding: const EdgeInsets.symmetric(horizontal: 20),
@@ -51,7 +51,7 @@ class _CommitmentCardListState extends State<CommitmentCardList> {
           padding: const EdgeInsets.symmetric(horizontal: 20),
           physics: const BouncingScrollPhysics(),
           itemBuilder: (ctx, index) {
-            final option = widget.commitments![index];
+            final option = widget.commitmentOptions![index];
             return CommitmentCard(
               key: Key(option.id),
               commitment: option,
@@ -62,14 +62,14 @@ class _CommitmentCardListState extends State<CommitmentCardList> {
               viewOnly: widget.isEnded,
             );
           },
-          itemCount: widget.commitments!.length,
+          itemCount: widget.commitmentOptions!.length,
           shrinkWrap: true,
         );
       },
     );
   }
 
-  void selectCommitment(Commitment commitment) {
+  void selectCommitment(CommitmentOption commitment) {
     setState(() {
       widget.selectedCommitments.add(commitment);
       for (final id in commitment.blocks) {
@@ -78,13 +78,13 @@ class _CommitmentCardListState extends State<CommitmentCardList> {
     });
   }
 
-  void deselectCommitment(Commitment commitment) {
+  void deselectCommitment(CommitmentOption commitment) {
     setState(() {
       widget.selectedCommitments.removeWhere((c) => c.id == commitment.id);
     });
   }
 
-  bool isBlocked(Commitment commitment) {
+  bool isBlocked(CommitmentOption commitment) {
     return widget.selectedCommitments
         .any((c) => c.blocks.contains(commitment.id));
   }
diff --git a/lib/presentation/shared_widgets/country_icon.dart b/lib/presentation/shared_widgets/country_icon.dart
deleted file mode 100644
index f10106aa..00000000
--- a/lib/presentation/shared_widgets/country_icon.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-import 'package:flutter/material.dart';
-
-class CountryIcon extends StatelessWidget {
-  final String countryCode;
-  final double? radius;
-
-  const CountryIcon({super.key, required this.countryCode, this.radius});
-
-  @override
-  Widget build(BuildContext context) {
-    Image countryImg = Image.asset(
-        'icons/flags/png/${countryCode.toLowerCase()}.png',
-        package: 'country_icons');
-
-    return CircleAvatar(
-        radius: radius ?? 20, backgroundImage: countryImg.image);
-  }
-}
diff --git a/lib/presentation/shared_widgets/crowdaction_card.dart b/lib/presentation/shared_widgets/crowdaction_card.dart
index 39e28ed7..f3910a40 100644
--- a/lib/presentation/shared_widgets/crowdaction_card.dart
+++ b/lib/presentation/shared_widgets/crowdaction_card.dart
@@ -3,6 +3,7 @@ import 'package:cached_network_image/cached_network_image.dart';
 // ignore: depend_on_referenced_packages
 import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
 
 import '../../domain/crowdaction/crowdaction.dart';
 import '../core/collaction_icons.dart';
@@ -10,7 +11,6 @@ import '../crowdaction/crowdaction_details/widgets/participants.dart';
 import '../home/widgets/password_modal.dart';
 import '../routes/app_routes.gr.dart';
 import '../themes/constants.dart';
-import 'country_icon.dart';
 import 'custom_fab.dart';
 
 class CrowdActionCard extends StatefulWidget {
@@ -44,7 +44,7 @@ class _CrowdActionCardState extends State<CrowdActionCard>
           onTap: widget.onTap ??
               () {
                 if (widget.crowdAction.hasPassword) {
-                  PasswordModal.show(context, widget.crowdAction);
+                  showPasswordModal(context, widget.crowdAction);
                 } else {
                   context.router.push(
                     CrowdActionDetailsRoute(crowdAction: widget.crowdAction),
@@ -59,31 +59,30 @@ class _CrowdActionCardState extends State<CrowdActionCard>
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
                 Container(
-                    height: 215,
-                    decoration: BoxDecoration(
-                      color: Colors.grey[300],
-                      borderRadius: const BorderRadius.only(
-                        topLeft: Radius.circular(20.0),
-                        topRight: Radius.circular(20.0),
-                      ),
-                      image: DecorationImage(
-                        fit: BoxFit.cover,
-                        image: CachedNetworkImageProvider(
-                          widget.crowdAction.cardUrl,
-                          imageRenderMethodForWeb:
-                              ImageRenderMethodForWeb.HttpGet,
-                          errorListener: () {},
-                        ),
+                  height: 215,
+                  decoration: BoxDecoration(
+                    color: Colors.grey[300],
+                    borderRadius: const BorderRadius.only(
+                      topLeft: Radius.circular(20.0),
+                      topRight: Radius.circular(20.0),
+                    ),
+                    image: DecorationImage(
+                      fit: BoxFit.cover,
+                      image: CachedNetworkImageProvider(
+                        '${dotenv.get('BASE_STATIC_ENDPOINT_URL')}/${widget.crowdAction.images.card}',
+                        imageRenderMethodForWeb:
+                            ImageRenderMethodForWeb.HttpGet,
+                        errorListener: () {},
                       ),
                     ),
-                    child: Stack(
-                      children: [
-                        Positioned(
-                          bottom: 10,
-                          right: 10,
-                          child: Wrap(spacing: 10, children: [
-                            if (widget.crowdAction.hasPassword)
-                              CustomFAB(
+                  ),
+                  child: widget.crowdAction.hasPassword
+                      ? Stack(
+                          children: const [
+                            Positioned(
+                              bottom: 10,
+                              right: 10,
+                              child: CustomFAB(
                                 heroTag: 'locked',
                                 isMini: true,
                                 color: kSecondaryColor,
@@ -91,19 +90,12 @@ class _CrowdActionCardState extends State<CrowdActionCard>
                                   CollactionIcons.lock,
                                   color: kPrimaryColor300,
                                 ),
-                                elevation: 0,
-                              ),
-                            Padding(
-                              padding: const EdgeInsets.only(top: 3.0),
-                              child: CountryIcon(
-                                countryCode: widget.crowdAction.location.code,
-                                radius: 20,
                               ),
                             )
-                          ]),
+                          ],
                         )
-                      ],
-                    )),
+                      : null,
+                ),
                 const SizedBox(height: 5.0),
                 Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
diff --git a/lib/presentation/shared_widgets/custom_fab.dart b/lib/presentation/shared_widgets/custom_fab.dart
index 0b798c62..f1050f23 100644
--- a/lib/presentation/shared_widgets/custom_fab.dart
+++ b/lib/presentation/shared_widgets/custom_fab.dart
@@ -8,16 +8,15 @@ class CustomFAB extends StatelessWidget {
   final String? heroTag;
   final GestureTapCallback? onPressed;
   final Color? color;
-  final double? elevation;
 
-  const CustomFAB(
-      {super.key,
-      required this.child,
-      this.isMini = false,
-      this.heroTag = "fabBtn",
-      this.onPressed,
-      this.color,
-      this.elevation});
+  const CustomFAB({
+    super.key,
+    required this.child,
+    this.isMini = false,
+    this.heroTag = "fabBtn",
+    this.onPressed,
+    this.color,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -28,7 +27,6 @@ class CustomFAB extends StatelessWidget {
           color ?? (onPressed != null ? kAccentColor : kDisabledButtonColor),
       mini: isMini,
       child: child,
-      elevation: elevation ?? 6,
     );
   }
 }
diff --git a/lib/presentation/shared_widgets/expandable_markdown_text.dart b/lib/presentation/shared_widgets/expandable_markdown_text.dart
deleted file mode 100644
index 4fb18865..00000000
--- a/lib/presentation/shared_widgets/expandable_markdown_text.dart
+++ /dev/null
@@ -1,140 +0,0 @@
-import 'dart:convert';
-
-import 'package:flutter/material.dart';
-import 'package:flutter_markdown/flutter_markdown.dart';
-
-import '../themes/constants.dart';
-import '../themes/markdown_stylesheet.dart';
-import '../utils/launch_url.dart';
-
-class ExpandableMarkdown extends StatefulWidget {
-  final String data;
-  final ThemeData themeData;
-
-  const ExpandableMarkdown({
-    super.key,
-    required this.data,
-    required this.themeData,
-  });
-
-  @override
-  State<ExpandableMarkdown> createState() => _ExpandableMarkdownState();
-}
-
-class _ExpandableMarkdownState extends State<ExpandableMarkdown>
-    with SingleTickerProviderStateMixin {
-  bool readMore = true;
-  late String data;
-  late List<String> lines;
-
-  late AnimationController controller;
-  late Animation<int> sizeAnimation;
-
-  void onTapExpand() {
-    if (readMore) {
-      controller.forward();
-      readMore = false;
-    } else {
-      controller.reverse();
-      readMore = true;
-    }
-  }
-
-  @override
-  void initState() {
-    super.initState();
-    lines = LineSplitter().convert(widget.data);
-
-    controller = AnimationController(
-      vsync: this,
-      duration: const Duration(milliseconds: 350),
-    );
-
-    sizeAnimation = IntTween(
-      begin: lines.length > 4 ? 4 : lines.length,
-      end: lines.length,
-    ).animate(CurvedAnimation(
-      parent: controller,
-      curve: Curves.easeInOut,
-    ));
-
-    data = lines.take(sizeAnimation.value + 1).join('\n');
-
-    controller.addListener(
-      () => setState(() {
-        data = lines.take(sizeAnimation.value + 1).join('\n');
-      }),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        _ExpandableMarkdownBody(
-          data: data,
-          themeData: widget.themeData,
-          onTapLink: (_, href, __) => onTapLink(context, href),
-        ),
-        if (lines.length > 4) ...[
-          GestureDetector(
-            onTap: onTapExpand,
-            child: Padding(
-              padding: const EdgeInsets.only(top: 5),
-              child: RichText(
-                text: TextSpan(
-                  style: Theme.of(context).textTheme.bodyMedium?.copyWith(
-                        fontWeight: FontWeight.w300,
-                        color: kAccentColor,
-                        fontSize: 17,
-                        height: 1.5,
-                      ),
-                  children: [
-                    if (readMore) ...[
-                      TextSpan(text: '... '),
-                    ],
-                    TextSpan(
-                      text: readMore ? 'Read more' : 'Read less',
-                    ),
-                  ],
-                ),
-              ),
-            ),
-          ),
-        ],
-      ],
-    );
-  }
-
-  Future<void> onTapLink(BuildContext context, String? href) async {
-    if (href == null || href.isEmpty) {
-      return;
-    }
-
-    await launchUrl(
-      href,
-      useWebView: true,
-      context: context,
-    );
-  }
-}
-
-class _ExpandableMarkdownBody extends MarkdownWidget {
-  final ThemeData themeData;
-
-  _ExpandableMarkdownBody({
-    required super.data,
-    required this.themeData,
-    super.onTapLink,
-  }) : super(styleSheet: getStylesheetFromTheme(themeData));
-
-  @override
-  Widget build(BuildContext context, List<Widget>? children) {
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      crossAxisAlignment: CrossAxisAlignment.stretch,
-      children: children!,
-    );
-  }
-}
diff --git a/lib/presentation/shared_widgets/micro_crowdaction_card.dart b/lib/presentation/shared_widgets/micro_crowdaction_card.dart
index ab695dda..e00e67db 100644
--- a/lib/presentation/shared_widgets/micro_crowdaction_card.dart
+++ b/lib/presentation/shared_widgets/micro_crowdaction_card.dart
@@ -7,7 +7,6 @@ import '../home/widgets/password_modal.dart';
 import '../routes/app_routes.gr.dart';
 import '../themes/constants.dart';
 import 'accent_chip.dart';
-import 'country_icon.dart';
 import 'micro_lock.dart';
 
 class MicroCrowdActionCard extends StatelessWidget {
@@ -28,7 +27,7 @@ class MicroCrowdActionCard extends StatelessWidget {
         borderRadius: BorderRadius.circular(20),
         onTap: () {
           if (crowdAction.hasPassword) {
-            PasswordModal.show(context, crowdAction);
+            showPasswordModal(context, crowdAction);
           } else {
             context.router.push(
               CrowdActionDetailsRoute(
@@ -80,12 +79,6 @@ class MicroCrowdActionCard extends StatelessWidget {
                             ),
                             noMaterialTapTargetSize: true,
                           ),
-                          ...[
-                            const SizedBox(width: 10),
-                            CountryIcon(
-                                countryCode: crowdAction.location.code,
-                                radius: 15),
-                          ],
                           if (crowdAction.hasPassword) ...[
                             const SizedBox(width: 10),
                             const MicroLock(),
diff --git a/lib/presentation/shared_widgets/participant_avatars.dart b/lib/presentation/shared_widgets/participant_avatars.dart
index e3d614f3..a357f1cb 100644
--- a/lib/presentation/shared_widgets/participant_avatars.dart
+++ b/lib/presentation/shared_widgets/participant_avatars.dart
@@ -3,6 +3,7 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:cached_network_image_platform_interface/cached_network_image_platform_interface.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:shimmer/shimmer.dart';
 
 import '../../application/participation/top_participants/top_participants_bloc.dart';
@@ -77,7 +78,7 @@ class TopParticipantAvatars extends StatelessWidget {
           radius: 18,
           backgroundColor: Colors.grey[300],
           foregroundImage: CachedNetworkImageProvider(
-            participant.avatarUrl,
+            '${dotenv.get('BASE_STATIC_ENDPOINT_URL')}/${participant.avatar}',
             imageRenderMethodForWeb: ImageRenderMethodForWeb.HttpGet,
             errorListener: () {},
           ),
diff --git a/lib/presentation/shared_widgets/pill_button.dart b/lib/presentation/shared_widgets/pill_button.dart
index 16cf8b7e..55206920 100644
--- a/lib/presentation/shared_widgets/pill_button.dart
+++ b/lib/presentation/shared_widgets/pill_button.dart
@@ -10,29 +10,28 @@ class PillButton extends StatelessWidget {
   final EdgeInsets? margin;
   final double? width;
   final bool isLoading;
-  final bool lightBackground;
 
-  const PillButton(
-      {super.key,
-      required this.text,
-      this.leading,
-      this.onTap,
-      this.isEnabled = true,
-      this.margin,
-      this.width,
-      this.isLoading = false,
-      this.lightBackground = false});
+  const PillButton({
+    super.key,
+    required this.text,
+    this.leading,
+    this.onTap,
+    this.isEnabled = true,
+    this.margin,
+    this.width,
+    this.isLoading = false,
+  });
 
-  const PillButton.icon(
-      {super.key,
-      required this.text,
-      required this.leading,
-      this.onTap,
-      this.isEnabled = true,
-      this.margin,
-      this.width,
-      this.isLoading = false,
-      this.lightBackground = false});
+  const PillButton.icon({
+    super.key,
+    required this.text,
+    required this.leading,
+    this.onTap,
+    this.isEnabled = true,
+    this.margin,
+    this.width,
+    this.isLoading = false,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -49,26 +48,18 @@ class PillButton extends StatelessWidget {
             ? ElevatedButton(
                 onPressed: () {},
                 style: ElevatedButton.styleFrom(
-                  backgroundColor:
-                      lightBackground ? Colors.white : kAccentColor,
+                  backgroundColor: kAccentColor,
                   shape: RoundedRectangleBorder(
                     borderRadius: BorderRadius.circular(52),
                   ),
                 ),
-                child: CircularProgressIndicator(
-                  color: lightBackground ? kAccentColor : Colors.white,
+                child: const CircularProgressIndicator(
+                  color: Colors.white,
                 ),
               )
             : ElevatedButton.icon(
                 icon: leading ?? const SizedBox(),
-                label: Text(
-                  text,
-                  style: TextStyle(
-                    fontWeight: FontWeight.w700,
-                    fontSize: 15,
-                    color: lightBackground ? kAccentColor : Colors.white,
-                  ),
-                ),
+                label: Text(text),
                 onPressed: isEnabled ? onTap : null,
                 style: ButtonStyle(
                   backgroundColor: MaterialStateProperty.resolveWith<Color?>(
@@ -76,7 +67,7 @@ class PillButton extends StatelessWidget {
                       if (states.contains(MaterialState.disabled)) {
                         return kAlmostTransparent;
                       }
-                      return lightBackground ? Colors.white : kAccentColor;
+                      return kAccentColor;
                     },
                   ),
                   elevation: MaterialStateProperty.all<double>(0),
diff --git a/lib/presentation/themes/constants.dart b/lib/presentation/themes/constants.dart
index af0ecc4d..656fae5c 100644
--- a/lib/presentation/themes/constants.dart
+++ b/lib/presentation/themes/constants.dart
@@ -24,6 +24,7 @@ const Color kPrimaryColor200 = Color(0xFF999999);
 const Color kPrimaryColor300 = Color(0xFF666666);
 const Color kPrimaryColor400 = Color(0xFF333333);
 const Color kPrimaryColor500 = Color(0xFF000000);
+const Color kPrimaryColor600 = Color(0xFF2EB494);
 
 const TextStyle kCaption1 = TextStyle(
   fontSize: 12,
@@ -41,3 +42,22 @@ const TextStyle kTitle1 = TextStyle(
   height: 34 / 28,
   fontWeight: FontWeight.w700,
 );
+
+const TextStyle nameTextStyle = TextStyle(
+  fontSize: 17,
+  fontWeight: FontWeight.w500,
+  color: kPrimaryColor400,
+);
+
+const TextStyle phoneNumberTextStyle = TextStyle(
+  fontSize: 17,
+  fontWeight: FontWeight.w300,
+  color: kPrimaryColor300,
+);
+
+const BoxDecoration avatarInfoDecorationBox = BoxDecoration(
+  color: kAlmostTransparent,
+  borderRadius: BorderRadius.all(
+    Radius.circular(20),
+  ),
+);
diff --git a/lib/presentation/themes/markdown_stylesheet.dart b/lib/presentation/themes/markdown_stylesheet.dart
deleted file mode 100644
index 429732d2..00000000
--- a/lib/presentation/themes/markdown_stylesheet.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_markdown/flutter_markdown.dart';
-
-import 'constants.dart';
-
-MarkdownStyleSheet getStylesheetFromTheme(ThemeData theme) =>
-    MarkdownStyleSheet(
-      p: theme.textTheme.bodyMedium?.copyWith(
-        fontSize: 17,
-        fontWeight: FontWeight.w300,
-        height: 1.5,
-      ),
-      a: theme.textTheme.bodyMedium?.copyWith(
-        fontSize: 17,
-        fontWeight: FontWeight.w300,
-        color: kAccentColor,
-        height: 1.5,
-      ),
-    );
diff --git a/pubspec.lock b/pubspec.lock
index d1299a70..dc655a1d 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,472 +5,413 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "4897882604d919befd350648c7f91926a9d5de99e67b455bf0917cc2362f4bb8"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "47.0.0"
   _flutterfire_internals:
     dependency: transitive
     description:
       name: _flutterfire_internals
-      sha256: "330d7fcbb72624f5b6d374af8b059b0ef4ba96ba5b8987f874964a1287eb617d"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.18"
+    version: "1.0.16"
   adaptive_number:
     dependency: transitive
     description:
       name: adaptive_number
-      sha256: "3a567544e9b5c9c803006f51140ad544aedc79604fd4f3f2c1380003f97c1d77"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "690e335554a8385bc9d787117d9eb52c0c03ee207a607e593de3c9d71b1cfe80"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.7.0"
   archive:
     dependency: transitive
     description:
       name: archive
-      sha256: d6347d54a2d8028e0437e3c099f66fdb8ae02c4720c1e7534c9f24c10351f85d
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.3.6"
   args:
     dependency: transitive
     description:
       name: args
-      sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.4.0"
   async:
     dependency: transitive
     description:
       name: async
-      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.10.0"
+    version: "2.9.0"
   auto_route:
     dependency: "direct main"
     description:
       name: auto_route
-      sha256: "12047baeca0e01df93165ef33275b32119d72699ab9a49dc64c20e78f586f96d"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "5.0.4"
   auto_route_generator:
     dependency: "direct dev"
     description:
       name: auto_route_generator
-      sha256: c66eaa20dbba3211cac656037f88ba836a633dda953d9f4f9f9f5809b57e4278
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "5.0.2"
   bloc:
     dependency: "direct main"
     description:
       name: bloc
-      sha256: "658a5ae59edcf1e58aac98b000a71c762ad8f46f1394c34a52050cafb3e11a80"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "8.1.1"
   bloc_test:
     dependency: "direct dev"
     description:
       name: bloc_test
-      sha256: ffbb60c17ee3d8e3784cb78071088e353199057233665541e8ac6cd438dca8ad
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "9.1.1"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.0"
   build:
     dependency: transitive
     description:
       name: build
-      sha256: "3fbda25365741f8251b39f3917fb3c8e286a96fd068a5a242e11c2012d495777"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.3.1"
   build_config:
     dependency: transitive
     description:
       name: build_config
-      sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.1"
   build_daemon:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "757153e5d9cd88253cb13f28c2fb55a537dc31fefd98137549895b5beb7c6169"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.1"
   build_resolvers:
     dependency: transitive
     description:
       name: build_resolvers
-      sha256: "687cf90a3951affac1bd5f9ecb5e3e90b60487f3d9cdc359bb310f8876bb02a6"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.10"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "93f05c041932674be039b0a2323d6cf57e5f2bbf884a3c0382f9e53fc45ebace"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.3.0"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: "14febe0f5bac5ae474117a36099b4de6f1dbc52df6c5e55534b3da9591bf4292"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "7.2.7"
   built_collection:
     dependency: transitive
     description:
       name: built_collection
-      sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "5.1.1"
   built_value:
     dependency: transitive
     description:
       name: built_value
-      sha256: "31b7c748fd4b9adf8d25d72a4c4a59ef119f12876cf414f94f8af5131d5fa2b0"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "8.4.4"
   cached_network_image:
     dependency: "direct main"
     description:
       name: cached_network_image
-      sha256: fd3d0dc1d451f9a252b32d95d3f0c3c487bc41a75eba2e6097cb0b9c71491b15
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.2.3"
   cached_network_image_platform_interface:
     dependency: transitive
     description:
       name: cached_network_image_platform_interface
-      sha256: bb2b8403b4ccdc60ef5f25c70dead1f3d32d24b9d6117cfc087f496b178594a7
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
   cached_network_image_web:
     dependency: transitive
     description:
       name: cached_network_image_web
-      sha256: b8eb814ebfcb4dea049680f8c1ffb2df399e4d03bf7a352c775e26fa06e02fa0
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.2"
   characters:
     dependency: transitive
     description:
       name: characters
-      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.1"
   checked_yaml:
     dependency: transitive
     description:
       name: checked_yaml
-      sha256: "3d1505d91afa809d177efd4eed5bb0eb65805097a1463abdd2add076effae311"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.2"
   cli_util:
     dependency: transitive
     description:
       name: cli_util
-      sha256: "66f86e916d285c1a93d3b79587d94bd71984a66aac4ff74e524cfa7877f1395c"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.3.5"
   clock:
     dependency: transitive
     description:
       name: clock
-      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.1"
   code_builder:
     dependency: transitive
     description:
       name: code_builder
-      sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.4.0"
   collection:
     dependency: transitive
     description:
       name: collection
-      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.17.0"
+    version: "1.16.0"
   convert:
     dependency: transitive
     description:
       name: convert
-      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.1"
   country_codes:
     dependency: "direct main"
     description:
       name: country_codes
-      sha256: d6d1a9c3c12577b24eb7f6160768b06a9d8fd3f73ad6b24dcc5b7e0ac4910056
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.2.0"
   country_icons:
     dependency: "direct main"
     description:
       name: country_icons
-      sha256: "836435012b42c7dcc6d585d1420ce2310d70396569ef70cf5d74c740919f7320"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.2"
   coverage:
     dependency: transitive
     description:
       name: coverage
-      sha256: "2fb815080e44a09b85e0f2ca8a820b15053982b2e714b59267719e8a9ff17097"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.6.3"
   cross_file:
     dependency: transitive
     description:
       name: cross_file
-      sha256: "0b0036e8cccbfbe0555fd83c1d31a6f30b77a96b598b35a5d36dd41f718695e9"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.3.3+4"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.2"
   dart_jsonwebtoken:
     dependency: transitive
     description:
       name: dart_jsonwebtoken
-      sha256: "2a42e97c0b8b4e9a42b24a71453635f445c7b66c7d7c81e3a429f37ead9fe778"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.7.1"
   dart_pubspec_licenses:
     dependency: transitive
     description:
       name: dart_pubspec_licenses
-      sha256: "38680e2d2fc41df3a0d435d0955b91acc382aeefcb89ef4738f8167c8288a29d"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.2"
   dart_style:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "7a03456c3490394c8e7665890333e91ae8a49be43542b616e414449ac358acd4"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.2.4"
   dartz:
     dependency: "direct main"
     description:
       name: dartz
-      sha256: e6acf34ad2e31b1eb00948692468c30ab48ac8250e0f0df661e29f12dd252168
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.10.1"
   device_frame:
     dependency: transitive
     description:
       name: device_frame
-      sha256: afe76182aec178d171953d9b4a50a43c57c7cf3c77d8b09a48bf30c8fa04dd9d
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
   diff_match_patch:
     dependency: transitive
     description:
       name: diff_match_patch
-      sha256: "2efc9e6e8f449d0abe15be240e2c2a3bcd977c8d126cfd70598aee60af35c0a4"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.4.1"
   dots_indicator:
     dependency: "direct main"
     description:
       name: dots_indicator
-      sha256: e59dfc90030ee5a4fd4c53144a8ce97cc7a823c2067b8fb9814960cd1ae63f89
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
   ed25519_edwards:
     dependency: transitive
     description:
       name: ed25519_edwards
-      sha256: "6ce0112d131327ec6d42beede1e5dfd526069b18ad45dcf654f15074ad9276cd"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.3.1"
   email_validator:
     dependency: "direct main"
     description:
       name: email_validator
-      sha256: e9a90f27ab2b915a27d7f9c2a7ddda5dd752d6942616ee83529b686fc086221b
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.17"
   equatable:
     dependency: "direct main"
     description:
       name: equatable
-      sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.5"
   expandable_page_view:
     dependency: "direct main"
     description:
       name: expandable_page_view
-      sha256: "210dc6961cfc29f7ed42867824eb699c9a4b9b198a7c04b8bdc1c05844969dc6"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.17"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.1"
   ffi:
     dependency: transitive
     description:
       name: ffi
-      sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.1"
   file:
     dependency: transitive
     description:
       name: file
-      sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "6.1.4"
   firebase_auth:
     dependency: "direct main"
     description:
       name: firebase_auth
-      sha256: e946a21254784116d32e497e09b851b4d03a3c65880e80d6939a720dfce88aed
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.2.2"
   firebase_auth_mocks:
     dependency: "direct dev"
     description:
       name: firebase_auth_mocks
-      sha256: c4398019066d1bd0e91a0ba6067272a3a60c7ff8b211aa9c2139b273abe98914
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.10.3"
   firebase_auth_platform_interface:
     dependency: transitive
     description:
       name: firebase_auth_platform_interface
-      sha256: "1217d8aa313b49d58b489aa8879544563abc8793d9612ff20d8df193f202aedc"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.12.0"
+    version: "6.11.11"
   firebase_auth_web:
     dependency: transitive
     description:
       name: firebase_auth_web
-      sha256: bf7f1a87995a58b0f07dc617806dabd7ff25c64be7fa47b41ab1bb9a485b0062
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.2.10"
+    version: "5.2.2"
   firebase_core:
     dependency: "direct main"
     description:
       name: firebase_core
-      sha256: "75f747cafd7cbd6c00b908e3a7aa59fc31593d46ba8165d9ee8a79e69464a394"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.8.0"
+    version: "2.7.0"
   firebase_core_platform_interface:
     dependency: transitive
     description:
       name: firebase_core_platform_interface
-      sha256: "5615b30c36f55b2777d0533771deda7e5730e769e5d3cb7fda79e9bed86cfa55"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.5.3"
   firebase_core_web:
     dependency: transitive
     description:
       name: firebase_core_web
-      sha256: "0c1cf1f1022d2245ac117443bb95207952ca770281524d2908e323bc063fb8ff"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.2"
+    version: "2.2.1"
   firebase_crashlytics:
     dependency: "direct main"
     description:
       name: firebase_crashlytics
-      sha256: "5410b6ab2009fc6c181ca82e16525fdcb324c5851933bfbb49246543b1005ebc"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.17"
+    version: "3.0.15"
   firebase_crashlytics_platform_interface:
     dependency: transitive
     description:
       name: firebase_crashlytics_platform_interface
-      sha256: bf3d3791c51a8448413b5ebd8388fa7db239a3e165db6bbd8ab58ef0e8f61906
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.3.17"
+    version: "3.3.15"
   fixnum:
     dependency: transitive
     description:
       name: fixnum
-      sha256: "04be3e934c52e082558cc9ee21f42f5c1cd7a1262f4c63cd0357c08d5bba81ec"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.1"
   flutter:
@@ -482,72 +423,56 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_bloc
-      sha256: "434951eea948dbe87f737b674281465f610b8259c16c097b8163ce138749a775"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "8.1.2"
   flutter_blurhash:
     dependency: transitive
     description:
       name: flutter_blurhash
-      sha256: "05001537bd3fac7644fa6558b09ec8c0a3f2eba78c0765f88912882b1331a5c6"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.7.0"
   flutter_cache_manager:
     dependency: transitive
     description:
       name: flutter_cache_manager
-      sha256: "32cd900555219333326a2d0653aaaf8671264c29befa65bbd9856d204a4c9fb3"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.3.0"
   flutter_dotenv:
     dependency: "direct main"
     description:
       name: flutter_dotenv
-      sha256: d9283d92059a22e9834bc0a31336658ffba77089fb6f3cc36751f1fc7c6661a3
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "5.0.2"
   flutter_launcher_icons:
     dependency: "direct dev"
     description:
       name: flutter_launcher_icons
-      sha256: ce0e501cfc258907842238e4ca605e74b7fd1cdf04b3b43e86c43f3e40a1592c
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.11.0"
   flutter_lints:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.1"
-  flutter_markdown:
-    dependency: "direct main"
-    description:
-      name: flutter_markdown
-      sha256: "7b25c10de1fea883f3c4f9b8389506b54053cd00807beab69fd65c8653a2711f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.6.14"
   flutter_oss_licenses:
     dependency: "direct dev"
     description:
       name: flutter_oss_licenses
-      sha256: eb15e1146b101dca063a177f6d339dfb85b639a9e2d2b71c18188d5fb2144869
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.1"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: c224ac897bed083dabf11f238dd11a239809b446740be0c2044608c50029ffdf
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.9"
   flutter_test:
@@ -564,640 +489,553 @@ packages:
     dependency: "direct dev"
     description:
       name: freezed
-      sha256: "4179d41127bc7a67dc3f58ceec1d22f1cdf10470653cb86eda2a63f81b4920c7"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.2.0"
   freezed_annotation:
     dependency: "direct main"
     description:
       name: freezed_annotation
-      sha256: aeac15850ef1b38ee368d4c53ba9a847e900bb2c53a4db3f6881cbb3cb684338
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.2.0"
   frontend_server_client:
     dependency: transitive
     description:
       name: frontend_server_client
-      sha256: "4f4a162323c86ffc1245765cfe138872b8f069deb42f7dbb36115fa27f31469b"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.3"
   get_it:
     dependency: "direct main"
     description:
       name: get_it
-      sha256: "290fde3a86072e4b37dbb03c07bec6126f0ecc28dad403c12ffe2e5a2d751ab7"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "7.2.0"
   glob:
     dependency: transitive
     description:
       name: glob
-      sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.1"
   go_router:
     dependency: transitive
     description:
       name: go_router
-      sha256: "25ae21384b758eb80daff113fe8bfb785c2dd17b69fe4885008fe764b26fd1ca"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.1"
   graphs:
     dependency: transitive
     description:
       name: graphs
-      sha256: f9e130f3259f52d26f0cfc0e964513796dafed572fa52e45d2f8d6ca14db39b2
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.2.0"
   http:
     dependency: "direct main"
     description:
       name: http
-      sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.13.5"
   http_multi_server:
     dependency: transitive
     description:
       name: http_multi_server
-      sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.2.1"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.0.2"
   image:
     dependency: "direct main"
     description:
       name: image
-      sha256: "8e9d133755c3e84c73288363e6343157c383a0c6c56fc51afcc5d4d7180306d6"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.3.0"
   image_cropper:
     dependency: "direct main"
     description:
       name: image_cropper
-      sha256: "85324928ee8a8be35a529446435ca53067865b9353c8681983472eeec66d780f"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.1"
   image_cropper_for_web:
     dependency: transitive
     description:
       name: image_cropper_for_web
-      sha256: "09e93a8ec0435adcaa23622ac090442872f18145d70b9ff605ffedcf97d56255"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.3"
   image_cropper_platform_interface:
     dependency: transitive
     description:
       name: image_cropper_platform_interface
-      sha256: "62349e3aab63873ea9b9ab9f69d036ab8a0d74b3004beec4303981386cb9273f"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.3"
   image_picker:
     dependency: "direct main"
     description:
       name: image_picker
-      sha256: "64b21d9f0e065f9ab0e4dde458076226c97382cc0c6949144cb874c62bf8e9f8"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.8.7"
+    version: "0.8.6+4"
   image_picker_android:
     dependency: transitive
     description:
       name: image_picker_android
-      sha256: "42b2f33dcddd18921d650cc3e816e97ec03e43729ef4e132c39c39406319b1d2"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.8.6+4"
+    version: "0.8.5+9"
   image_picker_for_web:
     dependency: transitive
     description:
       name: image_picker_for_web
-      sha256: "98f50d6b9f294c8ba35e25cc0d13b04bfddd25dbc8d32fa9d566a6572f2c081c"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.12"
+    version: "2.1.11"
   image_picker_ios:
     dependency: transitive
     description:
       name: image_picker_ios
-      sha256: "50e882fe0a06bf0c8f7f5bce78d30975f279213293afc9471dc35f05617c50ff"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.8.7+1"
+    version: "0.8.7"
   image_picker_platform_interface:
     dependency: transitive
     description:
       name: image_picker_platform_interface
-      sha256: "1991219d9dbc42a99aff77e663af8ca51ced592cd6685c9485e3458302d3d4f8"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.6.3"
   infinite_scroll_pagination:
     dependency: "direct main"
     description:
       name: infinite_scroll_pagination
-      sha256: "9517328f4e373f08f57dbb11c5aac5b05554142024d6b60c903f3b73476d52db"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.2.0"
   injectable:
     dependency: "direct main"
     description:
       name: injectable
-      sha256: "7dab7d341feb40a0590d9ff6261aea9495522005e2c6763f9161a4face916f7b"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
   injectable_generator:
     dependency: "direct dev"
     description:
       name: injectable_generator
-      sha256: b206de637c1960007b0beebe447a6ee3cf30c9e5f14542083024a9d0c49a7a09
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.4"
   intl:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.17.0"
+    version: "0.18.0"
   io:
     dependency: transitive
     description:
       name: io
-      sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.4"
   ionicons:
     dependency: "direct main"
     description:
       name: ionicons
-      sha256: "5496bc65a16115ecf05b15b78f494ee4a8869504357668f0a11d689e970523cf"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.2"
   js:
     dependency: transitive
     description:
       name: js
-      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.5"
+    version: "0.6.4"
   json_annotation:
     dependency: "direct main"
     description:
       name: json_annotation
-      sha256: "3520fa844009431b5d4491a5a778603520cdc399ab3406332dcc50f93547258c"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.7.0"
   json_serializable:
     dependency: "direct dev"
     description:
       name: json_serializable
-      sha256: f3c2c18a7889580f71926f30c1937727c8c7d4f3a435f8f5e8b0ddd25253ef5d
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "6.5.4"
   lint:
     dependency: "direct dev"
     description:
       name: lint
-      sha256: "3e9343b1cededcfb1e8b40d0dbd3592b7a1c6c0121545663a991433390c2bc97"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.1"
   lints:
     dependency: transitive
     description:
       name: lints
-      sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.1"
   logging:
     dependency: transitive
     description:
       name: logging
-      sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.1"
-  markdown:
-    dependency: transitive
-    description:
-      name: markdown
-      sha256: b3c60dee8c2af50ad0e6e90cceba98e47718a6ee0a7a6772c77846a0cc21f78b
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.0.1"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.13"
+    version: "0.12.12"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.0"
+    version: "0.1.5"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.0"
   mime:
     dependency: transitive
     description:
       name: mime
-      sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.4"
   mock_exceptions:
     dependency: transitive
     description:
       name: mock_exceptions
-      sha256: "6e3e623712d2c6106ffe9e14732912522b565ddaa82a8dcee6cd4441b5984056"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.8.2"
   mocktail:
     dependency: "direct main"
     description:
       name: mocktail
-      sha256: "80a996cd9a69284b3dc521ce185ffe9150cde69767c2d3a0720147d93c0cef53"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.3.0"
   nested:
     dependency: transitive
     description:
       name: nested
-      sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.0"
   node_preamble:
     dependency: transitive
     description:
       name: node_preamble
-      sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.2"
   octo_image:
     dependency: transitive
     description:
       name: octo_image
-      sha256: "107f3ed1330006a3bea63615e81cf637433f5135a52466c7caa0e7152bca9143"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.2"
   package_config:
     dependency: transitive
     description:
       name: package_config
-      sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
   package_info_plus:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: "8df5ab0a481d7dc20c0e63809e90a588e496d276ba53358afc4c4443d0a00697"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.3"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
       name: package_info_plus_platform_interface
-      sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.1"
   path:
     dependency: transitive
     description:
       name: path
-      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.2"
   path_provider:
     dependency: transitive
     description:
       name: path_provider
-      sha256: "04890b994ee89bfa80bf3080bfec40d5a92c5c7a785ebb02c13084a099d2b6f9"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.13"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "019f18c9c10ae370b08dce1f3e3b73bc9f58e7f087bb5e921f06529438ac0ae7"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.24"
+    version: "2.0.23"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "12eee51abdf4d34c590f043f45073adbb45514a108bd9db4491547a2fd891059"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.0"
+    version: "2.1.2"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      sha256: "2ae08f2216225427e64ad224a24354221c2c7907e448e6e0e8b57b1eb9f10ad1"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.10"
+    version: "2.1.9"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      sha256: "57585299a729335f1298b43245842678cb9f43a6310351b18fb577d6e33165ec"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.6"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: f53720498d5a543f9607db4b0e997c4b5438884de25b0f73098cc2671a51b130
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.5"
+    version: "2.1.4"
   pedantic:
     dependency: transitive
     description:
       name: pedantic
-      sha256: "67fc27ed9639506c856c840ccce7594d0bdcd91bc8d53d6e52359449a1d50602"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.11.1"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "5.1.0"
   phone_number:
     dependency: "direct main"
     description:
       name: phone_number
-      sha256: "42cac4ca32146d83cc8a9c8432dc2d901d40334f0e2b02a3ec7d8237b80ebec3"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.0"
   platform:
     dependency: transitive
     description:
       name: platform
-      sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.0"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.4"
   pointycastle:
     dependency: transitive
     description:
       name: pointycastle
-      sha256: db7306cf0249f838d1a24af52b5a5887c5bf7f31d8bb4e827d071dc0939ad346
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.6.2"
   pool:
     dependency: transitive
     description:
       name: pool
-      sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.5.1"
   process:
     dependency: transitive
     description:
       name: process
-      sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.2.4"
   provider:
     dependency: transitive
     description:
       name: provider
-      sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "6.0.5"
   pub_semver:
     dependency: transitive
     description:
       name: pub_semver
-      sha256: "307de764d305289ff24ad257ad5c5793ce56d04947599ad68b3baa124105fc17"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.3"
   pubspec_parse:
     dependency: transitive
     description:
       name: pubspec_parse
-      sha256: "75f6614d6dde2dc68948dffbaa4fe5dae32cd700eb9fb763fe11dfb45a3c4d0a"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.1"
   recase:
     dependency: transitive
     description:
       name: recase
-      sha256: e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.1.0"
   rive:
     dependency: "direct main"
     description:
       name: rive
-      sha256: "763b4915b5245428f1188d38c2ff8c26da83ca194d345daa319ca32d69ed670f"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.10.3"
+    version: "0.10.2"
   rive_common:
     dependency: transitive
     description:
       name: rive_common
-      sha256: "12ea4a1ca1aa2ddeb2ef212afa20517d6c140a5deb32149c713912a7e6b7e26e"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.0.3"
+    version: "0.0.2"
   rxdart:
     dependency: "direct main"
     description:
       name: rxdart
-      sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.27.7"
   share_plus:
     dependency: "direct main"
     description:
       name: share_plus
-      sha256: "8c6892037b1824e2d7e8f59d54b3105932899008642e6372e5079c6939b4b625"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "6.3.1"
   share_plus_platform_interface:
     dependency: transitive
     description:
       name: share_plus_platform_interface
-      sha256: "82ddd4ab9260c295e6e39612d4ff00390b9a7a21f1bb1da771e2f232d80ab8a1"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.2.0"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: ee6257848f822b8481691f20c3e6d2bfee2e9eccb2a3d249907fcfb198c55b41
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.18"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: ad423a80fe7b4e48b50d6111b3ea1027af0e959e49d485712e134863d9c1c521
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.17"
+    version: "2.0.16"
   shared_preferences_foundation:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: "1e755f8583229f185cfca61b1d80fb2344c9d660e1c69ede5450d8f478fa5310"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.5"
+    version: "2.1.4"
   shared_preferences_linux:
     dependency: transitive
     description:
       name: shared_preferences_linux
-      sha256: "3a59ed10890a8409ad0faad7bb2957dab4b92b8fbe553257b05d30ed8af2c707"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.5"
+    version: "2.1.4"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
-      sha256: "824bfd02713e37603b2bdade0842e47d56e7db32b1dcdd1cae533fb88e2913fc"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.1"
   shared_preferences_web:
     dependency: transitive
     description:
       name: shared_preferences_web
-      sha256: "0dc2633f215a3d4aa3184c9b2c5766f4711e4e5a6b256e62aafee41f89f1bfb8"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.6"
+    version: "2.0.5"
   shared_preferences_windows:
     dependency: transitive
     description:
       name: shared_preferences_windows
-      sha256: "71bcd669bb9cdb6b39f22c4a7728b6d49e934f6cba73157ffa5a54f1eed67436"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.5"
+    version: "2.1.4"
   shelf:
     dependency: transitive
     description:
       name: shelf
-      sha256: c24a96135a2ccd62c64b69315a14adc5c3419df63b4d7c05832a346fdb73682c
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.4.0"
   shelf_packages_handler:
     dependency: transitive
     description:
       name: shelf_packages_handler
-      sha256: aef74dc9195746a384843102142ab65b6a4735bb3beea791e63527b88cc83306
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.1"
   shelf_static:
     dependency: transitive
     description:
       name: shelf_static
-      sha256: e792b76b96a36d4a41b819da593aff4bdd413576b3ba6150df5d8d9996d2e74c
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.1"
   shelf_web_socket:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: a988c0e8d8ffbdb8a28aa7ec8e449c260f3deb808781fe1284d22c5bba7156e8
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.3"
   shimmer:
     dependency: "direct main"
     description:
       name: shimmer
-      sha256: "1f1009b5845a1f88f1c5630212279540486f97409e9fc3f63883e71070d107bf"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
   sky_engine:
@@ -1209,360 +1047,315 @@ packages:
     dependency: transitive
     description:
       name: sliver_tools
-      sha256: bfa69411ebb203cc1a115b1e8bc7935b893eb381fdcf8d453b40c0d4e1db3247
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.9"
   source_gen:
     dependency: transitive
     description:
       name: source_gen
-      sha256: "2d79738b6bbf38a43920e2b8d189e9a3ce6cc201f4b8fc76be5e4fe377b1c38d"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.6"
   source_helper:
     dependency: transitive
     description:
       name: source_helper
-      sha256: "3b67aade1d52416149c633ba1bb36df44d97c6b51830c2198e934e3fca87ca1f"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.3"
   source_map_stack_trace:
     dependency: transitive
     description:
       name: source_map_stack_trace
-      sha256: "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.1"
   source_maps:
     dependency: transitive
     description:
       name: source_maps
-      sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.10.12"
   source_span:
     dependency: transitive
     description:
       name: source_span
-      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.1"
+    version: "1.9.0"
   sqflite:
     dependency: transitive
     description:
       name: sqflite
-      sha256: "500d6fec583d2c021f2d25a056d96654f910662c64f836cd2063167b8f1fa758"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.6"
+    version: "2.2.5"
   sqflite_common:
     dependency: transitive
     description:
       name: sqflite_common
-      sha256: "963dad8c4aa2f814ce7d2d5b1da2f36f31bd1a439d8f27e3dc189bb9d26bc684"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.4.3"
+    version: "2.4.2+2"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.11.0"
+    version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.0"
   stream_transform:
     dependency: transitive
     description:
       name: stream_transform
-      sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.1.1"
   synchronized:
     dependency: transitive
     description:
       name: synchronized
-      sha256: "33b31b6beb98100bf9add464a36a8dd03eb10c7a8cf15aeec535e9b054aaf04b"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.1"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.1"
   test:
     dependency: transitive
     description:
       name: test
-      sha256: a5fcd2d25eeadbb6589e80198a47d6a464ba3e2049da473943b8af9797900c2d
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.22.0"
+    version: "1.21.4"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.16"
+    version: "0.4.12"
   test_core:
     dependency: transitive
     description:
       name: test_core
-      sha256: "0ef9755ec6d746951ba0aabe62f874b707690b5ede0fecc818b138fcc9b14888"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.20"
+    version: "0.4.16"
   timing:
     dependency: transitive
     description:
       name: timing
-      sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.1"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.1"
   url_launcher:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: "75f2846facd11168d007529d6cd8fcb2b750186bea046af9711f10b907e1587e"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "6.1.10"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "845530e5e05db5500c1a4c1446785d60cbd8f9bd45e21e7dd643a3273bb4bbd1"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.0.25"
+    version: "6.0.24"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "7ab1e5b646623d6a2537aa59d5d039f90eebef75a7c25e105f6f75de1f7750c3"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.2"
+    version: "6.1.1"
   url_launcher_linux:
     dependency: transitive
     description:
       name: url_launcher_linux
-      sha256: "206fb8334a700ef7754d6a9ed119e7349bc830448098f21a69bf1b4ed038cabc"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.4"
+    version: "3.0.3"
   url_launcher_macos:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: "0ef2b4f97942a16523e51256b799e9aa1843da6c60c55eefbfa9dbc2dcb8331a"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.4"
+    version: "3.0.3"
   url_launcher_platform_interface:
     dependency: transitive
     description:
       name: url_launcher_platform_interface
-      sha256: "6c9ca697a5ae218ce56cece69d46128169a58aa8653c1b01d26fcd4aad8c4370"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.2"
   url_launcher_web:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: "81fe91b6c4f84f222d186a9d23c73157dc4c8e1c71489c4d08be1ad3b228f1aa"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.16"
+    version: "2.0.15"
   url_launcher_windows:
     dependency: transitive
     description:
       name: url_launcher_windows
-      sha256: a83ba3607a507758669cfafb03f9de09bf6e6280c14d9b9cb18f013e406dcacd
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.5"
+    version: "3.0.4"
   uuid:
     dependency: transitive
     description:
       name: uuid
-      sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.7"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.2"
   vm_service:
     dependency: transitive
     description:
       name: vm_service
-      sha256: e7fb6c2282f7631712b69c19d1bff82f3767eea33a2321c14fa59ad67ea391c7
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "9.4.0"
   watcher:
     dependency: transitive
     description:
       name: watcher
-      sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.2"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
-      sha256: ca49c0bc209c687b887f30527fb6a9d80040b072cc2990f34b9bec3e7663101b
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.3.0"
   webkit_inspection_protocol:
     dependency: transitive
     description:
       name: webkit_inspection_protocol
-      sha256: "67d3a8b6c79e1987d19d848b0892e582dbb0c66c57cc1fef58a177dd2aa2823d"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
   webview_flutter:
     dependency: "direct main"
     description:
       name: webview_flutter
-      sha256: b6cd42db3ced5411f3d01599906156885b18e4188f7065a8a351eb84bee347e0
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.0.6"
   webview_flutter_android:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: c849dcb6bf7367f696869006fb9575c15bdc6a1d624ae13f12de5a147a740b12
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.4.2"
+    version: "3.3.2"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
       name: webview_flutter_platform_interface
-      sha256: "1939c39e2150fb4d30fd3cc59a891a49fed9935db53007df633ed83581b6117b"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.0.2"
   webview_flutter_wkwebview:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
-      sha256: ab12479f7a0cf112b9420c36aaf206a1ca47cd60cd42de74a4be2e97a697587b
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.2.1"
+    version: "3.2.0"
   widgetbook:
     dependency: "direct dev"
     description:
       name: widgetbook
-      sha256: c42a3d414d19c008d90f0b6df669c18bb151c5f3012ed073498d96cf133e9caf
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.4.1"
   widgetbook_annotation:
     dependency: "direct main"
     description:
       name: widgetbook_annotation
-      sha256: "1f12e090865200191ab6b79b7ed4b108a191bf5de3140f92917c8c75e7e3f916"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
   widgetbook_generator:
     dependency: "direct dev"
     description:
       name: widgetbook_generator
-      sha256: b6d00fef564fa5c0b98e26a72a27d52d03400c36409e56be25c0f09cfee3307b
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.4.1"
   widgetbook_models:
     dependency: transitive
     description:
       name: widgetbook_models
-      sha256: "40899314ab0cce1a52b189ee12b79138ba59f445229f850fb326f579c8f63045"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.0.7"
   win32:
     dependency: transitive
     description:
       name: win32
-      sha256: c9ebe7ee4ab0c2194e65d3a07d8c54c5d00bb001b76081c4a04cdb8448b59e46
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.3"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: ee1505df1426458f7f60aac270645098d318a8b4766d85fde75f76f2e21807d1
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.0"
   xml:
     dependency: transitive
     description:
       name: xml
-      sha256: ac0e3f4bf00ba2708c33fbabbbe766300e509f8c82dbd4ab6525039813f7e2fb
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "6.1.0"
   yaml:
     dependency: transitive
     description:
       name: yaml
-      sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370"
-      url: "https://pub.dev"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.1"
 sdks:
diff --git a/pubspec.yaml b/pubspec.yaml
index ede9d741..eeaba32b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -5,10 +5,20 @@ description: The CollAction app
 # pub.dev using `pub publish`. This is preferred for private packages.
 publish_to: "none"
 
+# The following defines the version and build number for your application.
+# A version number is three numbers separated by dots, like 1.2.43
+# followed by an optional build number separated by a +.
+# Both the version and the builder number may be overridden in flutter
+# build by specifying --build-name and --build-number, respectively.
+# In Android, build-name is used as versionName while build-number used as versionCode.
+# Read more about Android versioning at https://developer.android.com/studio/publish/versioning
+# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
+# Read more about iOS versioning at
+# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 version: 1.2.0+1
 
 environment:
-  sdk: ">=2.18.6 <3.0.0"
+  sdk: ">=2.18.2 <3.0.0"
 
 dependencies:
   auto_route: ^5.0.2
@@ -28,7 +38,6 @@ dependencies:
     sdk: flutter
   flutter_bloc: ^8.1.1
   flutter_dotenv: ^5.0.2
-  flutter_markdown: ^0.6.14
   freezed_annotation: ^2.2.0
   get_it: ^7.2.0
   http: ^0.13.5
@@ -37,7 +46,7 @@ dependencies:
   image_picker: ^0.8.6
   infinite_scroll_pagination: ^3.2.0
   injectable: ^2.1.0
-  intl: ^0.17.0
+  intl: ^0.18.0
   ionicons: ^0.2.1
   json_annotation: ^4.7.0
   mocktail: ^0.3.0
@@ -101,4 +110,4 @@ flutter:
         - asset: assets/fonts/Rubik/Rubik-Medium.ttf
           weight: 400
         - asset: assets/fonts/Rubik/Rubik-Light.ttf
-          weight: 300
+          weight: 300
\ No newline at end of file
diff --git a/test/application/auth/auth_bloc_test.dart b/test/application/auth/auth_bloc_tests.dart
similarity index 86%
rename from test/application/auth/auth_bloc_test.dart
rename to test/application/auth/auth_bloc_tests.dart
index d81e2830..1e68ca32 100644
--- a/test/application/auth/auth_bloc_test.dart
+++ b/test/application/auth/auth_bloc_tests.dart
@@ -6,8 +6,9 @@ import 'package:collaction_app/domain/auth/i_auth_repository.dart';
 import 'package:collaction_app/domain/user/i_avatar_repository.dart';
 import 'package:collaction_app/domain/user/i_user_repository.dart';
 import 'package:dartz/dartz.dart';
-import 'package:flutter_test/flutter_test.dart';
 import 'package:mocktail/mocktail.dart';
+// ignore: depend_on_referenced_packages
+import 'package:test/test.dart';
 
 class MockAuthRepository extends Mock implements IAuthRepository {}
 
@@ -16,12 +17,7 @@ class MockAvatarRepository extends Mock implements IAvatarRepository {}
 void main() {
   group('Authentication BLoC', () {
     test('Initial auth state', () {
-      final userRepository = MockAuthRepository();
-
-      when(() => userRepository.observeUser())
-          .thenAnswer((_) => Stream.empty());
-
-      final bloc = AuthBloc(userRepository, MockAvatarRepository());
+      final bloc = AuthBloc(MockAuthRepository(), MockAvatarRepository());
       expect(bloc.state, const AuthState.initial());
     });
 
@@ -36,9 +32,6 @@ void main() {
     final avatarRepository = MockAvatarRepository();
 
     {
-      when(() => userRepository.observeUser())
-          .thenAnswer((_) => Stream.empty());
-
       when(
         () => userRepository.verifyPhone(
           phoneNumber: any(named: 'phoneNumber'),
@@ -92,10 +85,6 @@ void main() {
 
     {
       final userRepository = MockAuthRepository();
-
-      when(() => userRepository.observeUser())
-          .thenAnswer((_) => Stream.empty());
-
       const error = AuthFailure.verificationFailed();
       when(
         () => userRepository.verifyPhone(
@@ -118,7 +107,7 @@ void main() {
 
     blocTest(
       'Reset to initial auth state',
-      build: () => AuthBloc(userRepository, MockAvatarRepository()),
+      build: () => AuthBloc(MockAuthRepository(), MockAvatarRepository()),
       act: (AuthBloc bloc) {
         bloc.add(const AuthEvent.reset());
       },
diff --git a/test/application/build_information/build_information_bloc_test.dart b/test/application/build_information/build_information_bloc_test.dart
deleted file mode 100644
index aef0139e..00000000
--- a/test/application/build_information/build_information_bloc_test.dart
+++ /dev/null
@@ -1,41 +0,0 @@
-import 'package:bloc_test/bloc_test.dart';
-import 'package:collaction_app/application/settings/build_information/build_information_bloc.dart';
-
-import 'package:collaction_app/domain/settings/build_information.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:mocktail/mocktail.dart';
-
-import '../../domain/core/i_settings_repository.mocks.dart';
-
-void main() {
-  group('Testing Build Information BLoC', () {
-    late final SettingsRepositoryMock settingsRepository;
-    late final BuildInformationBloc bloc;
-
-    setUpAll(() {
-      settingsRepository = SettingsRepositoryMock();
-      bloc = BuildInformationBloc(settingsRepository);
-    });
-
-    test('Initial state', () {
-      expect(bloc.state, const BuildInformationState.loading());
-    });
-
-    blocTest(
-      'Fetch',
-      build: () => bloc,
-      act: (bloc) {
-        when(() => settingsRepository.getBuildInformation())
-            .thenAnswer((_) => Future.value(tBuildInformation));
-
-        bloc.add(BuildInformationEvent.fetch());
-      },
-      expect: () => [
-        const BuildInformationState.loading(),
-        BuildInformationState.fetched(tBuildInformation),
-      ],
-    );
-  });
-}
-
-final tBuildInformation = BuildInformation(version: '1.0.0', buildNumber: '1');
diff --git a/test/application/contact_form/contact_form_test.dart b/test/application/contact_form/contact_form_test.dart
index 7fc11962..1d8e54d0 100644
--- a/test/application/contact_form/contact_form_test.dart
+++ b/test/application/contact_form/contact_form_test.dart
@@ -1,6 +1,5 @@
 import 'package:bloc_test/bloc_test.dart';
 import 'package:collaction_app/application/contact_form/contact_form_bloc.dart';
-import 'package:collaction_app/domain/contact_form/contact_failures.dart';
 import 'package:dartz/dartz.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mocktail/mocktail.dart';
@@ -12,38 +11,20 @@ void main() {
       expect(tContactFormBloc.state, const ContactFormState.initial());
     });
 
-    blocTest(
-      'Testing submit event success',
-      build: () => ContactFormBloc(tContactFormApi),
-      act: (ContactFormBloc bloc) {
-        when(() => tContactFormApi.sendContactFormContents(tContactFormDtoS))
-            .thenAnswer((_) => Future.value(right(unit)));
-
-        bloc.add(ContactFormEvent.submitted(tContactFormDtoS));
-      },
-      expect: () => [
-        const ContactFormState.submitting(),
-        const ContactFormState.submissionSuccessful(),
-      ],
-    );
-
-    blocTest(
-      'Testing submit event failure',
-      build: () => ContactFormBloc(tContactFormApi),
-      act: (ContactFormBloc bloc) {
-        when(() => tContactFormApi.sendContactFormContents(tContactFormDtoS))
-            .thenAnswer(
-          (_) => Future.value(
-            left(ContactFailure.serverError()),
-          ),
-        );
-
-        bloc.add(ContactFormEvent.submitted(tContactFormDtoS));
-      },
-      expect: () => [
-        const ContactFormState.submitting(),
-        const ContactFormState.failed('Submission failed'),
-      ],
-    );
+    {
+      when(() => tContactFormApi.sendContactFormContents(tContactFormDtoS))
+          .thenAnswer((_) => Future.value(right(unit)));
+      blocTest(
+        'Testing submit event success',
+        build: () => ContactFormBloc(tContactFormApi),
+        act: (ContactFormBloc bloc) {
+          bloc.add(ContactFormEvent.submitted(tContactFormDtoS));
+        },
+        expect: () => [
+          const ContactFormState.submitting(),
+          const ContactFormState.submissionSuccessful(),
+        ],
+      );
+    }
   });
 }
diff --git a/test/application/user/profile/profile_bloc_test.dart b/test/application/user/profile/profile_bloc_test.dart
new file mode 100644
index 00000000..5183cb8d
--- /dev/null
+++ b/test/application/user/profile/profile_bloc_test.dart
@@ -0,0 +1,69 @@
+import 'package:bloc_test/bloc_test.dart';
+import 'package:collaction_app/application/user/profile/profile_bloc.dart';
+import 'package:collaction_app/domain/user/i_avatar_repository.dart';
+import 'package:collaction_app/domain/user/i_profile_repository.dart';
+import 'package:collaction_app/domain/user/profile_failure.dart';
+import 'package:dartz/dartz.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mocktail/mocktail.dart';
+
+import '../../../domain/user/user_fixture.dart';
+import '../../../test_utilities.dart';
+
+void main() {
+  late IProfileRepository profileRepository;
+  late IAvatarRepository avatarRepository;
+  late ProfileBloc profileBloc;
+
+  const userProfile = cUserProfile;
+
+  setUp(() {
+    profileRepository = MockProfileRepository();
+    avatarRepository = MockAvatarRepository();
+    profileBloc = ProfileBloc(profileRepository, avatarRepository);
+  });
+
+  test('should have [ProfileState.initial()] as initial state', () async {
+    /// assert
+    expect(profileBloc.state, equals(ProfileState.initial()));
+  });
+
+  blocTest<ProfileBloc, ProfileState>(
+    'should return [ProfileState] with user profile '
+    'when profile retrieval is successful',
+    setUp: () {
+      when(() => profileRepository.getUserProfile())
+          .thenAnswer((_) async => const Right(userProfile));
+    },
+    build: () => profileBloc,
+    act: (bloc) => [bloc.add(GetUserProfile())],
+    expect: () => const [
+      ProfileState(
+        userProfile: userProfile,
+        isEditing: false,
+        wasProfilePictureUpdated: false,
+      )
+    ],
+    verify: (_) => verify(() => profileRepository.getUserProfile()).called(1),
+  );
+
+  blocTest<ProfileBloc, ProfileState>(
+    'should return [ProfileState] with null user profile '
+    'when profile retrieval is not successful',
+    setUp: () {
+      when(() => profileRepository.getUserProfile())
+          .thenAnswer((_) async => const Left(ProfileFailure.unexpected()));
+    },
+    build: () => profileBloc,
+    act: (bloc) => [bloc.add(GetUserProfile())],
+    expect: () => const [
+      ProfileState(
+        userProfile: null,
+        isEditing: false,
+      )
+    ],
+    verify: (_) => verify(() => profileRepository.getUserProfile()).called(1),
+  );
+
+  /// TODO(obella): Add more tests
+}
diff --git a/test/application/username/username_bloc_test.dart b/test/application/username/username_bloc_test.dart
deleted file mode 100644
index 8fb3b78f..00000000
--- a/test/application/username/username_bloc_test.dart
+++ /dev/null
@@ -1,69 +0,0 @@
-import 'package:bloc_test/bloc_test.dart';
-import 'package:collaction_app/application/username/username_bloc.dart';
-import 'package:collaction_app/domain/user/profile_failure.dart';
-
-import 'package:dartz/dartz.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:mocktail/mocktail.dart';
-
-import '../../test_utilities.dart';
-
-void main() {
-  group('Testing Username BLoC', () {
-    late final MockProfileRepository profileRepository;
-    late UsernameBloc bloc;
-
-    setUpAll(() {
-      profileRepository = MockProfileRepository();
-      bloc = UsernameBloc(profileRepository);
-    });
-
-    setUp(() {
-      // Reset BLOC
-      bloc = UsernameBloc(profileRepository);
-    });
-
-    test('Initial state', () {
-      expect(bloc.state, const UsernameState.initial());
-    });
-
-    blocTest(
-      'Update username success',
-      build: () => bloc,
-      act: (bloc) {
-        when(() => profileRepository.updateUsername(
-            firstName: tFirstName, lastName: tLastName)).thenAnswer(
-          (_) => Future.value(right(unit)),
-        );
-
-        bloc.add(UsernameEvent.updateUsername(
-            firstName: tFirstName, lastName: tLastName));
-      },
-      expect: () => [
-        const UsernameState.updateInProgress(),
-        UsernameState.updateSuccess('$tFirstName $tLastName'),
-      ],
-    );
-
-    blocTest(
-      'Update username failure',
-      build: () => bloc,
-      act: (bloc) {
-        when(() => profileRepository.updateUsername(
-            firstName: tFirstName, lastName: tLastName)).thenAnswer(
-          (_) => Future.value(left(ProfileFailure.unexpected())),
-        );
-
-        bloc.add(UsernameEvent.updateUsername(
-            firstName: tFirstName, lastName: tLastName));
-      },
-      expect: () => [
-        const UsernameState.updateInProgress(),
-        const UsernameState.updateFailure(),
-      ],
-    );
-  });
-}
-
-final tFirstName = "Mathias";
-final tLastName = "M";
diff --git a/test/domain/crowdaction/crowdaction_test_fixtures.dart b/test/domain/crowdaction/crowdaction_test_fixtures.dart
index 52005f04..bfe38eb8 100644
--- a/test/domain/crowdaction/crowdaction_test_fixtures.dart
+++ b/test/domain/crowdaction/crowdaction_test_fixtures.dart
@@ -2,7 +2,7 @@ import 'package:collaction_app/domain/crowdaction/crowdaction.dart';
 
 import '../../test_utilities.dart';
 
-final List<Commitment> tListCommitments = [tCommitment];
+final List<CommitmentOption> tListCommitmentOptions = [tCommitmentOption];
 
 const Images tImage = Images(card: 'tCard', banner: 'tBanner');
 
@@ -16,11 +16,12 @@ CrowdAction generateDummyCrowdaction({
 }) {
   return CrowdAction(
     id: 'tID',
+    type: 'tType',
     title: 'tTitle',
     description: 'tDescription',
     category: 'tCategory',
     location: tLocation,
-    commitments: tListCommitments,
+    commitmentOptions: tListCommitmentOptions,
     endAt: endDate ?? DateTime(2022, 1, 31),
     images: tImage,
     participantCount: participantCnt,
diff --git a/test/infrastructure/crowdaction/commitment_option_dto_fixtures.dart b/test/infrastructure/crowdaction/commitment_option_dto_fixtures.dart
index 13f26916..06b85038 100644
--- a/test/infrastructure/crowdaction/commitment_option_dto_fixtures.dart
+++ b/test/infrastructure/crowdaction/commitment_option_dto_fixtures.dart
@@ -1,8 +1,9 @@
 import 'package:collaction_app/infrastructure/crowdaction/crowdaction_dto.dart';
 import 'package:collaction_app/domain/crowdaction/crowdaction.dart';
 
-final tCommitment = Commitment(
+final tCommitmentOption = CommitmentOption(
   id: 'id',
+  type: 'type',
   label: 'label',
   points: 0,
   blocks: ['blocks'],
@@ -10,8 +11,9 @@ final tCommitment = Commitment(
   iconId: 'iconId',
 );
 
-final tCommitmentDto = CommitmentDto(
+final tCommitmentOptionDto = CommitmentOptionDto(
   id: 'id',
+  type: 'type',
   label: 'label',
   points: 0,
   blocks: ['blocks'],
@@ -19,8 +21,9 @@ final tCommitmentDto = CommitmentDto(
   icon: 'iconId',
 );
 
-final tCommitmentJson = {
+final tCommitmentOptionJson = {
   'id': 'id',
+  'type': 'type',
   'label': 'label',
   'points': 0,
   'blocks': ['blocks'],
diff --git a/test/infrastructure/crowdaction/commitment_option_dto_test.dart b/test/infrastructure/crowdaction/commitment_option_dto_test.dart
index 87f955ed..5a34c917 100644
--- a/test/infrastructure/crowdaction/commitment_option_dto_test.dart
+++ b/test/infrastructure/crowdaction/commitment_option_dto_test.dart
@@ -3,17 +3,17 @@ import 'package:collaction_app/infrastructure/crowdaction/crowdaction_dto.dart';
 import 'commitment_option_dto_fixtures.dart';
 
 void main() {
-  group('unit tests for CommitmentDto', () {
+  group('unit tests for CommitmentOptionDto', () {
     test('toDomain() test', () {
-      final commitment = tCommitmentDto.toDomain();
+      final commitmentOption = tCommitmentOptionDto.toDomain();
 
-      expect(commitment, tCommitment);
+      expect(commitmentOption, tCommitmentOption);
     });
-
     test('fromJson() test', () {
-      final commitmentDto = CommitmentDto.fromJson(tCommitmentJson);
+      final commitmentOptionDto =
+          CommitmentOptionDto.fromJson(tCommitmentOptionJson);
 
-      expect(commitmentDto, tCommitmentDto);
+      expect(commitmentOptionDto, tCommitmentOptionDto);
     });
   });
 }
diff --git a/test/infrastructure/crowdaction/crowdaction_dto_fixtures.dart b/test/infrastructure/crowdaction/crowdaction_dto_fixtures.dart
index ffc4d00e..d289ecdf 100644
--- a/test/infrastructure/crowdaction/crowdaction_dto_fixtures.dart
+++ b/test/infrastructure/crowdaction/crowdaction_dto_fixtures.dart
@@ -7,7 +7,7 @@ final crowdActionDto = CrowdActionDto(
   description: 'crowdaction-description',
   category: 'crowdaction-category',
   location: LocationDto(code: 'NL', name: 'Netherlands'),
-  commitments: [],
+  commitmentOptions: [],
   images: ImagesDto(card: 'crowdaction-card', banner: 'crowdaction-banner'),
   participantCount: 0,
   status: Status.waiting,
@@ -15,10 +15,12 @@ final crowdActionDto = CrowdActionDto(
   endAt: '2024-01-01T00:00:00.000+00:00',
   password: 'crowdaction-password',
   subcategory: 'crowdaction-subcategory',
+  type: 'crowdaction-type',
 );
 
 final crowdActionDomain = CrowdAction(
   id: 'crowdaction-id',
+  type: 'crowdaction-type',
   title: 'crowdaction-title',
   description: 'crowdaction-description',
   category: 'crowdaction-category',
@@ -30,7 +32,7 @@ final crowdActionDomain = CrowdAction(
   status: Status.waiting,
   joinStatus: JoinStatus.open,
   endAt: DateTime.parse("2024-01-01T00:00:00.000+00:00"),
-  commitments: [],
+  commitmentOptions: [],
 );
 
 final crowdActionJson = {
@@ -47,5 +49,5 @@ final crowdActionJson = {
   "status": "WAITING",
   "joinStatus": "OPEN",
   "endAt": "2024-01-01T00:00:00.000+00:00",
-  "commitments": [],
+  "commitmentOptions": [],
 };
diff --git a/test/infrastructure/crowdaction/crowdaction_repository_fixtures.dart b/test/infrastructure/crowdaction/crowdaction_repository_fixtures.dart
deleted file mode 100644
index 8181dd49..00000000
--- a/test/infrastructure/crowdaction/crowdaction_repository_fixtures.dart
+++ /dev/null
@@ -1,122 +0,0 @@
-final crowdActionRaw = """{
-  "id": "12345678",
-  "title": "Veganuary",
-  "description": "description...",
-  "category": "CATEGORY",
-  "location": {
-    "code": "NL",
-    "name": "Netherlands"
-  },
-  "commitments": [
-    {
-      "id": "12345678",
-      "label": "label",
-      "points": 50,
-      "blocks": [
-        "123456789"
-      ],
-      "description": "description..."
-    },
-    {
-      "id": "123456789",
-      "label": "label",
-      "points": 50,
-      "blocks": [],
-      "description": "description..."
-    }
-  ],
-  "images": {
-    "card": "https://example.com/card",
-    "banner": "https://example.com/banner"
-  },
-  "participantCount": 100,
-  "status": "STARTED",
-  "joinStatus": "CLOSED",
-  "endAt": "2024-01-01T00:00:00.000+00:00",
-  "subcategory": "SUBCATEGORY"
-}""";
-
-final crowdActionsRaw = """{
-  "pageInfo": {
-    "page": 1,
-    "pageSize": 2,
-    "totalPages": 1,
-    "totalItems": 2
-  },
-  "items": [
-    {
-      "id": "123456789",
-      "title": "Veganuary",
-      "description": "description...",
-      "category": "CATEGORY",
-      "location": {
-        "code": "NL",
-        "name": "Netherlands"
-      },
-      "commitments": [
-        {
-          "id": "12345678",
-          "label": "label",
-          "points": 50,
-          "blocks": [
-            "123456789"
-          ],
-          "description": "description..."
-        },
-        {
-          "id": "123456789",
-          "label": "label",
-          "points": 50,
-          "blocks": [],
-          "description": "description..."
-        }
-      ],
-      "images": {
-        "card": "https://example.com/card",
-        "banner": "https://example.com/banner"
-      },
-      "participantCount": 100,
-      "status": "STARTED",
-      "joinStatus": "CLOSED",
-      "endAt": "2024-01-01T00:00:00.000+00:00",
-      "subcategory": "SUBCATEGORY"
-    },
-    {
-      "id": "123456789",
-      "title": "Veganuary",
-      "description": "description...",
-      "category": "CATEGORY",
-      "location": {
-        "code": "NL",
-        "name": "Netherlands"
-      },
-      "commitments": [
-        {
-          "id": "12345678",
-          "label": "label",
-          "points": 50,
-          "blocks": [
-            "123456789"
-          ],
-          "description": "description..."
-        },
-        {
-          "id": "123456789",
-          "label": "label",
-          "points": 50,
-          "blocks": [],
-          "description": "description..."
-        }
-      ],
-      "images": {
-        "card": "https://example.com/card",
-        "banner": "https://example.com/banner"
-      },
-      "participantCount": 100,
-      "status": "STARTED",
-      "joinStatus": "CLOSED",
-      "endAt": "2024-01-01T00:00:00.000+00:00",
-      "subcategory": "SUBCATEGORY"
-    }
-  ]
-}""";
diff --git a/test/infrastructure/crowdaction/crowdaction_repository_test.dart b/test/infrastructure/crowdaction/crowdaction_repository_test.dart
deleted file mode 100644
index 390e8c3f..00000000
--- a/test/infrastructure/crowdaction/crowdaction_repository_test.dart
+++ /dev/null
@@ -1,221 +0,0 @@
-import 'package:collaction_app/domain/auth/i_auth_repository.dart';
-import 'package:collaction_app/domain/core/i_settings_repository.dart';
-import 'package:collaction_app/domain/user/user.dart';
-import 'package:collaction_app/infrastructure/crowdaction/crowdaction_repository.dart';
-import 'package:dartz/dartz.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:http/http.dart';
-import 'package:mocktail/mocktail.dart';
-
-import '../../domain/core/i_settings_repository.mocks.dart';
-import '../../test_utilities.dart';
-import 'crowdaction_repository_fixtures.dart';
-
-void main() {
-  late final IAuthRepository authRepository;
-  late final ISettingsRepository settingsRepository;
-  late final MockHttpClient client;
-  late final CrowdActionRepository crowdActionRepository;
-
-  setUpAll(() {
-    registerFallbackValue(Uri());
-
-    authRepository = MockAuthRepository();
-    settingsRepository = SettingsRepositoryMock();
-    client = MockHttpClient();
-
-    crowdActionRepository = CrowdActionRepository(
-      client,
-      authRepository,
-      settingsRepository,
-    );
-
-    when(() => settingsRepository.baseApiEndpointUrl)
-        .thenAnswer((invocation) => Future.value('https://example.com'));
-  });
-
-  group('CrowdActionRepository tests', () {
-    test('getCrowdAction success', () async {
-      when(() => client.get(any())).thenAnswer(
-          (invocation) => Future.value(Response(crowdActionRaw, 200)));
-
-      final crowdActionEither =
-          await crowdActionRepository.getCrowdAction('12345678');
-
-      expect(crowdActionEither.isRight(), true);
-
-      final crowdAction = crowdActionEither.fold((l) => null, (r) => r);
-      expect(crowdAction, isNotNull);
-    });
-
-    test('getCrowdAction failure', () async {
-      when(() => client.get(any()))
-          .thenAnswer((invocation) => Future.value(Response('', 400)));
-
-      final crowdActionEither =
-          await crowdActionRepository.getCrowdAction('12345678');
-
-      expect(crowdActionEither.isLeft(), true);
-    });
-
-    test('getCrowdAction failure by exception', () async {
-      when(() => client.get(any()))
-          .thenAnswer((invocation) => throw Exception());
-
-      final crowdActionEither =
-          await crowdActionRepository.getCrowdAction('12345678');
-
-      expect(crowdActionEither.isLeft(), true);
-    });
-
-    test('getCrowdActions success', () async {
-      when(() => client.get(any())).thenAnswer(
-          (invocation) => Future.value(Response(crowdActionsRaw, 200)));
-
-      final paginatedCrowdActionEither =
-          await crowdActionRepository.getCrowdActions(pageNumber: 1);
-
-      expect(paginatedCrowdActionEither.isRight(), true);
-
-      final paginatedCrowdActions =
-          paginatedCrowdActionEither.fold((l) => null, (r) => r);
-      expect(paginatedCrowdActions, isNotNull);
-
-      expect(paginatedCrowdActions!.crowdActions.length, 2);
-    });
-
-    test('getCrowdActions failure', () async {
-      when(() => client.get(any()))
-          .thenAnswer((invocation) => Future.value(Response('', 400)));
-
-      final paginatedCrowdActionEither =
-          await crowdActionRepository.getCrowdActions(pageNumber: 1);
-
-      expect(paginatedCrowdActionEither.isLeft(), true);
-
-      final paginatedCrowdActions =
-          paginatedCrowdActionEither.fold((l) => null, (r) => r);
-      expect(paginatedCrowdActions, isNull);
-    });
-
-    test('getCrowdActions failure by exception', () async {
-      when(() => client.get(any()))
-          .thenAnswer((invocation) => throw Exception());
-
-      final paginatedCrowdActionEither =
-          await crowdActionRepository.getCrowdActions(pageNumber: 1);
-
-      expect(paginatedCrowdActionEither.isLeft(), true);
-
-      final paginatedCrowdActions =
-          paginatedCrowdActionEither.fold((l) => null, (r) => r);
-      expect(paginatedCrowdActions, isNull);
-    });
-
-    test('getSpotlightCrowdActions success', () async {
-      when(() => client.get(any())).thenAnswer(
-          (invocation) => Future.value(Response(crowdActionsRaw, 200)));
-
-      final paginatedCrowdActionEither =
-          await crowdActionRepository.getSpotlightCrowdActions();
-
-      expect(paginatedCrowdActionEither.isRight(), true);
-
-      final paginatedCrowdActions =
-          paginatedCrowdActionEither.fold((l) => null, (r) => r);
-      expect(paginatedCrowdActions, isNotNull);
-    });
-
-    test('getSpotlightCrowdActions failure', () async {
-      when(() => client.get(any()))
-          .thenAnswer((invocation) => Future.value(Response('', 400)));
-
-      final paginatedCrowdActionEither =
-          await crowdActionRepository.getSpotlightCrowdActions();
-
-      expect(paginatedCrowdActionEither.isLeft(), true);
-
-      final paginatedCrowdActions =
-          paginatedCrowdActionEither.fold((l) => null, (r) => r);
-      expect(paginatedCrowdActions, isNull);
-    });
-
-    test('getSpotlightCrowdActions failure by exception', () async {
-      when(() => client.get(any()))
-          .thenAnswer((invocation) => throw Exception());
-
-      final paginatedCrowdActionEither =
-          await crowdActionRepository.getSpotlightCrowdActions();
-
-      expect(paginatedCrowdActionEither.isLeft(), true);
-
-      final paginatedCrowdActions =
-          paginatedCrowdActionEither.fold((l) => null, (r) => r);
-      expect(paginatedCrowdActions, isNull);
-    });
-
-    test('getCrowdActionsForUser success', () async {
-      when(() => client.get(any(), headers: any(named: 'headers'))).thenAnswer(
-          (invocation) => Future.value(Response(crowdActionsRaw, 200)));
-
-      when(() => authRepository.getSignedInUser())
-          .thenAnswer((invocation) => Future.value(optionOf(User.anonymous)));
-
-      final crowdActionEither =
-          await crowdActionRepository.getCrowdActionsForUser();
-
-      expect(crowdActionEither.isRight(), true);
-
-      final crowdAction = crowdActionEither.fold((l) => null, (r) => r);
-      expect(crowdAction, isNotNull);
-    });
-
-    test('getCrowdActionsForUser failure', () async {
-      when(() => client.get(any(), headers: any(named: 'headers')))
-          .thenAnswer((invocation) => Future.value(Response('', 400)));
-
-      when(() => authRepository.getSignedInUser())
-          .thenAnswer((invocation) => Future.value(optionOf(User.anonymous)));
-
-      final crowdActionEither =
-          await crowdActionRepository.getCrowdActionsForUser();
-
-      expect(crowdActionEither.isLeft(), true);
-
-      final crowdAction = crowdActionEither.fold((l) => null, (r) => r);
-      expect(crowdAction, isNull);
-    });
-
-    test('getCrowdActionsForUser failure by null user', () async {
-      when(() => client.get(any(), headers: any(named: 'headers'))).thenAnswer(
-          (invocation) => Future.value(Response(crowdActionsRaw, 200)));
-
-      when(() => authRepository.getSignedInUser())
-          .thenAnswer((invocation) => Future.value(optionOf(null)));
-
-      final crowdActionEither =
-          await crowdActionRepository.getCrowdActionsForUser();
-
-      expect(crowdActionEither.isLeft(), true);
-
-      final crowdAction = crowdActionEither.fold((l) => null, (r) => r);
-      expect(crowdAction, isNull);
-    });
-
-    test('getCrowdActionsForUser failure by excpetion', () async {
-      when(() => client.get(any(), headers: any(named: 'headers'))).thenAnswer(
-          (invocation) => Future.value(Response(crowdActionsRaw, 200)));
-
-      when(() => authRepository.getSignedInUser())
-          .thenAnswer((invocation) => throw Exception());
-
-      final crowdActionEither =
-          await crowdActionRepository.getCrowdActionsForUser();
-
-      expect(crowdActionEither.isLeft(), true);
-
-      final crowdAction = crowdActionEither.fold((l) => null, (r) => r);
-      expect(crowdAction, isNull);
-    });
-  });
-}
diff --git a/test/infrastructure/participation/participation_dto_fixtures.dart b/test/infrastructure/participation/participation_dto_fixtures.dart
index 4a4ea752..04d7a2a3 100644
--- a/test/infrastructure/participation/participation_dto_fixtures.dart
+++ b/test/infrastructure/participation/participation_dto_fixtures.dart
@@ -7,7 +7,7 @@ final tParticipation = Participation(
   fullName: 'fullName',
   avatar: 'avatar',
   userId: 'userId',
-  commitments: ['commitments'],
+  commitmentOptions: ['commitmentOptions'],
   joinDate: DateTime.parse('20221120'),
   dailyCheckIns: 0,
 );
@@ -18,7 +18,7 @@ final tParticipationDto = ParticipationDto(
   fullName: 'fullName',
   avatar: 'avatar',
   userId: 'userId',
-  commitments: ['commitments'],
+  commitmentOptions: ['commitmentOptions'],
   joinDate: '20221120',
   dailyCheckIns: 0,
 );
@@ -29,7 +29,7 @@ const tParticipationJson = {
   'fullName': 'fullName',
   'avatar': 'avatar',
   'userId': 'userId',
-  'commitments': ['commitments'],
+  'commitmentOptions': ['commitmentOptions'],
   'joinDate': '20221120',
   'dailyCheckIns': 0,
 };
diff --git a/test/infrastructure/participation/participation_repository_fixtures.dart b/test/infrastructure/participation/participation_repository_fixtures.dart
deleted file mode 100644
index a2c9b432..00000000
--- a/test/infrastructure/participation/participation_repository_fixtures.dart
+++ /dev/null
@@ -1,116 +0,0 @@
-// ignore_for_file: constant_identifier_names
-
-const participation1 = """{
-  "id": "12345678",
-  "crowdActionId": "123456",
-  "fullName": "John Doe",
-  "avatar": "/avatar/123456.png",
-  "userId": "1234-1234-1234-1234",
-  "commitments": ["1234"],
-  "joinDate": "2024-01-01T00:00:00.000+00:00",
-  "dailyCheckIns": 10
-}""";
-
-const participation2 = """{
-      "id": "1234567890",
-      "crowdActionId": "123456",
-      "fullName": "John Doe 2",
-      "avatar": "/avatar/123456.png",
-      "userId": "1234-1234-1234-1234-1234-1234",
-      "commitments": ["1234"],
-      "joinDate": "2024-01-01T00:00:00.000+00:00",
-      "dailyCheckIns": 10
-    }""";
-
-const participation3 = """{
-      "id": "123456789",
-      "crowdActionId": "123456",
-      "fullName": "Jane Doe",
-      "avatar": "/avatar/123456.png",
-      "userId": "1234-1234-1234-1234-1234",
-      "commitments": ["1234"],
-      "joinDate": "2024-01-01T00:00:00.000+00:00",
-      "dailyCheckIns": 10
-    }""";
-
-const participation4 = """{
-      "id": "123456789",
-      "crowdActionId": "123456",
-      "fullName": "Jane Doe 2",
-      "avatar": "/avatar/123456.png",
-      "userId": "1234-1234-1234-1234-1234-1234-1234",
-      "commitments": ["1234"],
-      "joinDate": "2024-01-01T00:00:00.000+00:00",
-      "dailyCheckIns": 10
-    }""";
-
-enum ParticipationFixtures {
-  PAGE_1_WITH_USER("""{
-  "pageInfo": {
-    "page": 1,
-    "pageSize": 2,
-    "totalPages": 2,
-    "totalItems": 4
-  },
-  "items": [
-    $participation2,
-    $participation1
-  ]
-}"""),
-
-  PAGE_1_WITH_USER_AS_FIRST("""{
-  "pageInfo": {
-    "page": 1,
-    "pageSize": 2,
-    "totalPages": 2,
-    "totalItems": 4
-  },
-  "items": [
-    $participation1,
-    $participation2
-  ]
-}"""),
-
-  PAGE_1_WITHOUT_USER("""{
-  "pageInfo": {
-    "page": 1,
-    "pageSize": 2,
-    "totalPages": 2,
-    "totalItems": 4
-  },
-  "items": [
-    $participation2,
-    $participation3
-  ]
-}"""),
-
-  PAGE_2_WITH_USER("""{
-  "pageInfo": {
-    "page": 2,
-    "pageSize": 2,
-    "totalPages": 2,
-    "totalItems": 4
-  },
-  "items": [
-    $participation2,
-    $participation1
-  ]
-}"""),
-
-  PAGE_2_WITHOUT_USER("""{
-  "pageInfo": {
-    "page": 2,
-    "pageSize": 2,
-    "totalPages": 2,
-    "totalItems": 4
-  },
-  "items": [
-    $participation2,
-    $participation3
-  ]
-}""");
-
-  final String json;
-
-  const ParticipationFixtures(this.json);
-}
diff --git a/test/infrastructure/participation/participation_repository_test.dart b/test/infrastructure/participation/participation_repository_test.dart
deleted file mode 100644
index 63e0dca4..00000000
--- a/test/infrastructure/participation/participation_repository_test.dart
+++ /dev/null
@@ -1,399 +0,0 @@
-import 'dart:convert';
-
-import 'package:collaction_app/domain/auth/i_auth_repository.dart';
-import 'package:collaction_app/domain/core/i_settings_repository.dart';
-import 'package:collaction_app/domain/user/user.dart';
-import 'package:collaction_app/infrastructure/participation/participation_dto.dart';
-import 'package:collaction_app/infrastructure/participation/participation_repository.dart';
-import 'package:dartz/dartz.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:http/http.dart';
-import 'package:mocktail/mocktail.dart';
-
-import '../../domain/core/i_settings_repository.mocks.dart';
-import '../../domain/user/user_fixture.dart';
-import '../../test_utilities.dart';
-import 'participation_repository_fixtures.dart';
-
-void main() {
-  late final IAuthRepository authRepository;
-  late final ISettingsRepository settingsRepository;
-  late final MockHttpClient client;
-  late final ParticipationRepository participationRepository;
-  const baseUrl = 'https://example.com';
-
-  setUpAll(() {
-    registerFallbackValue(Uri());
-
-    authRepository = MockAuthRepository();
-    settingsRepository = SettingsRepositoryMock();
-
-    when(() => settingsRepository.baseApiEndpointUrl)
-        .thenAnswer((invocation) => Future.value(baseUrl));
-
-    client = MockHttpClient();
-
-    participationRepository = ParticipationRepository(
-      client,
-      authRepository,
-      settingsRepository,
-    );
-  });
-
-  tearDown(() {
-    reset(client);
-    reset(authRepository);
-  });
-
-  group('[getParticipation]', () {
-    test('success', () async {
-      when(() => client.get(any(), headers: any(named: 'headers'))).thenAnswer(
-          (invocation) => Future.value(Response(participation1, 200)));
-
-      when(() => authRepository.getSignedInUser())
-          .thenAnswer((invocation) => Future.value(optionOf(User.anonymous)));
-
-      final participationOrFailure = await participationRepository
-          .getParticipation(crowdActionId: '123456');
-
-      expect(participationOrFailure.isRight(), true);
-    });
-
-    test('failure by 500', () async {
-      when(() => client.get(any(), headers: any(named: 'headers')))
-          .thenAnswer((invocation) => Future.value(Response('', 500)));
-
-      when(() => authRepository.getSignedInUser())
-          .thenAnswer((invocation) => Future.value(optionOf(User.anonymous)));
-
-      final participationOrFailure = await participationRepository
-          .getParticipation(crowdActionId: '123456');
-
-      expect(participationOrFailure.isLeft(), true);
-    });
-
-    test('failure', () async {
-      when(() => client.get(any(), headers: any(named: 'headers')))
-          .thenAnswer((invocation) => Future.value(Response('', 400)));
-
-      when(() => authRepository.getSignedInUser())
-          .thenAnswer((invocation) => Future.value(optionOf(User.anonymous)));
-
-      final participationOrFailure = await participationRepository
-          .getParticipation(crowdActionId: '123456');
-
-      expect(participationOrFailure.isLeft(), true);
-    });
-
-    test('failure by exception', () async {
-      when(() => client.get(any(), headers: any(named: 'headers'))).thenAnswer(
-          (invocation) => Future.value(Response(participation1, 200)));
-
-      when(() => authRepository.getSignedInUser())
-          .thenAnswer((invocation) => throw Exception());
-
-      final participationOrFailure = await participationRepository
-          .getParticipation(crowdActionId: '123456');
-
-      expect(participationOrFailure.isLeft(), true);
-    });
-  });
-
-  group('[toggleParticipation]', () {
-    test('success', () async {
-      when(() => client.post(any(),
-              body: any(named: 'body'), headers: any(named: 'headers')))
-          .thenAnswer((invocation) => Future.value(Response('', 200)));
-
-      when(() => authRepository.getSignedInUser())
-          .thenAnswer((invocation) => Future.value(optionOf(User.anonymous)));
-
-      final participationOrFailure = await participationRepository
-          .toggleParticipation(crowdActionId: '123456');
-
-      expect(participationOrFailure.isRight(), true);
-    });
-
-    test('failure', () async {
-      when(() => client.post(any(),
-              body: any(named: 'body'), headers: any(named: 'headers')))
-          .thenAnswer((invocation) => Future.value(Response('', 400)));
-
-      when(() => authRepository.getSignedInUser())
-          .thenAnswer((invocation) => Future.value(optionOf(User.anonymous)));
-
-      final participationOrFailure = await participationRepository
-          .toggleParticipation(crowdActionId: '123456');
-
-      expect(participationOrFailure.isLeft(), true);
-    });
-
-    test('failure by exception', () async {
-      when(() => client.post(any(),
-              body: any(named: 'body'), headers: any(named: 'headers')))
-          .thenAnswer((invocation) => Future.value(Response('', 200)));
-
-      when(() => authRepository.getSignedInUser())
-          .thenAnswer((invocation) => throw Exception());
-
-      final participationOrFailure = await participationRepository
-          .toggleParticipation(crowdActionId: '123456');
-
-      expect(participationOrFailure.isLeft(), true);
-    });
-  });
-
-  group('[getParticipations]', () {
-    final userParticipation = ParticipationDto.fromJson(
-      jsonDecode(participation1) as Map<String, dynamic>,
-    ).toDomain();
-
-    final user = cUser.copyWith(id: userParticipation.userId);
-
-    final Uri page1Uri = Uri.parse(
-      '$baseUrl/v1/participations?crowdActionId=${userParticipation.crowdActionId}&page=1',
-    );
-
-    final Uri page2Uri = Uri.parse(
-      '$baseUrl/v1/participations?crowdActionId=${userParticipation.crowdActionId}&page=2',
-    );
-
-    final Uri participationUri = Uri.parse(
-      '$baseUrl/v1/participations/${userParticipation.crowdActionId}',
-    );
-
-    setUp(() {
-      when(() => authRepository.getSignedInUser())
-          .thenAnswer((_) async => some(user));
-
-      when(() => authRepository.currentUser).thenAnswer((_) => user);
-    });
-
-    test(
-        'should prepend current user to top of participation list '
-        'when page 1 is loaded and user is not in participation list',
-        () async {
-      when(() => client.get(participationUri, headers: any(named: 'headers')))
-          .thenAnswer(
-              (invocation) => Future.value(Response(participation1, 200)));
-
-      when(
-        () => client.get(
-          page1Uri,
-          headers: any(named: 'headers'),
-        ),
-      ).thenAnswer(
-        (invocation) => Future.value(
-          Response(ParticipationFixtures.PAGE_1_WITHOUT_USER.json, 200),
-        ),
-      );
-
-      final paginatedParticipationsOrFailure = await participationRepository
-          .getParticipations(crowdActionId: userParticipation.crowdActionId);
-
-      expect(paginatedParticipationsOrFailure.isRight(), true);
-
-      final paginatedParticipations = paginatedParticipationsOrFailure.fold(
-        (l) => null,
-        (r) => r,
-      );
-      expect(paginatedParticipations, isNotNull);
-
-      expect(paginatedParticipations!.participations.length, 3);
-      expect(paginatedParticipations.participations.first, userParticipation);
-
-      verify(() => client.get(participationUri, headers: any(named: 'headers')))
-          .called(1);
-    });
-
-    test(
-        'should swap current user with user at top of participation list '
-        'when page 1 is loaded and user is in participation list', () async {
-      when(
-        () => client.get(
-          page1Uri,
-          headers: any(named: 'headers'),
-        ),
-      ).thenAnswer(
-        (invocation) => Future.value(
-          Response(ParticipationFixtures.PAGE_1_WITH_USER.json, 200),
-        ),
-      );
-
-      final paginatedParticipationsOrFailure = await participationRepository
-          .getParticipations(crowdActionId: userParticipation.crowdActionId);
-
-      expect(paginatedParticipationsOrFailure.isRight(), true);
-
-      final paginatedParticipations = paginatedParticipationsOrFailure.fold(
-        (l) => null,
-        (r) => r,
-      );
-      expect(paginatedParticipations, isNotNull);
-
-      expect(paginatedParticipations!.participations.length, 2);
-      expect(paginatedParticipations.participations.first, userParticipation);
-
-      verifyNever(
-        () => client.get(
-          participationUri,
-          headers: any(named: 'headers'),
-        ),
-      );
-    });
-
-    test(
-        'should keep current user at top of participation list '
-        'when page 1 is loaded and user is first in participation list',
-        () async {
-      when(
-        () => client.get(
-          page1Uri,
-          headers: any(named: 'headers'),
-        ),
-      ).thenAnswer(
-        (invocation) => Future.value(
-          Response(ParticipationFixtures.PAGE_1_WITH_USER_AS_FIRST.json, 200),
-        ),
-      );
-
-      final paginatedParticipationsOrFailure = await participationRepository
-          .getParticipations(crowdActionId: userParticipation.crowdActionId);
-
-      expect(paginatedParticipationsOrFailure.isRight(), true);
-
-      final paginatedParticipations = paginatedParticipationsOrFailure.fold(
-        (l) => null,
-        (r) => r,
-      );
-      expect(paginatedParticipations, isNotNull);
-
-      expect(paginatedParticipations!.participations.length, 2);
-      expect(paginatedParticipations.participations.first, userParticipation);
-
-      verifyNever(
-        () => client.get(
-          participationUri,
-          headers: any(named: 'headers'),
-        ),
-      );
-    });
-
-    test(
-        'should remove current user from participation list '
-        'when page N>1 is loaded and user is in participation list', () async {
-      when(
-        () => client.get(
-          page2Uri,
-          headers: any(named: 'headers'),
-        ),
-      ).thenAnswer(
-        (invocation) => Future.value(
-          Response(ParticipationFixtures.PAGE_2_WITH_USER.json, 200),
-        ),
-      );
-
-      final paginatedParticipationsOrFailure =
-          await participationRepository.getParticipations(
-        crowdActionId: userParticipation.crowdActionId,
-        pageNumber: 2,
-      );
-
-      expect(paginatedParticipationsOrFailure.isRight(), true);
-
-      final paginatedParticipations = paginatedParticipationsOrFailure.fold(
-        (l) => null,
-        (r) => r,
-      );
-      expect(paginatedParticipations, isNotNull);
-
-      expect(paginatedParticipations!.participations.length, 1);
-      expect(
-        paginatedParticipations.participations.contains(userParticipation),
-        false,
-      );
-
-      verifyNever(
-        () => client.get(
-          participationUri,
-          headers: any(named: 'headers'),
-        ),
-      );
-    });
-
-    test('failure', () async {
-      when(() => client.get(any(), headers: any(named: 'headers')))
-          .thenAnswer((invocation) => Future.value(Response('', 400)));
-
-      final paginatedParticipationsOrFailure = await participationRepository
-          .getParticipations(crowdActionId: '123456');
-
-      expect(paginatedParticipationsOrFailure.isLeft(), true);
-
-      final paginatedParticipations =
-          paginatedParticipationsOrFailure.fold((l) => null, (r) => r);
-      expect(paginatedParticipations, isNull);
-    });
-
-    test('failure by exception', () async {
-      when(() => client.get(any(), headers: any(named: 'headers')))
-          .thenAnswer((invocation) => throw Exception());
-
-      final paginatedParticipationsOrFailure = await participationRepository
-          .getParticipations(crowdActionId: '123456');
-
-      expect(paginatedParticipationsOrFailure.isLeft(), true);
-
-      final paginatedParticipations =
-          paginatedParticipationsOrFailure.fold((l) => null, (r) => r);
-      expect(paginatedParticipations, isNull);
-    });
-  });
-
-  group('[getTopParticipants]', () {
-    test('success', () async {
-      when(() => client.get(any(), headers: any(named: 'headers'))).thenAnswer(
-          (invocation) => Future.value(
-              Response(ParticipationFixtures.PAGE_1_WITH_USER.json, 200)));
-
-      final participationsOrFailure = await participationRepository
-          .getTopParticipants(crowdActionId: '123456');
-
-      expect(participationsOrFailure.isRight(), true);
-
-      final participations =
-          participationsOrFailure.fold((l) => null, (r) => r);
-      expect(participations, isNotNull);
-
-      expect(participations!.length, 2);
-    });
-
-    test('failure', () async {
-      when(() => client.get(any(), headers: any(named: 'headers')))
-          .thenAnswer((invocation) => Future.value(Response('', 400)));
-
-      final participationsOrFailure = await participationRepository
-          .getTopParticipants(crowdActionId: '123456');
-
-      expect(participationsOrFailure.isLeft(), true);
-
-      final participations =
-          participationsOrFailure.fold((l) => null, (r) => r);
-      expect(participations, isNull);
-    });
-
-    test('failure by exception', () async {
-      when(() => client.get(any(), headers: any(named: 'headers')))
-          .thenAnswer((invocation) => throw Exception());
-
-      final participationsOrFailure = await participationRepository
-          .getTopParticipants(crowdActionId: '123456');
-
-      expect(participationsOrFailure.isLeft(), true);
-
-      final participations =
-          participationsOrFailure.fold((l) => null, (r) => r);
-      expect(participations, isNull);
-    });
-  });
-}
diff --git a/test/presentation/core/ionicons_utils_test.dart b/test/presentation/core/ionicons_utils_test.dart
deleted file mode 100644
index 449a67e4..00000000
--- a/test/presentation/core/ionicons_utils_test.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-import 'package:collaction_app/presentation/core/collaction_icons.dart';
-import 'package:collaction_app/presentation/core/ionicons_utils.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:ionicons/ionicons.dart';
-
-void main() {
-  group('IonIcons Utils tests', () {
-    test('does exist', () {
-      final icon = IconUtil.fromString('accessibility-outline');
-      expect(icon, Ionicons.accessibility_outline);
-    });
-
-    test('does not exist', () {
-      final icon = IconUtil.fromString('collaction-no-icon');
-      expect(icon, CollactionIcons.collaction);
-    });
-  });
-}
diff --git a/test/presentation/crowdaction/crowdaction_details/confirm_participation_test.dart b/test/presentation/crowdaction/crowdaction_details/confirm_participation_test.dart
index fc1e4820..168d6202 100644
--- a/test/presentation/crowdaction/crowdaction_details/confirm_participation_test.dart
+++ b/test/presentation/crowdaction/crowdaction_details/confirm_participation_test.dart
@@ -88,7 +88,7 @@ void main() {
         stackRouter,
         participationBloc,
         tCrowdaction,
-        [tCommitment],
+        [tCommitmentOption],
       );
       await tester.pumpAndSettle();
 
@@ -111,7 +111,7 @@ void main() {
         stackRouter,
         participationBloc,
         tCrowdaction,
-        List.filled(3, tCommitment),
+        List.filled(3, tCommitmentOption),
       );
       await tester.pumpAndSettle();
 
@@ -128,7 +128,7 @@ void main() {
     testWidgets(
         'on Confirm, adds toggleParticipation event to Participation Bloc',
         (WidgetTester tester) async {
-      final selectedCommitments = List.filled(3, tCommitment);
+      final selectedCommitments = List.filled(3, tCommitmentOption);
 
       await tester.pumpConfirmParticipation(
         stackRouter,
@@ -142,7 +142,7 @@ void main() {
         () => participationBloc.add(
           ParticipationEvent.toggleParticipation(
             crowdActionId: tCrowdaction.id,
-            commitments: selectedCommitments.map((c) => c.id).toList(),
+            commitmentOptions: selectedCommitments.map((c) => c.id).toList(),
           ),
         ),
       );
diff --git a/test/presentation/crowdaction/crowdaction_details/confirm_participation_test.ext.dart b/test/presentation/crowdaction/crowdaction_details/confirm_participation_test.ext.dart
index 45ea656f..f8584292 100644
--- a/test/presentation/crowdaction/crowdaction_details/confirm_participation_test.ext.dart
+++ b/test/presentation/crowdaction/crowdaction_details/confirm_participation_test.ext.dart
@@ -5,7 +5,7 @@ extension WidgetX on WidgetTester {
       StackRouter stackRouter,
       ParticipationBloc participationBloc,
       CrowdAction crowdAction,
-      List<Commitment> selectedCommitments) async {
+      List<CommitmentOption> selectedCommitments) async {
     await pumpWidget(
       BlocProvider(
         create: (_) => participationBloc,
diff --git a/test/presentation/home/home_screen_test.dart b/test/presentation/home/home_screen_test.dart
deleted file mode 100644
index 6f8b6cdf..00000000
--- a/test/presentation/home/home_screen_test.dart
+++ /dev/null
@@ -1,62 +0,0 @@
-import 'package:collaction_app/application/crowdaction/spotlight/spotlight_bloc.dart';
-import 'package:collaction_app/domain/core/i_settings_repository.dart';
-import 'package:collaction_app/domain/crowdaction/crowdaction_failures.dart';
-import 'package:collaction_app/presentation/home/home_screen.dart';
-import 'package:collaction_app/presentation/routes/app_routes.gr.dart';
-import 'package:dartz/dartz.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:get_it/get_it.dart';
-import 'package:mocktail/mocktail.dart';
-
-import '../../test_helper.dart';
-import '../../test_utilities.dart';
-
-void main() {
-  late final AppRouter appRouter;
-  late final MockSettingsRepository settingsRepository;
-  late final MockCrowdActionRepository crowdActionRepository;
-  late SpotlightBloc spotlightBloc;
-
-  setUpAll(() {
-    appRouter = AppRouter();
-    settingsRepository = MockSettingsRepository();
-    crowdActionRepository = MockCrowdActionRepository();
-    spotlightBloc = SpotlightBloc(crowdActionRepository);
-
-    GetIt.I.registerSingleton<SpotlightBloc>(spotlightBloc);
-    GetIt.I.registerSingleton<ISettingsRepository>(settingsRepository);
-
-    when(() => crowdActionRepository.getSpotlightCrowdActions()).thenAnswer(
-        (invocation) => Future.value(left(CrowdActionFailure.serverError())));
-  });
-
-  tearDownAll(() {
-    GetIt.I.unregister<SpotlightBloc>();
-    GetIt.I.unregister<ISettingsRepository>();
-  });
-
-  tearDown(() {
-    GetIt.I.unregister<SpotlightBloc>();
-    spotlightBloc = SpotlightBloc(crowdActionRepository);
-    GetIt.I.registerSingleton<SpotlightBloc>(spotlightBloc);
-  });
-
-  testWidgets('can render', (tester) async {
-    when(() => settingsRepository.getWasUserOnboarded())
-        .thenAnswer((_) => Future.value(true));
-
-    await buildAndPump(
-      tester: tester,
-      widget: MaterialApp.router(
-        color: Colors.white,
-        title: 'CollAction',
-        routerDelegate: appRouter.delegate(),
-        routeInformationParser: appRouter.defaultRouteParser(),
-      ),
-    );
-    await tester.pumpAndSettle();
-
-    expect(find.byType(HomePage), findsOneWidget);
-  });
-}
diff --git a/test/presentation/home/widgets/password_modal_test.dart b/test/presentation/home/widgets/password_modal_test.dart
index 5c65446a..7a7155c6 100644
--- a/test/presentation/home/widgets/password_modal_test.dart
+++ b/test/presentation/home/widgets/password_modal_test.dart
@@ -99,36 +99,35 @@ void main() {
       },
     );
 
-    // TODO: Fix test
-    // testWidgets(
-    //   'correct password calls router.popAndPush, redirects to CrowdActionDetailsRoute',
-    //   (WidgetTester tester) async {
-    //     await buildAndPump(
-    //       tester: tester,
-    //       widget: PasswordModal(crowdAction: tCrowdaction)
-    //           .withRouterScope(stackRouter),
-    //     );
-    //     await tester.pumpAndSettle();
-
-    //     await tester.enterText(find.byType(TextField), 'testPwd');
-    //     await tester.testTextInput.receiveAction(TextInputAction.done);
-    //     await tester.pumpAndSettle();
-
-    //     verify(
-    //       () => iSettingsRepository.addCrowdActionAccess(
-    //           crowdActionId: tCrowdaction.id),
-    //     ).called(1);
-
-    //     final capturedRoutes =
-    //         verify(() => stackRouter.popAndPush(captureAny())).captured;
-    //     expect(capturedRoutes.length, 1);
-    //     expect(capturedRoutes.first, isA<CrowdActionDetailsRoute>());
-
-    //     final route = capturedRoutes.first as CrowdActionDetailsRoute;
-    //     expect(route.args?.crowdAction, tCrowdaction);
-    //     expect(route.args?.crowdActionId, null);
-    //   },
-    // );
+    testWidgets(
+      'correct password calls router.replace, redirects to CrowdActionDetailsRoute',
+      (WidgetTester tester) async {
+        await buildAndPump(
+          tester: tester,
+          widget: PasswordModal(crowdAction: tCrowdaction)
+              .withRouterScope(stackRouter),
+        );
+        await tester.pumpAndSettle();
+
+        await tester.enterText(find.byType(TextField), 'testPwd');
+        await tester.testTextInput.receiveAction(TextInputAction.done);
+        await tester.pumpAndSettle();
+
+        verify(
+          () => iSettingsRepository.addCrowdActionAccess(
+              crowdActionId: tCrowdaction.id),
+        ).called(1);
+
+        final capturedRoutes =
+            verify(() => stackRouter.replace(captureAny())).captured;
+        expect(capturedRoutes.length, 1);
+        expect(capturedRoutes.first, isA<CrowdActionDetailsRoute>());
+
+        final route = capturedRoutes.first as CrowdActionDetailsRoute;
+        expect(route.args?.crowdAction, tCrowdaction);
+        expect(route.args?.crowdActionId, null);
+      },
+    );
 
     testWidgets(
       'showPasswordModal works when unverified',
@@ -141,8 +140,7 @@ void main() {
             ),
           ),
         );
-        PasswordModal.show(
-            tester.element(find.byType(Container)), tCrowdaction);
+        showPasswordModal(tester.element(find.byType(Container)), tCrowdaction);
         await tester.pumpAndSettle();
 
         expect(find.byType(PasswordModal), findsOneWidget);
@@ -164,12 +162,7 @@ void main() {
             ),
           ).withRouterScope(stackRouter),
         );
-
-        PasswordModal.show(
-          tester.element(find.byType(Container)),
-          tCrowdaction,
-        );
-
+        showPasswordModal(tester.element(find.byType(Container)), tCrowdaction);
         await tester.pumpAndSettle();
 
         final capturedRoutes =
diff --git a/test/presentation/settings/build_information_tile_test.dart b/test/presentation/menu/build_information_tile_test.dart
similarity index 93%
rename from test/presentation/settings/build_information_tile_test.dart
rename to test/presentation/menu/build_information_tile_test.dart
index b9d4b315..38b45191 100644
--- a/test/presentation/settings/build_information_tile_test.dart
+++ b/test/presentation/menu/build_information_tile_test.dart
@@ -1,5 +1,5 @@
 import 'package:collaction_app/domain/settings/build_information.dart';
-import 'package:collaction_app/presentation/settings/widgets/build_information_tile.dart';
+import 'package:collaction_app/presentation/menu/widgets/build_information_tile.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 import '../../test_helper.dart';
diff --git a/test/presentation/profile/commitments_tab_fixtures.dart b/test/presentation/profile/commitments_tab_fixtures.dart
index 3c22518c..499df5c2 100644
--- a/test/presentation/profile/commitments_tab_fixtures.dart
+++ b/test/presentation/profile/commitments_tab_fixtures.dart
@@ -8,13 +8,15 @@ final user = User(
 
 final crowdAction = CrowdAction(
   id: 'id',
+  type: 'type',
   title: 'title',
   description: 'description',
   category: 'category',
   location: Location(code: 'NL', name: 'The Netherlands'),
-  commitments: [
-    Commitment(
+  commitmentOptions: [
+    CommitmentOption(
       id: 'id',
+      type: 'type',
       label: 'label',
       points: 10,
       blocks: [],
diff --git a/test/presentation/profile/profile_screen_test.dart b/test/presentation/profile/profile_screen_test.dart
deleted file mode 100644
index 3de6e058..00000000
--- a/test/presentation/profile/profile_screen_test.dart
+++ /dev/null
@@ -1,164 +0,0 @@
-import 'package:collaction_app/application/auth/auth_bloc.dart';
-import 'package:collaction_app/application/crowdaction/spotlight/spotlight_bloc.dart';
-import 'package:collaction_app/application/user/profile/profile_bloc.dart';
-import 'package:collaction_app/application/user/profile_tab/profile_tab_bloc.dart';
-import 'package:collaction_app/domain/core/i_settings_repository.dart';
-import 'package:collaction_app/domain/crowdaction/crowdaction_failures.dart';
-import 'package:collaction_app/domain/profile/profile.dart';
-import 'package:collaction_app/domain/profile/user_profile.dart';
-import 'package:collaction_app/domain/user/user.dart';
-import 'package:collaction_app/presentation/core/collaction_icons.dart';
-import 'package:collaction_app/presentation/home/home_screen.dart';
-import 'package:collaction_app/presentation/profile/profile_screen.dart';
-import 'package:collaction_app/presentation/routes/app_routes.gr.dart';
-import 'package:dartz/dartz.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:get_it/get_it.dart';
-import 'package:mocktail/mocktail.dart';
-
-import '../../application/auth/auth_bloc.mocks.dart';
-import '../../test_helper.dart';
-import '../../test_utilities.dart';
-
-void main() {
-  late final AppRouter appRouter;
-  late final MockSettingsRepository settingsRepository;
-  late final MockCrowdActionRepository crowdActionRepository;
-  late final MockProfileRepository profileRepository;
-  late final MockAvatarRepository avatarRepository;
-  late ProfileTabBloc profileTabBloc;
-  late SpotlightBloc spotlightBloc;
-  late ProfileBloc profileBloc;
-  late MockAuthBloc authBloc;
-
-  setUpAll(() {
-    appRouter = AppRouter();
-    settingsRepository = MockSettingsRepository();
-    crowdActionRepository = MockCrowdActionRepository();
-    profileRepository = MockProfileRepository();
-    avatarRepository = MockAvatarRepository();
-    authBloc = MockAuthBloc();
-    spotlightBloc = SpotlightBloc(crowdActionRepository);
-    profileBloc = ProfileBloc(profileRepository, avatarRepository);
-    profileTabBloc = ProfileTabBloc(crowdActionRepository);
-
-    GetIt.I.registerSingleton<ProfileBloc>(profileBloc);
-    GetIt.I.registerSingleton<ProfileTabBloc>(profileTabBloc);
-    GetIt.I.registerSingleton<AuthBloc>(authBloc);
-    GetIt.I.registerSingleton<SpotlightBloc>(spotlightBloc);
-    GetIt.I.registerSingleton<ISettingsRepository>(settingsRepository);
-
-    when(() => crowdActionRepository.getSpotlightCrowdActions()).thenAnswer(
-        (invocation) => Future.value(left(CrowdActionFailure.serverError())));
-
-    when(() => crowdActionRepository.getCrowdActionsForUser()).thenAnswer(
-        (invocation) => Future.value(left(CrowdActionFailure.serverError())));
-  });
-
-  tearDownAll(() {
-    GetIt.I.unregister<ProfileBloc>();
-    GetIt.I.unregister<ProfileTabBloc>();
-    GetIt.I.unregister<AuthBloc>();
-    GetIt.I.unregister<SpotlightBloc>();
-    GetIt.I.unregister<ISettingsRepository>();
-  });
-
-  tearDown(() {
-    GetIt.I.unregister<ProfileBloc>();
-    GetIt.I.unregister<ProfileTabBloc>();
-    GetIt.I.unregister<SpotlightBloc>();
-
-    profileBloc = ProfileBloc(profileRepository, avatarRepository);
-    profileTabBloc = ProfileTabBloc(crowdActionRepository);
-    spotlightBloc = SpotlightBloc(crowdActionRepository);
-
-    GetIt.I.registerSingleton<ProfileBloc>(profileBloc);
-    GetIt.I.registerSingleton<ProfileTabBloc>(profileTabBloc);
-    GetIt.I.registerSingleton<SpotlightBloc>(spotlightBloc);
-  });
-
-  testWidgets('navigate to profile screen', (tester) async {
-    when(() => settingsRepository.getWasUserOnboarded())
-        .thenAnswer((_) => Future.value(true));
-
-    await buildAndPump(
-      tester: tester,
-      widget: MultiBlocProvider(
-        providers: [
-          BlocProvider<ProfileBloc>(create: (context) => profileBloc),
-          BlocProvider<ProfileTabBloc>(create: (context) => profileTabBloc),
-        ],
-        child: MaterialApp.router(
-          color: Colors.white,
-          title: 'CollAction',
-          routerDelegate: appRouter.delegate(),
-          routeInformationParser: appRouter.defaultRouteParser(),
-        ),
-      ),
-    );
-    await tester.pumpAndSettle();
-
-    expect(find.byType(HomePage), findsOneWidget);
-
-    await tester.tap(find.byIcon(CollactionIcons.user));
-    await tester.pumpAndSettle();
-
-    expect(find.byType(UserProfilePage), findsOneWidget);
-  });
-
-  testWidgets('profile screen no user', (tester) async {
-    await buildAndPump(
-      tester: tester,
-      widget: MultiBlocProvider(
-        providers: [
-          BlocProvider<ProfileBloc>(create: (context) => profileBloc),
-          BlocProvider<ProfileTabBloc>(create: (context) => profileTabBloc),
-        ],
-        child: UserProfilePage(),
-      ),
-    );
-    await tester.pumpAndSettle();
-
-    expect(find.byType(UserProfilePage), findsOneWidget);
-  });
-
-  testWidgets('profile screen w/ user', (tester) async {
-    when(() => profileRepository.getUserProfile()).thenAnswer(
-      (_) => Future.value(
-        right(
-          UserProfile(
-            user: User.anonymous,
-            profile: Profile(
-              userId: 'userId',
-              firstName: 'firstName',
-              lastName: 'lastName',
-              avatar: 'avatar',
-              bio: 'bio',
-            ),
-          ),
-        ),
-      ),
-    );
-
-    await buildAndPump(
-      tester: tester,
-      widget: MultiBlocProvider(
-        providers: [
-          BlocProvider<ProfileBloc>(create: (context) => profileBloc),
-          BlocProvider<ProfileTabBloc>(create: (context) => profileTabBloc),
-        ],
-        child: UserProfilePage(),
-      ),
-    );
-    await tester.pumpAndSettle();
-
-    expect(find.byType(UserProfilePage), findsOneWidget);
-
-    profileBloc.add(EditBio());
-    await tester.pumpAndSettle();
-
-    expect(profileBloc.state.isBioEditing, true);
-  });
-}
diff --git a/test/presentation/settings/settings_layout_test.dart b/test/presentation/settings/settings_layout_test.dart
deleted file mode 100644
index bdf4dfe0..00000000
--- a/test/presentation/settings/settings_layout_test.dart
+++ /dev/null
@@ -1,45 +0,0 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:collaction_app/presentation/settings/settings_layout.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:mocktail/mocktail.dart';
-
-import '../router.mocks.dart';
-
-part 'settings_layout_test.ext.dart';
-
-void main() {
-  late StackRouter stackRouter;
-
-  setUpAll(() {
-    stackRouter = RouteHelpers.setUpRouterStubs();
-  });
-
-  group('SettingsLayout tests:', () {
-    testWidgets('can render', (WidgetTester tester) async {
-      await tester.pumpSettingsLayout(stackRouter);
-      await tester.pumpAndSettle();
-
-      expect(find.byType(SettingsLayout), findsOneWidget);
-    });
-
-    testWidgets('back ElevatedButton works', (WidgetTester tester) async {
-      await tester.pumpSettingsLayout(stackRouter);
-      await tester.pumpAndSettle();
-
-      await tester.tap(find.byType(ElevatedButton));
-      final capturedPops = verify(() => stackRouter.pop()).callCount;
-
-      expect(capturedPops, 1);
-    });
-
-    testWidgets('back RawMaterialButton works', (WidgetTester tester) async {
-      await tester.pumpSettingsLayout(stackRouter);
-      await tester.pumpAndSettle();
-
-      await tester.tap(find.byType(RawMaterialButton));
-      final capturedPops = verify(() => stackRouter.pop());
-      expect(capturedPops.callCount, 1);
-    });
-  });
-}
diff --git a/test/presentation/settings/settings_layout_test.ext.dart b/test/presentation/settings/settings_layout_test.ext.dart
deleted file mode 100644
index 3998c210..00000000
--- a/test/presentation/settings/settings_layout_test.ext.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-part of 'settings_layout_test.dart';
-
-extension WidgetX on WidgetTester {
-  Future<void> pumpSettingsLayout([
-    StackRouter? stackRouter,
-  ]) async {
-    await pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: SettingsLayout(),
-        ),
-      ).withRouterScope(stackRouter),
-    );
-  }
-}
diff --git a/test/presentation/settings/settings_list_tile_test.dart b/test/presentation/settings/settings_list_tile_test.dart
deleted file mode 100644
index 0a5db946..00000000
--- a/test/presentation/settings/settings_list_tile_test.dart
+++ /dev/null
@@ -1,28 +0,0 @@
-import 'package:collaction_app/presentation/settings/widgets/settings_list_tile.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-import '../../test_helper.dart';
-
-void main() {
-  group('SettingsListTile tests', () {
-    testWidgets('onTap', (WidgetTester tester) async {
-      int counter = 0;
-
-      await buildAndPump(
-        tester: tester,
-        widget: SettingsListTile(
-          title: 'title',
-          icon: Icons.abc,
-          onTap: () => counter++,
-        ),
-      );
-
-      await tester.pumpAndSettle();
-
-      expect(counter, 0);
-      await tester.tap(find.byType(SettingsListTile));
-      expect(counter, 1);
-    });
-  });
-}
diff --git a/test/presentation/settings/settings_screen_test.dart b/test/presentation/settings/settings_screen_test.dart
deleted file mode 100644
index 6e87405a..00000000
--- a/test/presentation/settings/settings_screen_test.dart
+++ /dev/null
@@ -1,262 +0,0 @@
-import 'dart:io';
-
-import 'package:auto_route/auto_route.dart';
-import 'package:collaction_app/application/auth/auth_bloc.dart';
-import 'package:collaction_app/application/settings/build_information/build_information_bloc.dart';
-import 'package:collaction_app/application/user/profile/profile_bloc.dart';
-import 'package:collaction_app/domain/settings/build_information.dart';
-import 'package:collaction_app/infrastructure/core/injection.dart';
-import 'package:collaction_app/presentation/routes/app_routes.gr.dart';
-import 'package:collaction_app/presentation/settings/settings_screen.dart';
-import 'package:collaction_app/presentation/settings/widgets/build_information_tile.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:get_it/get_it.dart';
-import 'package:mocktail/mocktail.dart';
-
-import '../../application/auth/auth_bloc.mocks.dart';
-import '../../application/settings/build_information_bloc.mocks.dart';
-import '../../application/user/profile/profile_bloc.mocks.dart';
-import '../../utils/user.fixtures.dart';
-import '../router.mocks.dart';
-
-part 'settings_screen_test.ext.dart';
-
-void main() {
-  late StackRouter stackRouter;
-  late AuthBloc authBloc;
-  late ProfileBloc profileBloc;
-  late BuildInformationBloc buildInformationBloc;
-
-  final channels = [
-    MethodChannel(
-      Platform.isLinux
-          ? 'plugins.flutter.io/url_launcher_linux'
-          : Platform.isWindows
-              ? 'plugins.flutter.io/url_launcher_windows'
-              : 'plugins.flutter.io/url_launcher_macos',
-    ),
-    MethodChannel('plugins.flutter.io/url_launcher')
-  ];
-
-  setUp(() async {
-    for (final channel in channels) {
-      channel.setMockMethodCallHandler((MethodCall methodCall) async {
-        return methodCall.method == 'canLaunch' ? true : null;
-      });
-    }
-  });
-
-  tearDown(() {
-    for (final channel in channels) {
-      channel.setMockMethodCallHandler(null);
-    }
-  });
-
-  setUpAll(() {
-    stackRouter = RouteHelpers.setUpRouterStubs();
-
-    // Auth Bloc
-    authBloc = MockAuthBloc();
-    when(() => authBloc.state).thenAnswer((_) => AuthState.initial());
-    GetIt.I.registerSingleton<AuthBloc>(authBloc);
-
-    // Profile Bloc
-    profileBloc = MockProfileBloc();
-    when(() => profileBloc.state).thenAnswer((_) => ProfileState.initial());
-    GetIt.I.registerSingleton<ProfileBloc>(profileBloc);
-    registerFallbackValue(GetUserProfile());
-
-    // Build Information Bloc
-    buildInformationBloc = MockBuildInformationBloc();
-    when(() => buildInformationBloc.state).thenAnswer(
-      (_) => BuildInformationState.fetched(
-        BuildInformation(
-          buildNumber: 'tBuildNumber',
-          version: 'tVersion',
-        ),
-      ),
-    );
-    GetIt.I.registerSingleton<BuildInformationBloc>(buildInformationBloc);
-  });
-
-  tearDownAll(() {
-    GetIt.I.unregister<AuthBloc>();
-    GetIt.I.unregister<ProfileBloc>();
-    GetIt.I.unregister<BuildInformationBloc>();
-  });
-
-  group('SettingsPage tests:', () {
-    testWidgets('can render', (WidgetTester tester) async {
-      await tester.pumpSettingsPage(stackRouter);
-      await tester.pumpAndSettle();
-
-      expect(find.byType(SettingsPage), findsOneWidget);
-    });
-
-    testWidgets('onTap, "Contact Us" button routes to ContactForm',
-        (WidgetTester tester) async {
-      await tester.pumpSettingsPage(stackRouter);
-      await tester.pumpAndSettle();
-
-      await tester.tap(find.text('Contact us'));
-      final capturedRoutes = verify(
-        () => stackRouter.push(captureAny()),
-      ).captured;
-
-      expect(capturedRoutes.length, 1);
-      expect(capturedRoutes.first, isA<ContactFormRoute>());
-    });
-
-    testWidgets('onTap, "Onboarding" button routes to Onboarding',
-        (WidgetTester tester) async {
-      await tester.pumpSettingsPage(stackRouter);
-      await tester.pumpAndSettle();
-
-      await tester.tap(find.text('Onboarding'));
-      final capturedRoutes = verify(
-        () => stackRouter.push(captureAny()),
-      ).captured;
-
-      expect(capturedRoutes.length, 1);
-      expect(capturedRoutes.first, isA<OnboardingRoute>());
-    });
-
-    testWidgets('onTap, "Open source libraries" button routes to Licenses',
-        (WidgetTester tester) async {
-      await tester.pumpSettingsPage(stackRouter);
-      await tester.pumpAndSettle();
-
-      await tester.tap(find.text('Open source libraries'));
-      final capturedRoutes = verify(
-        () => stackRouter.push(captureAny()),
-      ).captured;
-
-      expect(capturedRoutes.length, 1);
-      expect(capturedRoutes.first, isA<LicensesRoute>());
-    });
-
-    testWidgets('onTap, "Terms of use" button opens terms webpage',
-        (WidgetTester tester) async {
-      await tester.pumpSettingsPage(stackRouter);
-      await tester.pumpAndSettle();
-
-      await tester.runAsync(() async {
-        await tester.tap(find.text('Terms of use'));
-        await tester.pumpAndSettle();
-      });
-
-      final capturedRoutes = verify(
-        () => stackRouter.push(captureAny()),
-      ).captured;
-
-      expect(capturedRoutes.length, 1);
-      expect(capturedRoutes.first, isA<WebViewRoute>());
-
-      final route = capturedRoutes.first as WebViewRoute;
-      expect(route.args?.url, 'https://www.collaction.org/terms');
-    });
-
-    testWidgets('onTap, "Privacy policy" button opens privacy webpage',
-        (WidgetTester tester) async {
-      await tester.pumpSettingsPage(stackRouter);
-      await tester.pumpAndSettle();
-
-      await tester.runAsync(() async {
-        await tester.scrollUntilVisible(
-          find.text(
-            'Privacy policy',
-            skipOffstage: false,
-          ),
-          15,
-        );
-        await tester.tap(find.text('Privacy policy'));
-        await tester.pumpAndSettle();
-      });
-
-      final capturedRoutes = verify(
-        () => stackRouter.push(captureAny()),
-      ).captured;
-
-      expect(capturedRoutes.length, 1);
-      expect(capturedRoutes.first, isA<WebViewRoute>());
-
-      final route = capturedRoutes.first as WebViewRoute;
-      expect(route.args?.url, 'https://www.collaction.org/privacy');
-    });
-
-    testWidgets('"Log out" button not available when not logged in',
-        (WidgetTester tester) async {
-      await tester.pumpSettingsPage(stackRouter);
-      await tester.pumpAndSettle();
-
-      expect(
-        find.text(
-          'Log out',
-          skipOffstage: false,
-        ),
-        findsNothing,
-      );
-    });
-
-    testWidgets('onTap, "Log out" button starts logout event',
-        (WidgetTester tester) async {
-      when(() => profileBloc.state)
-          .thenAnswer((_) => ProfileState(userProfile: testUserProfile));
-
-      await tester.pumpSettingsPage(stackRouter);
-      await tester.pumpAndSettle();
-
-      await tester.scrollUntilVisible(
-        find.text(
-          'Log out',
-          skipOffstage: false,
-        ),
-        15,
-      );
-      await tester.tap(find.text('Log out'));
-
-      final capturedPops = verify(() => stackRouter.pop());
-      expect(capturedPops.callCount, 1);
-
-      verify(() => authBloc.add(AuthEvent.signedOut()));
-
-      final profileEvents = verify(() => profileBloc.add(any()));
-      expect(profileEvents.callCount, 1);
-    });
-
-    testWidgets('BuildInformationTile renders when fetched',
-        (WidgetTester tester) async {
-      await tester.pumpSettingsPage(stackRouter);
-      await tester.pumpAndSettle();
-
-      expect(
-        find.byType(
-          BuildInformationTile,
-          skipOffstage: false,
-        ),
-        findsOneWidget,
-      );
-    });
-
-    testWidgets('BuildInformationTile does not render when loading',
-        (WidgetTester tester) async {
-      when(() => buildInformationBloc.state).thenAnswer(
-        (_) => BuildInformationState.loading(),
-      );
-
-      await tester.pumpSettingsPage(stackRouter);
-      await tester.pumpAndSettle();
-
-      expect(
-        find.byType(
-          BuildInformationTile,
-          skipOffstage: false,
-        ),
-        findsNothing,
-      );
-    });
-  });
-}
diff --git a/test/presentation/settings/settings_screen_test.ext.dart b/test/presentation/settings/settings_screen_test.ext.dart
deleted file mode 100644
index ff0d65bf..00000000
--- a/test/presentation/settings/settings_screen_test.ext.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-part of 'settings_screen_test.dart';
-
-extension WidgetX on WidgetTester {
-  Future<void> pumpSettingsPage([
-    StackRouter? stackRouter,
-  ]) async {
-    await pumpWidget(
-      MaterialApp(
-        home: Scaffold(
-          body: MultiBlocProvider(
-            providers: [
-              BlocProvider<AuthBloc>(
-                create: (_) => getIt<AuthBloc>(),
-              ),
-              BlocProvider<ProfileBloc>(
-                create: (_) => getIt<ProfileBloc>(),
-              ),
-            ],
-            child: SettingsPage(),
-          ),
-        ),
-      ).withRouterScope(stackRouter),
-    );
-  }
-}
diff --git a/test/presentation/settings/share_collaction_list_tile_test.dart b/test/presentation/settings/share_collaction_list_tile_test.dart
deleted file mode 100644
index 8febe882..00000000
--- a/test/presentation/settings/share_collaction_list_tile_test.dart
+++ /dev/null
@@ -1,40 +0,0 @@
-import 'package:collaction_app/presentation/settings/widgets/share_collaction_list_tile.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-import '../../test_helper.dart';
-
-void main() {
-  group('ShareCollActionListTile tests', () {
-    testWidgets('can render', (WidgetTester tester) async {
-      await buildAndPump(tester: tester, widget: ShareCollactionListTile());
-      await tester.pumpAndSettle();
-
-      expect(find.byType(ShareCollactionListTile), findsOneWidget);
-    });
-
-    testWidgets('state', (WidgetTester tester) async {
-      await buildAndPump(tester: tester, widget: ShareCollactionListTile());
-      await tester.pumpAndSettle();
-
-      expect(find.byType(ShareCollactionListTile), findsOneWidget);
-
-      await tester.tap(find.byType(ShareCollactionListTile));
-      await tester.pumpAndSettle(const Duration(seconds: 1));
-    });
-
-    testWidgets('onFocusChange', (WidgetTester tester) async {
-      final ShareCollactionListTile shareCollactionButton =
-          ShareCollactionListTile();
-
-      await buildAndPump(tester: tester, widget: shareCollactionButton);
-      await tester.pumpAndSettle();
-
-      final state = tester.state<ShareCollactionListTileState>(
-        find.byType(ShareCollactionListTile),
-      );
-
-      state.onFocusChange(true);
-      state.onFocusChange(false);
-    });
-  });
-}
diff --git a/test/presentation/shared_widgets/commitment_card_fixtures.dart b/test/presentation/shared_widgets/commitment_card_fixtures.dart
index e83b1933..2530ccc8 100644
--- a/test/presentation/shared_widgets/commitment_card_fixtures.dart
+++ b/test/presentation/shared_widgets/commitment_card_fixtures.dart
@@ -1,7 +1,8 @@
 import 'package:collaction_app/domain/crowdaction/crowdaction.dart';
 
-final commitment = Commitment(
+final commitmentOption = CommitmentOption(
   id: 'id',
+  type: 'type',
   description: 'description',
   label: 'label',
   points: 10,
diff --git a/test/presentation/shared_widgets/commitment_card_list_test.dart b/test/presentation/shared_widgets/commitment_card_list_test.dart
index 7d29494c..393ccd72 100644
--- a/test/presentation/shared_widgets/commitment_card_list_test.dart
+++ b/test/presentation/shared_widgets/commitment_card_list_test.dart
@@ -31,7 +31,7 @@ void main() {
   });
 
   group('CommitmentCardList tests:', () {
-    testWidgets('can render with commitments = null',
+    testWidgets('can render with commitmentOptions = null',
         (WidgetTester tester) async {
       await tester.pumpCommitmentCardList(false, null, [], participationBloc);
       await tester.pump();
@@ -41,7 +41,8 @@ void main() {
       expect(find.byType(CommitmentCardShimmer), findsNWidgets(3));
     });
 
-    testWidgets('can render with 0 commitments', (WidgetTester tester) async {
+    testWidgets('can render with 0 commitmentOptions',
+        (WidgetTester tester) async {
       await tester.pumpCommitmentCardList(false, [], [], participationBloc);
       await tester.pumpAndSettle();
 
@@ -50,10 +51,11 @@ void main() {
       expect(find.byType(CommitmentCardShimmer), findsNothing);
     });
 
-    testWidgets('can render with 1 commitments', (WidgetTester tester) async {
+    testWidgets('can render with 1 commitmentOptions',
+        (WidgetTester tester) async {
       await tester.pumpCommitmentCardList(
         false,
-        [tCommitment],
+        [tCommitmentOption],
         [],
         participationBloc,
       );
@@ -66,10 +68,11 @@ void main() {
       expect(find.byType(CommitmentCardShimmer), findsNothing);
     });
 
-    testWidgets('can render with 5 commitments', (WidgetTester tester) async {
+    testWidgets('can render with 5 commitmentOptions',
+        (WidgetTester tester) async {
       await tester.pumpCommitmentCardList(
         false,
-        List.filled(5, tCommitment),
+        List.filled(5, tCommitmentOption),
         [],
         participationBloc,
       );
@@ -85,7 +88,7 @@ void main() {
         (WidgetTester tester) async {
       await tester.pumpCommitmentCardList(
         false,
-        [tCommitment],
+        [tCommitmentOption],
         [],
         participationBloc,
       );
@@ -115,7 +118,7 @@ void main() {
     testWidgets('blocking commitments', (WidgetTester tester) async {
       await tester.pumpCommitmentCardList(
         false,
-        [tCommitment, tBlockingCommitment],
+        [tCommitmentOption, tBlockingCommitmentOption],
         [],
         participationBloc,
       );
@@ -135,8 +138,8 @@ void main() {
     testWidgets('preselected commitments', (WidgetTester tester) async {
       await tester.pumpCommitmentCardList(
         false,
-        [tCommitment],
-        [tCommitment],
+        [tCommitmentOption],
+        [tCommitmentOption],
         participationBloc,
       );
       await tester.pumpAndSettle();
@@ -153,8 +156,8 @@ void main() {
     testWidgets('commitment is over', (WidgetTester tester) async {
       await tester.pumpCommitmentCardList(
         true,
-        [tCommitment],
-        [tCommitment],
+        [tCommitmentOption],
+        [tCommitmentOption],
         participationBloc,
       );
       await tester.pumpAndSettle();
@@ -175,7 +178,7 @@ void main() {
 
       await tester.pumpCommitmentCardList(
         true,
-        [tCommitment],
+        [tCommitmentOption],
         [],
         participationBloc,
       );
@@ -200,8 +203,8 @@ void main() {
 
       await tester.pumpCommitmentCardList(
         true,
-        [tCommitment],
-        [tCommitment],
+        [tCommitmentOption],
+        [tCommitmentOption],
         participationBloc,
       );
       await tester.pumpAndSettle();
diff --git a/test/presentation/shared_widgets/commitment_card_list_test.ext.dart b/test/presentation/shared_widgets/commitment_card_list_test.ext.dart
index 427bc5da..33175219 100644
--- a/test/presentation/shared_widgets/commitment_card_list_test.ext.dart
+++ b/test/presentation/shared_widgets/commitment_card_list_test.ext.dart
@@ -3,8 +3,8 @@ part of 'commitment_card_list_test.dart';
 extension WidgetX on WidgetTester {
   Future<void> pumpCommitmentCardList(
     bool isEnded,
-    List<Commitment>? commitments,
-    List<Commitment> selectedCommitments,
+    List<CommitmentOption>? commitmentOptions,
+    List<CommitmentOption> selectedCommitments,
     ParticipationBloc participationBloc,
   ) async {
     await pumpWidget(
@@ -18,7 +18,7 @@ extension WidgetX on WidgetTester {
           home: Scaffold(
             body: CommitmentCardList(
               isEnded: isEnded,
-              commitments: commitments,
+              commitmentOptions: commitmentOptions,
               selectedCommitments: selectedCommitments,
             ),
           ),
diff --git a/test/presentation/shared_widgets/commitment_card_test.dart b/test/presentation/shared_widgets/commitment_card_test.dart
index 569a5d57..66032697 100644
--- a/test/presentation/shared_widgets/commitment_card_test.dart
+++ b/test/presentation/shared_widgets/commitment_card_test.dart
@@ -10,7 +10,7 @@ void main() {
       await buildAndPump(
         tester: tester,
         widget: CommitmentCard(
-          commitment: commitment,
+          commitment: commitmentOption,
         ),
       );
       await tester.pumpAndSettle();
@@ -22,7 +22,7 @@ void main() {
       await buildAndPump(
         tester: tester,
         widget: CommitmentCard(
-          commitment: commitment,
+          commitment: commitmentOption,
           deactivated: true,
         ),
       );
@@ -40,7 +40,7 @@ void main() {
           onSelected: (_) => counter++,
           onDeSelected: (_) => counter--,
           active: false,
-          commitment: commitment,
+          commitment: commitmentOption,
         ),
       );
       await tester.pumpAndSettle();
@@ -64,7 +64,7 @@ void main() {
           onSelected: (_) => counter++,
           onDeSelected: (_) => counter--,
           active: true,
-          commitment: commitment,
+          commitment: commitmentOption,
         ),
       );
       await tester.pumpAndSettle();
@@ -83,7 +83,7 @@ void main() {
       await buildAndPump(
         tester: tester,
         widget: CommitmentCard(
-          commitment: commitment,
+          commitment: commitmentOption,
           viewOnly: true,
         ),
       );
diff --git a/test/test_utilities.dart b/test/test_utilities.dart
index 03305cd1..cd0d48d8 100644
--- a/test/test_utilities.dart
+++ b/test/test_utilities.dart
@@ -78,17 +78,24 @@ class TestUtilities {
       (_) async => right(crowdActions.map((u) => u.toDomain()).toList()),
     );
 
+    when(() => crowdActionRepo.subscribeToCrowdAction(any(), any(), any()))
+        .thenAnswer((_) async => right(unit));
+
+    when(() => crowdActionRepo.unsubscribeFromCrowdAction(any()))
+        .thenAnswer((_) async => right(unit));
+
     GetIt.instance.registerSingleton<ICrowdActionRepository>(crowdActionRepo);
   }
 
   static CrowdAction crowdActionWithNParticipants(int participantCount) {
     return CrowdAction(
       id: 'tID',
+      type: '',
       title: 'tTitle',
       description: 'tDescription',
       category: 'tCategory',
       location: tLocation,
-      commitments: [tCommitment],
+      commitmentOptions: [tCommitmentOption],
       endAt: DateTime(2022, 1, 31),
       images: const Images(card: 'tCard', banner: 'tBanner'),
       participantCount: participantCount,
@@ -109,11 +116,12 @@ BASE_STATIC_ENDPOINT_URL = http://collaction.org
 
 final tCrowdaction = CrowdAction(
   id: 'tID',
+  type: '',
   title: 'tTitle',
   description: 'tDescription',
   category: 'tCategory',
   location: tLocation,
-  commitments: [tCommitment],
+  commitmentOptions: [tCommitmentOption],
   endAt: DateTime(2022, 1, 31),
   images: const Images(card: 'tCard', banner: 'tBanner'),
   participantCount: 10,
@@ -124,11 +132,12 @@ final tCrowdaction = CrowdAction(
 
 final tCrowdactionNoPassword = CrowdAction(
   id: 'tID',
+  type: '',
   title: 'tTitle',
   description: 'tDescription',
   category: 'tCategory',
   location: tLocation,
-  commitments: [tCommitment],
+  commitmentOptions: [tCommitmentOption],
   endAt: DateTime(2022, 1, 31),
   images: const Images(card: 'tCard', banner: 'tBanner'),
   participantCount: 10,
@@ -136,23 +145,25 @@ final tCrowdactionNoPassword = CrowdAction(
   joinStatus: JoinStatus.closed,
 );
 
-final tCommitment = Commitment(
+final tCommitmentOption = CommitmentOption(
   id: 'no-beef',
+  type: 'food',
   label: 'tLabel',
   description: 'tDescription',
   points: 0,
   blocks: [],
 );
 
-final tBlockingCommitment = Commitment(
+final tBlockingCommitmentOption = CommitmentOption(
   id: 'no-meat',
+  type: 'food',
   label: 'tLabel',
   description: 'tDescription',
   points: 0,
   blocks: ['no-beef'],
 );
 
-final List<String> tCommitments = ['tCommitment'];
+final List<String> tCommitment = ['tCommitment'];
 
 final Participation tParticipation = Participation(
   id: 'tID',
@@ -160,7 +171,7 @@ final Participation tParticipation = Participation(
   fullName: 'John Doe',
   avatar: 'tAvatar',
   userId: 'tID',
-  commitments: tCommitments,
+  commitmentOptions: tCommitment,
   joinDate: DateTime.now(),
   dailyCheckIns: 5,
 );
diff --git a/test/user_repository/user_repository_tests.dart b/test/user_repository/user_repository_tests.dart
new file mode 100644
index 00000000..51e12808
--- /dev/null
+++ b/test/user_repository/user_repository_tests.dart
@@ -0,0 +1,80 @@
+import 'package:collaction_app/domain/user/i_user_repository.dart';
+import 'package:collaction_app/domain/user/user.dart';
+import 'package:collaction_app/infrastructure/user/user_repository.dart';
+import 'package:firebase_auth/firebase_auth.dart' as firebase_auth;
+import 'package:firebase_auth_mocks/firebase_auth_mocks.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mocktail/mocktail.dart';
+
+class CustomMockFirebaseAuth extends Mock
+    implements firebase_auth.FirebaseAuth {}
+
+class CustomMockUserCredential extends Mock
+    implements firebase_auth.UserCredential {}
+
+void main() {
+  setUpAll(() {
+    registerFallbackValue(
+      const firebase_auth.AuthCredential(
+        signInMethod: 'mock',
+        providerId: 'mock',
+      ),
+    );
+  });
+
+  group('User Repository Tests:', () {
+    test(
+      'New user (anonymous)',
+      () async {
+        // ignore: avoid_redundant_argument_values
+        final mockFirebaseAuth = MockFirebaseAuth(signedIn: false);
+        final userRepository = UserRepository(firebaseAuth: mockFirebaseAuth);
+        final user = await userRepository.observeUser().first;
+        expect(user, User.anonymous);
+        expect(user.isAnonymous, true);
+      },
+      timeout: const Timeout(Duration(seconds: 5)),
+    );
+
+    test(
+      'Returning user',
+      () async {
+        // ignore: avoid_redundant_argument_values
+        final mockFirebaseAuth = MockFirebaseAuth(signedIn: true);
+        final userRepository = UserRepository(firebaseAuth: mockFirebaseAuth);
+        final user = await userRepository.observeUser().skip(1).first;
+        expect(user, isNot(User.anonymous));
+        expect(user.isAnonymous, false);
+      },
+      timeout: const Timeout(Duration(seconds: 5)),
+    );
+
+    Future<void> testRegistration({required bool isNewUser}) async {
+      final mockFirebaseAuth = CustomMockFirebaseAuth();
+      final mockUserCredential = CustomMockUserCredential();
+      when(() => mockFirebaseAuth.signInWithCredential(any()))
+          .thenAnswer((_) => Future.value(mockUserCredential));
+      when(() => mockFirebaseAuth.authStateChanges())
+          .thenAnswer((_) => const Stream.empty());
+      when(() => mockUserCredential.additionalUserInfo)
+          .thenReturn(firebase_auth.AdditionalUserInfo(isNewUser: isNewUser));
+      final userRepository = UserRepository(firebaseAuth: mockFirebaseAuth);
+      // First part of registration cannot be meaningfully tested using mock
+      final signInResult = await userRepository.signIn(
+        const Credential(
+          verificationId: 'someVerificationId',
+          smsCode: 'someSmsCode',
+        ),
+      );
+      expect(signInResult.isNewUser, isNewUser);
+    }
+
+    test('Register with phone number', () async {
+      await testRegistration(isNewUser: true);
+    });
+
+    test('Log in with phone number', () async {
+      await testRegistration(isNewUser: false);
+    });
+  });
+}
diff --git a/test/utils/crowdaction.fixtures.dart b/test/utils/crowdaction.fixtures.dart
index f5d22c8a..34fc819f 100644
--- a/test/utils/crowdaction.fixtures.dart
+++ b/test/utils/crowdaction.fixtures.dart
@@ -3,11 +3,12 @@ import 'package:collaction_app/domain/crowdaction/crowdaction.dart';
 /// Reusable crowdaction fixtures
 final testCrowdAction = CrowdAction(
   id: 'id',
+  type: 'type',
   title: 'title',
   description: 'description',
   category: 'category',
   location: const Location(code: 'code', name: 'name'),
-  commitments: [],
+  commitmentOptions: [],
   images: const Images(banner: 'banner.png', card: 'card.png'),
   participantCount: 1,
   status: Status.started,
diff --git a/test/utils/crowdactions.dart b/test/utils/crowdactions.dart
index 0e7ce7de..8a5b8992 100644
--- a/test/utils/crowdactions.dart
+++ b/test/utils/crowdactions.dart
@@ -3,6 +3,7 @@ import 'package:collaction_app/infrastructure/crowdaction/crowdaction_dto.dart';
 final _crowdActionsRawData = [
   {
     "id": "62ceb7110b5e88ce294628a1",
+    "type": "FOOD",
     "title": "Veganuary",
     "description":
         "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam varius ac ligula quis aliquet. Donec nisi leo, rhoncus ac nulla quis, egestas ornare quam. Nunc nibh ex, venenatis quis maximus vitae, elementum sed urna. Morbi sagittis metus nibh, non lacinia ipsum faucibus eu. Nulla vehicula purus eget congue auctor.",
@@ -16,8 +17,9 @@ final _crowdActionsRawData = [
       "card": "crowdaction-cards/628a7fa741b5aa3af6582a07.png",
       "banner": "crowdaction-banners/628a7fa741b5aa3af6582a07.png"
     },
-    "commitments": [
+    "commitmentOptions": [
       {
+        "type": "FOOD",
         "label": "5/7 Days a week",
         "description": "In case you prefer to exclude weekends",
         "points": -10,
@@ -25,6 +27,7 @@ final _crowdActionsRawData = [
         "id": "62b637e0c5d78b613a3cc6d2"
       },
       {
+        "type": "FOOD",
         "label": "Vegan",
         "description":
             "Commit to eating no product or by-product from any and all animals",
@@ -38,6 +41,7 @@ final _crowdActionsRawData = [
         "id": "62b6381fc5d78b613a3cc6d4"
       },
       {
+        "type": "FOOD",
         "label": "Vegetarian",
         "description":
             "Commit to eating no meat product or by-product of any and all animals",
@@ -46,6 +50,7 @@ final _crowdActionsRawData = [
         "id": "62b63863c5d78b613a3cc6d6"
       },
       {
+        "type": "FOOD",
         "label": "Pescatarian",
         "description":
             "Commit to eating no meat or poultry from animals, except fish and other seafood",
@@ -54,6 +59,7 @@ final _crowdActionsRawData = [
         "id": "62b638a6c5d78b613a3cc6d8"
       },
       {
+        "type": "FOOD",
         "label": "No Beef",
         "description": "Commit to eating no beef",
         "points": 20,
@@ -61,6 +67,7 @@ final _crowdActionsRawData = [
         "id": "62b638c8c5d78b613a3cc6da"
       },
       {
+        "type": "FOOD",
         "label": "No Dairy",
         "description":
             "Commit to eating no dairy products such as cheese and milk",
@@ -80,6 +87,7 @@ final _crowdActionsRawData = [
   },
   {
     "id": "6364ca939d4f5dffc3fe8e25",
+    "type": "ENERGY",
     "title": "Steun je School",
     "description":
         "Tijdens deze campagne staat het thema energiebesparing centraal, in het bijzonder op scholen. We bevinden ons in een energiecrisis en alleen samen komen we eruit! Voor meer informatie, neem een kijkje op collaction.org/steunschool.",
@@ -93,8 +101,9 @@ final _crowdActionsRawData = [
       "card": "crowdaction-cards/education_january.jpg",
       "banner": "crowdaction-banners/education_january.jpg"
     },
-    "commitments": [
+    "commitmentOptions": [
       {
+        "type": "ENERGY",
         "label": "SUSTAINABILITY",
         "description": "",
         "points": 10,
@@ -113,6 +122,7 @@ final _crowdActionsRawData = [
   },
   {
     "id": "6364d440187f67b3798ca86e",
+    "type": "FOOD",
     "title": "The Food Initiative",
     "description":
         "Improve your eating habits, and downscale your CO2 footprint!",
@@ -125,8 +135,9 @@ final _crowdActionsRawData = [
       "card": "crowdaction-cards/placeholder.png",
       "banner": "crowdaction-banners/placeholder.png"
     },
-    "commitments": [
+    "commitmentOptions": [
       {
+        "type": "FOOD",
         "label": "5/7 Days a week",
         "description": "In case you prefer to exclude weekends",
         "points": -10,
@@ -135,6 +146,7 @@ final _crowdActionsRawData = [
         "id": "62b637e0c5d78b613a3cc6d2"
       },
       {
+        "type": "FOOD",
         "label": "Vegan",
         "description": "Commit to eating no product or by-product from animals",
         "points": 50,
@@ -148,6 +160,7 @@ final _crowdActionsRawData = [
         "id": "62b6381fc5d78b613a3cc6d4"
       },
       {
+        "type": "FOOD",
         "label": "Vegetarian",
         "description":
             "Commit to eating no meat product or by-product from animals",
@@ -157,6 +170,7 @@ final _crowdActionsRawData = [
         "id": "62b63863c5d78b613a3cc6d6"
       },
       {
+        "type": "FOOD",
         "label": "Pescatarian",
         "description":
             "Commit to eating no meat or poultry from animals, except fish and other seafood",
@@ -166,6 +180,7 @@ final _crowdActionsRawData = [
         "id": "62b638a6c5d78b613a3cc6d8"
       },
       {
+        "type": "FOOD",
         "label": "No Beef",
         "description": "Commit to eating no beef",
         "points": 20,
@@ -174,6 +189,7 @@ final _crowdActionsRawData = [
         "id": "62b638c8c5d78b613a3cc6da"
       },
       {
+        "type": "FOOD",
         "label": "No Dairy",
         "description":
             "Commit to eating no dairy products such as cheese and milk",
diff --git a/test/utils/participation.fixtures.dart b/test/utils/participation.fixtures.dart
index c9255633..1727bad9 100644
--- a/test/utils/participation.fixtures.dart
+++ b/test/utils/participation.fixtures.dart
@@ -10,7 +10,7 @@ final testParticipation = Participation(
   fullName: testProfile.fullName,
   avatar: testProfile.avatar,
   userId: testUser.id,
-  commitments: [],
+  commitmentOptions: [],
   joinDate: DateTime.now(),
   dailyCheckIns: 2,
 );