Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: EWM-286 #524

Merged
merged 4 commits into from
Sep 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class AccountListItem extends StatelessWidget {
child: SeparatedRow(
children: [
UserAvatar(
address: address,
address: account.address.address,
),
Expanded(
child: SeparatedColumn(
Expand Down
6 changes: 3 additions & 3 deletions lib/feature/profile/key_detail/view/key_detail_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'package:app/app/service/service.dart';
import 'package:app/di/di.dart';
import 'package:app/feature/profile/profile.dart';
import 'package:app/generated/generated.dart';
import 'package:app/widgets/user_avatar/user_avatar.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
Expand Down Expand Up @@ -222,9 +223,8 @@ class KeyDetailView extends StatelessWidget {
},
),
),
leading: CommonBackgroundedIconWidget.svg(
svg: Assets.images.person.path,
backgroundColor: colors.backgroundAlpha,
leading: UserAvatar(
address: account.account.address.address,
),
titleText: account.name,
subtitleText: account.address.toEllipseString(),
Expand Down
2 changes: 1 addition & 1 deletion lib/feature/wallet/widgets/account_info.dart
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class AccountInfo extends StatelessWidget {
),
children: [
UserAvatar(
address: address,
address: account.address.address,
),
Flexible(
child: SeparatedColumn(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,12 @@ class ChangeColorBottomSheet
builder: (_, IdentifyColor? selectedColor) {
return SizedBox(
height: DimensSizeV2.d64,
child: ListView(
scrollDirection: Axis.horizontal,
padding: EdgeInsets.zero,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
for (var i = 0; i < wm.count; i++)
_ItemColor(
key: ValueKey(wm.availableColors[i].color.value),
padding: i == wm.lastIndex
? EdgeInsets.zero
: const EdgeInsets.only(right: DimensSizeV2.d6),
color: wm.availableColors[i].color,
isSelected: wm.availableColors[i] == selectedColor,
onPressed: () =>
Expand Down Expand Up @@ -98,30 +94,25 @@ class _ItemColor extends StatelessWidget {
required this.color,
required this.isSelected,
required this.onPressed,
required this.padding,
super.key,
});

final Color color;
final bool isSelected;
final VoidCallback onPressed;
final EdgeInsetsGeometry padding;

@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: onPressed,
behavior: HitTestBehavior.opaque,
child: Padding(
padding: padding,
child: _Wrapper(
isVisible: isSelected,
child: SizedBox.expand(
child: DecoratedBox(
decoration: BoxDecoration(
color: color,
shape: BoxShape.circle,
),
child: _Wrapper(
isVisible: isSelected,
child: SizedBox.expand(
child: DecoratedBox(
decoration: BoxDecoration(
color: color,
shape: BoxShape.circle,
),
),
),
Expand Down
Loading