Skip to content

Commit 745c8f0

Browse files
Merge branch 'master' into perf/new_chat_sheet
2 parents 5893ff2 + 0f0bf92 commit 745c8f0

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

lib/ui/auth_flow/welcome_screen.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,9 @@ class _WelcomeScreenState extends ConsumerState<WelcomeScreen> {
8888
),
8989
bottomNavigationBar: SafeArea(
9090
top: false,
91+
bottom: false,
9192
child: Padding(
92-
padding: EdgeInsets.only(bottom: 32.h),
93+
padding: EdgeInsets.only(bottom: 54.h),
9394
child: Column(
9495
mainAxisSize: MainAxisSize.min,
9596
children: [
@@ -98,7 +99,7 @@ class _WelcomeScreenState extends ConsumerState<WelcomeScreen> {
9899
visualState: WnButtonVisualState.secondary,
99100
onPressed: _isCreatingAccount ? null : () => context.go('/login'),
100101
),
101-
Gap(12.h),
102+
Gap(4.h),
102103
WnFilledButton(
103104
label: 'Sign Up',
104105
loading: _isCreatingAccount,

lib/ui/contact_list/widgets/chat_list_active_account_avatar.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ class _ChatListActiveAccountAvatarState extends ConsumerState<ChatListActiveAcco
8383
imageUrl: imageUrl,
8484
displayName: displayName,
8585
size: 36.r,
86+
showBorder: true,
8687
),
8788
);
8889
}

0 commit comments

Comments
 (0)