[flutter]: fix warnings and compile issues

app_flowy/lib/user/application/sign_in_bloc.dart

@@ -1,5 +1,6 @@
 import 'package:app_flowy/user/domain/i_auth.dart';
 import 'package:dartz/dartz.dart';
+import 'package:flowy_sdk/protobuf/flowy-user-infra/errors.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -21,56 +22,39 @@ class SignInBloc extends Bloc<SignInEvent, SignInState> {
         );
       },
       emailChanged: (EmailChanged value) async* {
-        yield state.copyWith(
+        yield state.copyWith(email: value.email, emailError: none(), successOrFail: none());
-            email: value.email, emailError: none(), successOrFail: none());
       },
       passwordChanged: (PasswordChanged value) async* {
-        yield state.copyWith(
+        yield state.copyWith(password: value.password, passwordError: none(), successOrFail: none());
-            password: value.password,
-            passwordError: none(),
-            successOrFail: none());
       },
     );
   }
 
   Stream<SignInState> _performActionOnSignIn(SignInState state) async* {
-    yield state.copyWith(
+    yield state.copyWith(isSubmitting: true, emailError: none(), passwordError: none(), successOrFail: none());
-        isSubmitting: true,
-        emailError: none(),
-        passwordError: none(),
-        successOrFail: none());
 
     final result = await authImpl.signIn(state.email, state.password);
     yield result.fold(
-      (userProfile) => state.copyWith(
+      (userProfile) => state.copyWith(isSubmitting: false, successOrFail: some(left(userProfile))),
-          isSubmitting: false, successOrFail: some(left(userProfile))),
       (error) => stateFromCode(error),
     );
   }
 
   SignInState stateFromCode(UserError error) {
-    switch (error.code) {
+    switch (ErrorCode.valueOf(error.code)!) {
       case ErrorCode.EmailFormatInvalid:
-        return state.copyWith(
+        return state.copyWith(isSubmitting: false, emailError: some(error.msg), passwordError: none());
-            isSubmitting: false,
-            emailError: some(error.msg),
-            passwordError: none());
       case ErrorCode.PasswordFormatInvalid:
-        return state.copyWith(
+        return state.copyWith(isSubmitting: false, passwordError: some(error.msg), emailError: none());
-            isSubmitting: false,
-            passwordError: some(error.msg),
-            emailError: none());
       default:
-        return state.copyWith(
+        return state.copyWith(isSubmitting: false, successOrFail: some(right(error)));
-            isSubmitting: false, successOrFail: some(right(error)));
     }
   }
 }
 
 @freezed
 abstract class SignInEvent with _$SignInEvent {
-  const factory SignInEvent.signedInWithUserEmailAndPassword() =
+  const factory SignInEvent.signedInWithUserEmailAndPassword() = SignedInWithUserEmailAndPassword;
-      SignedInWithUserEmailAndPassword;
   const factory SignInEvent.emailChanged(String email) = EmailChanged;
   const factory SignInEvent.passwordChanged(String password) = PasswordChanged;
 }

app_flowy/lib/user/application/sign_up_bloc.dart

@@ -1,5 +1,7 @@
 import 'package:app_flowy/user/domain/i_auth.dart';
 import 'package:dartz/dartz.dart';
+import 'package:flowy_sdk/protobuf/flowy-user-infra/errors.pb.dart';
+
 import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -17,18 +19,11 @@ class SignUpBloc extends Bloc<SignUpEvent, SignUpState> {
     yield* event.map(signUpWithUserEmailAndPassword: (e) async* {
       yield* _performActionOnSignUp();
     }, emailChanged: (EmailChanged value) async* {
-      yield state.copyWith(
+      yield state.copyWith(email: value.email, emailError: none(), successOrFail: none());
-          email: value.email, emailError: none(), successOrFail: none());
     }, passwordChanged: (PasswordChanged value) async* {
-      yield state.copyWith(
+      yield state.copyWith(password: value.password, passwordError: none(), successOrFail: none());
-          password: value.password,
-          passwordError: none(),
-          successOrFail: none());
     }, repeatPasswordChanged: (RepeatPasswordChanged value) async* {
-      yield state.copyWith(
+      yield state.copyWith(repeatedPassword: value.password, repeatPasswordError: none(), successOrFail: none());
-          repeatedPassword: value.password,
-          repeatPasswordError: none(),
-          successOrFail: none());
     });
   }
 
