github-such-software/hash-wallet
1
0
Fork 1
mirror of https://github.com/Such-Software/hash-wallet.git synced 2026-10-27 06:18:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into cw-1440-new-buy-sell-flow

Browse Source
This commit is contained in:
Robert Malikowski
2026-08-11 13:03:39 +02:00
parent a6abf1bf4b 19653afeab
commit a56dab50cb
108 changed files with 5195 additions and 2920 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/src/widgets/blockchain_height_widget.dart
+2 -1
View File
@@ -65,7 +65,8 @@ class BlockchainHeightState extends State<BlockchainHeightWidget> {
try {
final int _height;
if (restoreHeightController.text.isNotEmpty) {
_height = int.tryParse(restoreHeightController.text) ?? 0;
final digits = restoreHeightController.text.replaceAll(RegExp(r'[^0-9]'), '');
_height = int.tryParse(digits) ?? 0;
} else {
_height = 0;
}
lib/src/widgets/bottom_sheet/token_selection_bottom_sheet.dart
+3 -3
View File
@@ -381,7 +381,7 @@ class _TokenSelectionContentState extends State<_TokenSelectionContent> {
detectedWalletType: WalletType.solana,
detectedCurrency: selectedToken!,
isValid: true,
amount: widget.paymentRequest.amount,
amount: widget.paymentRequest.resolveTokenAmount(selectedToken!),
note: widget.paymentRequest.note,
scheme: widget.paymentRequest.scheme,
pjUri: widget.paymentRequest.pjUri,
@@ -398,7 +398,7 @@ class _TokenSelectionContentState extends State<_TokenSelectionContent> {
detectedWalletType: WalletType.tron,
detectedCurrency: selectedToken!,
isValid: true,
amount: widget.paymentRequest.amount,
amount: widget.paymentRequest.resolveTokenAmount(selectedToken!),
note: widget.paymentRequest.note,
scheme: widget.paymentRequest.scheme,
pjUri: widget.paymentRequest.pjUri,
@@ -415,7 +415,7 @@ class _TokenSelectionContentState extends State<_TokenSelectionContent> {
detectedWalletType: selectedNetwork!,
detectedCurrency: selectedToken!,
isValid: true,
amount: widget.paymentRequest.amount,
amount: widget.paymentRequest.resolveTokenAmount(selectedToken!),
note: widget.paymentRequest.note,
scheme: widget.paymentRequest.scheme,
pjUri: widget.paymentRequest.pjUri,
lib/src/widgets/new_list_row/list_item_regular_row_widget.dart
+22 -10
View File
@@ -93,16 +93,28 @@ class ListItemRegularRowWidget extends StatelessWidget {
children: [
leadingIcon!,
Positioned(
right: -3,
bottom: -3,
child: CakeImageWidget(
imageUrl: badgeIconPath!,
width: badgeIconSize ?? 10,
height: badgeIconSize ?? 10,
errorWidget: leadingIconErrorWidget,
colorFilter: iconColor == null
? null
: ColorFilter.mode(iconColor!, BlendMode.srcIn),
right: -2,
bottom: -2,
child: Container(
width: 16,
height: 16,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(6),
border: Border.all(
color: theme.colorScheme.surfaceContainerHigh,
width: 2,
),
color: theme.colorScheme.onSurface,
),
padding: const EdgeInsets.all(2),
child: CakeImageWidget(
imageUrl: badgeIconPath!,
width: badgeIconSize ?? 12,
height: badgeIconSize ?? 12,
fit: BoxFit.cover,
color: theme.colorScheme.surface,
errorWidget: leadingIconErrorWidget,
),
),
),
],