Merge dev

This commit is contained in:
2026-02-25 13:35:18 +05:30
parent 17c2c2afbb
commit 4d4a9b6a66
9 changed files with 258 additions and 0 deletions

View File

@@ -3,6 +3,10 @@ import 'package:design_system/design_system.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_modular/flutter_modular.dart';
<<<<<<< Updated upstream
=======
import 'package:krow_core/core.dart';
>>>>>>> Stashed changes
import '../../blocs/client_settings_bloc.dart';
/// A widget that displays the log out button.
@@ -58,7 +62,11 @@ class SettingsLogout extends StatelessWidget {
style: UiTypography.headline3m.textPrimary,
),
content: Text(
<<<<<<< Updated upstream
'Are you sure you want to log out?',
=======
t.client_settings.profile.log_out_confirmation,
>>>>>>> Stashed changes
style: UiTypography.body2r.textSecondary,
),
actions: <Widget>[