@@ -59,8 +54,7 @@ class SignUpBloc extends Bloc<SignUpEvent, SignUpState> {
     if (password != repeatedPassword) {
       yield state.copyWith(
         isSubmitting: false,
-        repeatPasswordError:
+        repeatPasswordError: some("Repeat password is not the same as password"),
-            some("Repeat password is not the same as password"),
       );
       return;
     }
@@ -70,8 +64,7 @@ class SignUpBloc extends Bloc<SignUpEvent, SignUpState> {
       repeatPasswordError: none(),
     );
 
-    final result =
+    final result = await authImpl.signUp(state.email, state.password, state.email);
-        await authImpl.signUp(state.email, state.password, state.email);
     yield result.fold(
       (userProfile) => state.copyWith(
         isSubmitting: false,
@@ -85,7 +78,7 @@ class SignUpBloc extends Bloc<SignUpEvent, SignUpState> {
   }
 
   SignUpState stateFromCode(UserError error) {
-    switch (error.code) {
+    switch (ErrorCode.valueOf(error.code)!) {
       case ErrorCode.EmailFormatInvalid:
         return state.copyWith(
           isSubmitting: false,
@@ -101,20 +94,17 @@ class SignUpBloc extends Bloc<SignUpEvent, SignUpState> {
           successOrFail: none(),
         );
       default:
-        return state.copyWith(
+        return state.copyWith(isSubmitting: false, successOrFail: some(right(error)));
-            isSubmitting: false, successOrFail: some(right(error)));
     }
   }
 }
 
 @freezed
 class SignUpEvent with _$SignUpEvent {
-  const factory SignUpEvent.signUpWithUserEmailAndPassword() =
+  const factory SignUpEvent.signUpWithUserEmailAndPassword() = SignUpWithUserEmailAndPassword;
-      SignUpWithUserEmailAndPassword;
   const factory SignUpEvent.emailChanged(String email) = EmailChanged;
   const factory SignUpEvent.passwordChanged(String password) = PasswordChanged;
-  const factory SignUpEvent.repeatPasswordChanged(String password) =
+  const factory SignUpEvent.repeatPasswordChanged(String password) = RepeatPasswordChanged;
-      RepeatPasswordChanged;
 }
 
 @freezed

app_flowy/lib/user/presentation/sign_up_screen.dart

@@ -2,7 +2,6 @@ import 'package:app_flowy/startup/startup.dart';
 import 'package:app_flowy/user/application/sign_up_bloc.dart';
 import 'package:app_flowy/user/domain/i_auth.dart';
 import 'package:app_flowy/user/presentation/widgets/background.dart';
-import 'package:flowy_infra/size.dart';
 import 'package:flowy_infra/theme.dart';
 import 'package:flowy_infra_ui/widget/rounded_button.dart';
 import 'package:flowy_infra_ui/widget/rounded_input_field.dart';

app_flowy/lib/user/presentation/splash_screen.dart

@@ -4,9 +4,9 @@ import 'package:app_flowy/user/domain/auth_state.dart';
 import 'package:app_flowy/user/domain/i_splash.dart';
 import 'package:flowy_log/flowy_log.dart';
 import 'package:flowy_sdk/dispatch/dispatch.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/errors.pb.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart' as workspace;
 
 // [[diagram: splash screen]]
 // ┌────────────────┐1.get user ┌──────────┐     ┌────────────┐ 2.send UserEventCheckUser
@@ -49,7 +49,7 @@ class SplashScreen extends StatelessWidget {
         return result.fold(
           (workspace) => getIt<ISplashRoute>().pushHomeScreen(context, userProfile, workspace.id),
           (error) async {
-            assert(error.code == workspace.ErrorCode.RecordNotFound);
+            assert(error.code == ErrorCode.RecordNotFound.value);
             getIt<ISplashRoute>().pushWelcomeScreen(context, userProfile);
           },
         );

app_flowy/lib/user/presentation/welcome_screen.dart

@@ -1,11 +1,10 @@
 import 'package:app_flowy/startup/startup.dart';
 import 'package:app_flowy/workspace/application/workspace/welcome_bloc.dart';
-import 'package:app_flowy/workspace/domain/i_user.dart';
 import 'package:flowy_infra/theme.dart';
 import 'package:flowy_infra_ui/style_widget/scrolling/styled_list.dart';
 import 'package:flowy_infra_ui/style_widget/button.dart';
 import 'package:flowy_infra_ui/widget/error_page.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/workspace_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/workspace_create.pb.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:app_flowy/workspace/infrastructure/repos/user_repo.dart';

app_flowy/lib/workspace/application/app/app_bloc.dart

@@ -1,8 +1,8 @@
 import 'package:app_flowy/workspace/domain/i_app.dart';
 import 'package:flowy_log/flowy_log.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/view_create.pb.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:dartz/dartz.dart';

app_flowy/lib/workspace/application/doc/doc_bloc.dart

@@ -2,11 +2,11 @@ import 'dart:convert';
 
 import 'package:app_flowy/workspace/domain/i_trash.dart';
 import 'package:app_flowy/workspace/domain/i_view.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/trash_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/trash_create.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
 import 'package:flutter_quill/flutter_quill.dart';
 import 'package:flowy_log/flowy_log.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:app_flowy/workspace/domain/i_doc.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';

app_flowy/lib/workspace/application/home/home_listen_bloc.dart

@@ -1,4 +1,5 @@
 import 'package:app_flowy/workspace/domain/i_user.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/errors.pb.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:dartz/dartz.dart';
@@ -32,7 +33,7 @@ class HomeListenBloc extends Bloc<HomeListenEvent, HomeListenState> {
 
   void _authStateChanged(Either<Unit, UserError> errorOrNothing) {
     errorOrNothing.fold((_) {}, (error) {
-      if (error.code == ErrorCode.UserUnauthorized) {
+      if (error.code == ErrorCode.UserUnauthorized.value) {
         add(HomeListenEvent.unauthorized(error.msg));
       }
     });

app_flowy/lib/workspace/application/menu/menu_bloc.dart

@@ -4,7 +4,7 @@ import 'package:app_flowy/workspace/domain/page_stack/page_stack.dart';
 import 'package:app_flowy/workspace/presentation/stack_page/blank/blank_page.dart';
 import 'package:dartz/dartz.dart';
 import 'package:flowy_log/flowy_log.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/app_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
 import 'package:flutter/material.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';

app_flowy/lib/workspace/application/menu/menu_user_bloc.dart

@@ -1,8 +1,8 @@
 import 'package:app_flowy/workspace/domain/i_user.dart';
 import 'package:flowy_log/flowy_log.dart';
 import 'package:flowy_sdk/protobuf/flowy-user/user_profile.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/workspace_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/workspace_create.pb.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:dartz/dartz.dart';

app_flowy/lib/workspace/application/trash/trash_bloc.dart

@@ -1,8 +1,8 @@
 import 'package:app_flowy/workspace/domain/i_trash.dart';
 import 'package:dartz/dartz.dart';
 import 'package:flowy_log/flowy_log.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/trash_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/trash_create.pb.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 part 'trash_bloc.freezed.dart';

app_flowy/lib/workspace/application/view/view_bloc.dart

@@ -1,6 +1,6 @@
 import 'package:dartz/dartz.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/view_create.pb.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:app_flowy/workspace/domain/i_view.dart';

app_flowy/lib/workspace/application/workspace/welcome_bloc.dart

@@ -1,8 +1,8 @@
 import 'package:app_flowy/workspace/domain/i_user.dart';
 import 'package:app_flowy/workspace/infrastructure/repos/user_repo.dart';
 import 'package:flowy_log/flowy_log.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/workspace_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/workspace_create.pb.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:dartz/dartz.dart';

app_flowy/lib/workspace/domain/i_app.dart

@@ -1,5 +1,8 @@
-import 'package:flowy_sdk/protobuf/flowy-workspace/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/protobuf.dart';
 import 'package:dartz/dartz.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
 
 typedef AppUpdatedCallback = void Function(App app);
 typedef AppViewsChangeCallback = void Function(Either<List<View>, WorkspaceError> viewsOrFailed);

app_flowy/lib/workspace/domain/i_trash.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'package:dartz/dartz.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/trash_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/trash_create.pb.dart';
 
 abstract class ITrash {
   Future<Either<List<Trash>, WorkspaceError>> readTrash();

app_flowy/lib/workspace/domain/i_user.dart

@@ -1,10 +1,8 @@
 import 'package:dartz/dartz.dart';
 import 'package:flowy_sdk/protobuf/flowy-user/errors.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-user/user_profile.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/workspace_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/workspace_create.pb.dart';
-
-export 'package:flowy_sdk/protobuf/flowy-workspace/workspace_create.pb.dart';
 export 'package:flowy_sdk/protobuf/flowy-user/errors.pb.dart';
 export 'package:flowy_sdk/protobuf/flowy-user/user_profile.pb.dart';
 

app_flowy/lib/workspace/domain/i_view.dart

@@ -1,7 +1,7 @@
-import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/view_create.pb.dart';
 import 'package:dartz/dartz.dart';
 import 'package:flowy_infra/notifier.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
 
 typedef ViewUpdatedCallback = void Function(Either<View, WorkspaceError>);
 

app_flowy/lib/workspace/domain/i_workspace.dart

@@ -1,5 +1,6 @@
-import 'package:flowy_sdk/protobuf/flowy-workspace/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/protobuf.dart';
 import 'package:dartz/dartz.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
 
 typedef WorkspaceAppsChangedCallback = void Function(Either<List<App>, WorkspaceError> appsOrFail);
 

app_flowy/lib/workspace/domain/image.dart

@@ -1,4 +1,4 @@
-import 'package:flowy_sdk/protobuf/flowy-workspace/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
 import 'package:flutter/material.dart';
 import 'package:flowy_infra/image.dart';
 

app_flowy/lib/workspace/domain/view_ext.dart

@@ -1,7 +1,7 @@
 import 'package:app_flowy/workspace/domain/page_stack/page_stack.dart';
 import 'package:app_flowy/workspace/presentation/stack_page/blank/blank_page.dart';
 import 'package:app_flowy/workspace/presentation/stack_page/doc/doc_stack_page.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
 
 extension ToHomeStackContext on View {
   HomeStackContext stackContext() {

app_flowy/lib/workspace/infrastructure/deps_resolver.dart

@@ -19,8 +19,8 @@ import 'package:app_flowy/workspace/infrastructure/repos/trash_repo.dart';
 import 'package:app_flowy/workspace/infrastructure/repos/view_repo.dart';
 import 'package:app_flowy/workspace/infrastructure/repos/workspace_repo.dart';
 import 'package:flowy_sdk/protobuf/flowy-user/user_profile.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/app_create.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
 import 'package:get_it/get_it.dart';
 
 import 'i_user_impl.dart';

app_flowy/lib/workspace/infrastructure/i_app_impl.dart

@@ -1,8 +1,8 @@
 import 'package:app_flowy/workspace/infrastructure/repos/app_repo.dart';
 import 'package:dartz/dartz.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart' as workspace;
 import 'package:app_flowy/workspace/domain/i_app.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
 export 'package:app_flowy/workspace/domain/i_app.dart';
 
 class IAppImpl extends IApp {
@@ -12,13 +12,12 @@ class IAppImpl extends IApp {
   });
 
   @override
-  Future<Either<List<View>, workspace.WorkspaceError>> getViews() {
+  Future<Either<List<View>, WorkspaceError>> getViews() {
     return repo.getViews();
   }
 
   @override
-  Future<Either<View, workspace.WorkspaceError>> createView(
+  Future<Either<View, WorkspaceError>> createView({required String name, String? desc, required ViewType viewType}) {
-      {required String name, String? desc, required ViewType viewType}) {
     return repo.createView(name, desc ?? "", viewType).then((result) {
       return result.fold(
         (view) => left(view),
@@ -28,12 +27,12 @@ class IAppImpl extends IApp {
   }
 
   @override
-  Future<Either<Unit, workspace.WorkspaceError>> delete() {
+  Future<Either<Unit, WorkspaceError>> delete() {
     return repo.delete();
   }
 
   @override
-  Future<Either<Unit, workspace.WorkspaceError>> rename(String newName) {
+  Future<Either<Unit, WorkspaceError>> rename(String newName) {
     return repo.updateApp(name: newName);
   }
 }

app_flowy/lib/workspace/infrastructure/i_doc_impl.dart

@@ -24,8 +24,7 @@ class IDocImpl extends IDoc {
   }
 
   @override
-  Future<Either<DocDelta, WorkspaceError>> composeDelta(
+  Future<Either<DocDelta, WorkspaceError>> composeDelta({required String json}) {
-      {required String json}) {
     return repo.composeDelta(data: json);
   }
 }

app_flowy/lib/workspace/infrastructure/i_trash_impl.dart

@@ -1,8 +1,8 @@
 import 'package:app_flowy/workspace/domain/i_trash.dart';
 import 'package:app_flowy/workspace/infrastructure/repos/trash_repo.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
 import 'package:dartz/dartz.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/trash_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/trash_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
 
 class ITrashImpl implements ITrash {
   TrashRepo repo;

app_flowy/lib/workspace/infrastructure/i_user_impl.dart

@@ -5,8 +5,10 @@ import 'package:dartz/dartz.dart';
 import 'package:app_flowy/workspace/domain/i_user.dart';
 import 'package:app_flowy/workspace/infrastructure/repos/user_repo.dart';
 import 'package:flowy_sdk/protobuf/flowy-dart-notify/protobuf.dart';
-import 'package:flowy_sdk/protobuf/flowy-user/errors.pb.dart' as user_error;
+import 'package:flowy_sdk/protobuf/flowy-user-infra/errors.pb.dart';
+// import 'package:flowy_sdk/protobuf/flowy-user/errors.pb.dart' as user_error;
 import 'package:flowy_sdk/protobuf/flowy-user/observable.pb.dart' as user;
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/workspace_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/observable.pb.dart';
 export 'package:app_flowy/workspace/domain/i_user.dart';
@@ -66,9 +68,9 @@ class IUserListenerImpl extends IUserListener {
 
   @override
   void start() {
-    _workspaceParser = WorkspaceNotificationParser(id: _user.token, callback: _NotificationCallback);
+    _workspaceParser = WorkspaceNotificationParser(id: _user.token, callback: _notificationCallback);
 
-    _userParser = UserNotificationParser(id: _user.token, callback: _UserNotificationCallback);
+    _userParser = UserNotificationParser(id: _user.token, callback: _userNotificationCallback);
 
     _subscription = RustStreamReceiver.listen((observable) {
       _workspaceParser.parse(observable);
@@ -96,7 +98,7 @@ class IUserListenerImpl extends IUserListener {
     _workspacesUpdated = workspacesCallback;
   }
 
-  void _NotificationCallback(WorkspaceNotification ty, Either<Uint8List, WorkspaceError> result) {
+  void _notificationCallback(WorkspaceNotification ty, Either<Uint8List, WorkspaceError> result) {
     switch (ty) {
       case WorkspaceNotification.UserCreateWorkspace:
       case WorkspaceNotification.UserDeleteWorkspace:
@@ -115,7 +117,7 @@ class IUserListenerImpl extends IUserListener {
         if (_authChanged != null) {
           result.fold(
             (_) {},
-            (error) => {_authChanged!(right(UserError.create()..code = user_error.ErrorCode.UserUnauthorized))},
+            (error) => {_authChanged!(right(UserError.create()..code = ErrorCode.UserUnauthorized.value))},
           );
         }
         break;
@@ -124,7 +126,7 @@ class IUserListenerImpl extends IUserListener {
     }
   }
 
-  void _UserNotificationCallback(user.UserNotification ty, Either<Uint8List, UserError> result) {
+  void _userNotificationCallback(user.UserNotification ty, Either<Uint8List, UserError> result) {
     switch (ty) {
       case user.UserNotification.UserUnauthorized:
         if (_profileUpdated != null) {

app_flowy/lib/workspace/infrastructure/i_view_impl.dart

@@ -1,9 +1,9 @@
 import 'package:app_flowy/workspace/domain/i_view.dart';
 import 'package:app_flowy/workspace/infrastructure/repos/view_repo.dart';
 import 'package:flowy_infra/notifier.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
 import 'package:dartz/dartz.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
 
 class IViewImpl extends IView {
   ViewRepository repo;

app_flowy/lib/workspace/infrastructure/i_workspace_impl.dart

@@ -1,7 +1,7 @@
 import 'package:app_flowy/workspace/domain/i_workspace.dart';
 import 'package:app_flowy/workspace/infrastructure/repos/workspace_repo.dart';
 import 'package:dartz/dartz.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/app_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
 
 export 'package:app_flowy/workspace/domain/i_workspace.dart';

app_flowy/lib/workspace/infrastructure/repos/app_repo.dart

@@ -5,14 +5,13 @@ import 'package:dartz/dartz.dart';
 import 'package:flowy_log/flowy_log.dart';
 import 'package:flowy_sdk/dispatch/dispatch.dart';
 import 'package:flowy_sdk/protobuf/flowy-dart-notify/subject.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/app_create.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/app_delete.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/app_query.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/app_query.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/app_update.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/app_update.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pbenum.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/observable.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/view_create.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/view_create.pbenum.dart';
 import 'package:flowy_sdk/rust_stream.dart';
 import 'helper.dart';
 

app_flowy/lib/workspace/infrastructure/repos/doc_repo.dart

@@ -1,8 +1,8 @@
 import 'package:dartz/dartz.dart';
 import 'package:flowy_sdk/dispatch/dispatch.dart';
 import 'package:flowy_sdk/protobuf/flowy-document/doc.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_query.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/view_query.pb.dart';
 
 class DocRepository {
   final String docId;

app_flowy/lib/workspace/infrastructure/repos/helper.dart

@@ -1,10 +1,9 @@
 import 'dart:typed_data';
-import 'package:flowy_log/flowy_log.dart';
 import 'package:flowy_sdk/protobuf/flowy-dart-notify/protobuf.dart';
 import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart';
+import 'package:dartz/dartz.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/observable.pb.dart';
-import 'package:dartz/dartz.dart';
 
 typedef UserNotificationCallback = void Function(UserNotification, Either<Uint8List, UserError>);
 

app_flowy/lib/workspace/infrastructure/repos/trash_repo.dart

@@ -5,9 +5,9 @@ import 'package:app_flowy/workspace/infrastructure/repos/helper.dart';
 import 'package:dartz/dartz.dart';
 import 'package:flowy_sdk/dispatch/dispatch.dart';
 import 'package:flowy_sdk/protobuf/flowy-dart-notify/subject.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/trash_create.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/observable.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/trash_create.pb.dart';
 import 'package:flowy_sdk/rust_stream.dart';
 
 class TrashRepo {

app_flowy/lib/workspace/infrastructure/repos/user_repo.dart

@@ -3,10 +3,10 @@ import 'package:dartz/dartz.dart';
 import 'package:flowy_sdk/dispatch/dispatch.dart';
 import 'package:flowy_sdk/protobuf/flowy-user/errors.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-user/user_profile.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/workspace_create.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/workspace_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/workspace_query.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/workspace_query.pb.dart';
 import 'package:app_flowy/workspace/domain/i_user.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
 
 class UserRepo {
   final UserProfile user;
@@ -14,13 +14,11 @@ class UserRepo {
     required this.user,
   });
 
-  Future<Either<UserProfile, UserError>> fetchUserProfile(
+  Future<Either<UserProfile, UserError>> fetchUserProfile({required String userId}) {
-      {required String userId}) {
     return UserEventGetUserProfile().send();
   }
 
-  Future<Either<Unit, WorkspaceError>> deleteWorkspace(
+  Future<Either<Unit, WorkspaceError>> deleteWorkspace({required String workspaceId}) {
-      {required String workspaceId}) {
     throw UnimplementedError();
   }
 
@@ -57,8 +55,7 @@ class UserRepo {
     });
   }
 
-  Future<Either<Workspace, WorkspaceError>> createWorkspace(
+  Future<Either<Workspace, WorkspaceError>> createWorkspace(String name, String desc) {
-      String name, String desc) {
     final request = CreateWorkspaceRequest.create()
       ..name = name
       ..desc = desc;

app_flowy/lib/workspace/infrastructure/repos/view_repo.dart

@@ -3,11 +3,11 @@ import 'dart:typed_data';
 import 'package:dartz/dartz.dart';
 import 'package:flowy_sdk/dispatch/dispatch.dart';
 import 'package:flowy_sdk/protobuf/flowy-dart-notify/subject.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_query.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_update.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/observable.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/view_create.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/view_query.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/view_update.pb.dart';
 import 'package:flowy_sdk/rust_stream.dart';
 
 import 'package:app_flowy/workspace/domain/i_view.dart';

app_flowy/lib/workspace/infrastructure/repos/workspace_repo.dart

@@ -6,11 +6,11 @@ import 'package:flowy_log/flowy_log.dart';
 import 'package:flowy_sdk/dispatch/dispatch.dart';
 import 'package:flowy_sdk/protobuf/flowy-dart-notify/subject.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-user/user_profile.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/workspace_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/workspace_query.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
 import 'package:flowy_sdk/protobuf/flowy-workspace/observable.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/workspace_create.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/workspace_query.pb.dart';
 import 'package:flowy_sdk/rust_stream.dart';
 
 import 'package:app_flowy/workspace/domain/i_workspace.dart';

app_flowy/lib/workspace/presentation/home/navigation.dart

@@ -1,4 +1,3 @@
-import 'package:app_flowy/workspace/application/menu/menu_bloc.dart';
 import 'package:app_flowy/workspace/domain/page_stack/page_stack.dart';
 import 'package:flowy_infra/image.dart';
 import 'package:flowy_infra/notifier.dart';

app_flowy/lib/workspace/presentation/stack_page/doc/doc_page.dart

@@ -3,9 +3,8 @@ import 'package:app_flowy/workspace/application/doc/doc_bloc.dart';
 import 'package:flowy_infra_ui/style_widget/scrolling/styled_scroll_bar.dart';
 import 'package:flowy_infra_ui/widget/spacing.dart';
 import 'package:flutter_quill/flutter_quill.dart' as quill;
-import 'package:flowy_infra_ui/style_widget/progress_indicator.dart';
 import 'package:flowy_infra_ui/widget/error_page.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:styled_widget/styled_widget.dart';

app_flowy/lib/workspace/presentation/stack_page/doc/doc_stack_page.dart

@@ -3,7 +3,7 @@ import 'package:app_flowy/workspace/domain/i_view.dart';
 import 'package:app_flowy/workspace/domain/page_stack/page_stack.dart';
 import 'package:app_flowy/workspace/domain/view_ext.dart';
 import 'package:flowy_infra_ui/style_widget/text.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
 import 'package:flutter/material.dart';
 
 import 'doc_page.dart';

app_flowy/lib/workspace/presentation/stack_page/doc/widget/toolbar/image_button.dart

@@ -1,7 +1,5 @@
-import 'package:app_flowy/workspace/presentation/widgets/dialogs.dart';
 import 'package:flutter_quill/flutter_quill.dart';
 import 'package:flutter/material.dart';
-
 import 'toolbar_icon_button.dart';
 
 class FlowyImageButton extends StatelessWidget {
@@ -65,19 +63,19 @@ class FlowyImageButton extends StatelessWidget {
   //       webImagePickImpl: webImagePickImpl,
   //     );
 
-  void _typeLink(BuildContext context) {
+  // void _typeLink(BuildContext context) {
-    TextFieldDialog(
+  //   TextFieldDialog(
-      title: 'URL',
+  //     title: 'URL',
-      value: "",
+  //     value: "",
-      confirm: (newValue) {
+  //     confirm: (newValue) {
-        if (newValue.isEmpty) {
+  //       if (newValue.isEmpty) {
-          return;
+  //         return;
-        }
+  //       }
-        final index = controller.selection.baseOffset;
+  //       final index = controller.selection.baseOffset;
-        final length = controller.selection.extentOffset - index;
+  //       final length = controller.selection.extentOffset - index;
 
-        controller.replaceText(index, length, BlockEmbed.image(newValue), null);
+  //       controller.replaceText(index, length, BlockEmbed.image(newValue), null);
-      },
+  //     },
-    ).show(context);
+  //   ).show(context);
-  }
+  // }
 }

app_flowy/lib/workspace/presentation/stack_page/doc/widget/toolbar/tool_bar.dart

@@ -7,7 +7,6 @@ import 'package:styled_widget/styled_widget.dart';
 import 'check_button.dart';
 import 'color_picker.dart';
 import 'header_button.dart';
-import 'image_button.dart';
 import 'link_button.dart';
 import 'toggle_button.dart';
 import 'toolbar_icon_button.dart';

app_flowy/lib/workspace/presentation/stack_page/trash/widget/trash_cell.dart

@@ -2,7 +2,7 @@ import 'package:flowy_infra/image.dart';
 import 'package:flowy_infra_ui/style_widget/icon_button.dart';
 import 'package:flowy_infra_ui/style_widget/text.dart';
 import 'package:flowy_infra_ui/widget/spacing.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/trash_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/trash_create.pb.dart';
 import 'package:flutter/material.dart';
 
 import 'sizes.dart';

app_flowy/lib/workspace/presentation/widgets/home_top_bar.dart

@@ -4,8 +4,8 @@ import 'package:app_flowy/workspace/presentation/home/navigation.dart';
 import 'package:flowy_infra/size.dart';
 import 'package:flowy_infra_ui/widget/rounded_button.dart';
 import 'package:flowy_infra_ui/widget/spacing.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/view_create.pbenum.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pbenum.dart';
 import 'package:flutter/material.dart';
 import 'package:flowy_infra_ui/style_widget/extension.dart';
 import 'package:flowy_infra_ui/style_widget/text.dart';

app_flowy/lib/workspace/presentation/widgets/menu/menu.dart

@@ -1,11 +1,10 @@
 import 'package:app_flowy/workspace/presentation/widgets/menu/widget/top_bar.dart';
-import 'package:dartz/dartz.dart';
 import 'package:flowy_infra/notifier.dart';
 import 'package:flowy_infra/size.dart';
 import 'package:flowy_infra_ui/style_widget/scrolling/styled_list.dart';
 import 'package:flowy_infra_ui/widget/spacing.dart';
 import 'package:flowy_sdk/protobuf/flowy-user/user_profile.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:provider/provider.dart';

app_flowy/lib/workspace/presentation/widgets/menu/widget/app/header/add_button.dart

@@ -4,7 +4,7 @@ import 'package:flowy_infra_ui/flowy_infra_ui.dart';
 import 'package:flowy_infra_ui/style_widget/hover.dart';
 import 'package:flowy_infra_ui/style_widget/icon_button.dart';
 import 'package:flowy_infra_ui/style_widget/text.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:styled_widget/styled_widget.dart';

app_flowy/lib/workspace/presentation/widgets/menu/widget/app/header/header.dart

@@ -6,7 +6,7 @@ import 'package:flowy_infra/theme.dart';
 import 'package:flowy_infra_ui/flowy_infra_ui.dart';
 import 'package:flowy_infra_ui/style_widget/text.dart';
 import 'package:flowy_infra_ui/widget/spacing.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/app_create.pb.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 

app_flowy/lib/workspace/presentation/widgets/menu/widget/app/header/right_click_action.dart

@@ -3,7 +3,6 @@ import 'package:app_flowy/workspace/presentation/widgets/pop_up_action.dart';
 import 'package:dartz/dartz.dart' as dartz;
 import 'package:flowy_infra_ui/flowy_infra_ui.dart';
 import 'package:flutter/material.dart';
-import 'package:tuple/tuple.dart';
 
 class AppDisclosureActions with ActionList<AppDisclosureActionWrapper> implements FlowyOverlayDelegate {
   final Function(dartz.Option<AppDisclosureAction>) onSelected;

app_flowy/lib/workspace/presentation/widgets/menu/widget/app/menu_app.dart

@@ -1,8 +1,8 @@
 import 'package:app_flowy/workspace/presentation/widgets/menu/menu.dart';
 import 'package:app_flowy/workspace/presentation/widgets/menu/widget/app/header/header.dart';
 import 'package:expandable/expandable.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/app_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/app_create.pb.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:app_flowy/startup/startup.dart';

app_flowy/lib/workspace/presentation/widgets/menu/widget/app/section/disclosure_action.dart

@@ -5,7 +5,6 @@ import 'package:flowy_infra/image.dart';
 import 'package:flowy_infra_ui/flowy_infra_ui.dart';
 import 'package:flowy_infra_ui/style_widget/icon_button.dart';
 import 'package:flutter/material.dart';
-import 'package:tuple/tuple.dart';
 
 // [[Widget: LifeCycle]]
 // https://flutterbyexample.com/lesson/stateful-widget-lifecycle

app_flowy/lib/workspace/presentation/widgets/menu/widget/app/section/item.dart

@@ -7,7 +7,7 @@ import 'package:flowy_infra/theme.dart';
 import 'package:flowy_infra_ui/style_widget/hover.dart';
 import 'package:flowy_infra_ui/style_widget/text.dart';
 import 'package:flowy_infra_ui/widget/spacing.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:provider/provider.dart';

app_flowy/lib/workspace/presentation/widgets/menu/widget/app/section/section.dart

@@ -3,7 +3,7 @@ import 'package:app_flowy/workspace/domain/page_stack/page_stack.dart';
 import 'package:app_flowy/workspace/domain/view_ext.dart';
 import 'package:app_flowy/workspace/presentation/widgets/menu/menu.dart';
 import 'package:app_flowy/workspace/presentation/widgets/menu/widget/app/menu_app.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/view_create.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/view_create.pb.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';

app_flowy/packages/flowy_infra_ui/lib/style_widget/button.dart

@@ -1,11 +1,9 @@
 import 'package:flowy_infra/size.dart';
-import 'package:flowy_infra/theme.dart';
 import 'package:flowy_infra_ui/style_widget/hover.dart';
 import 'package:flowy_infra_ui/style_widget/text.dart';
 import 'package:flowy_infra_ui/widget/spacing.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
-import 'package:provider/provider.dart';
 
 class FlowyButton extends StatelessWidget {
   final Widget text;

app_flowy/packages/flowy_sdk/lib/dispatch/dispatch.dart

@@ -2,6 +2,8 @@ import 'dart:ffi';
 import 'package:dartz/dartz.dart';
 import 'package:flowy_log/flowy_log.dart';
 import 'package:flowy_sdk/protobuf/dart-ffi/ffi_response.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace/errors.pb.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace/event.pb.dart';
 import 'package:isolates/isolates.dart';
 import 'package:isolates/ports.dart';
 import 'package:ffi/ffi.dart';
@@ -12,7 +14,7 @@ import 'dart:typed_data';
 import 'package:flowy_sdk/ffi.dart' as ffi;
 import 'package:flowy_sdk/protobuf/flowy-user/protobuf.dart';
 import 'package:flowy_sdk/protobuf/dart-ffi/protobuf.dart';
-import 'package:flowy_sdk/protobuf/flowy-workspace/protobuf.dart';
+import 'package:flowy_sdk/protobuf/flowy-workspace-infra/protobuf.dart';
 import 'package:flowy_sdk/protobuf/flowy-document/protobuf.dart';
 // ignore: unused_import
 import 'package:flowy_sdk/protobuf/flowy-infra/protobuf.dart';
@@ -46,8 +48,7 @@ class Dispatch {
   }
 }
 
-Future<Either<Uint8List, Uint8List>> _extractPayload(
+Future<Either<Uint8List, Uint8List>> _extractPayload(Future<Either<FFIResponse, FlowyError>> responseFuture) {
-    Future<Either<FFIResponse, FlowyError>> responseFuture) {
   return responseFuture.then((result) {
     return result.fold(
       (response) {
@@ -73,8 +74,7 @@ Future<Either<Uint8List, Uint8List>> _extractPayload(
   });
 }
 
-Future<Either<FFIResponse, FlowyError>> _extractResponse(
+Future<Either<FFIResponse, FlowyError>> _extractResponse(Completer<Uint8List> bytesFuture) {
-    Completer<Uint8List> bytesFuture) {
   return bytesFuture.future.then((bytes) {
     try {
       final response = FFIResponse.fromBuffer(bytes);