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

Merge branch 'cake-tech:dev' into dev

Browse Source
This commit is contained in:
BSN ∞/21M
2026-04-08 10:34:49 +02:00
committed by GitHub
parent 0bd4b381a2 c4aa3442f7
commit c57da37b5b
2 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/src/widgets/base_alert_dialog.dart
+42 -39
View File
@@ -210,45 +210,48 @@ class BaseAlertDialog extends StatelessWidget {
padding: const EdgeInsets.all(16.0),
child: GestureDetector(
onTap: () => null,
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(24),
color: Theme.of(context).colorScheme.surface,
),
child: Padding(
padding: const EdgeInsets.all(24.0),
child: Stack(
clipBehavior: Clip.none,
children: [
if (headerImageUrl != null) headerImage(context, headerImageUrl!),
Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
if (headerImageUrl != null) const SizedBox(height: 50),
Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
if (headerText?.isNotEmpty ?? false) headerTitle(context),
titleText != null
? title(context)
: SizedBox(height: 16),
isDividerExists
? Padding(
padding: EdgeInsets.only(top: 16, bottom: 8),
child: const HorizontalSectionDivider(),
)
: Offstage(),
Padding(
padding: EdgeInsets.symmetric(vertical: 25),
child: content(context),
)
],
),
// if (isBottomDividerExists) const HorizontalSectionDivider(),
actionButtons(context)
],
),
],
child: Material(
borderRadius: BorderRadius.circular(24),
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(24),
color: Theme.of(context).colorScheme.surface,
),
child: Padding(
padding: const EdgeInsets.all(24.0),
child: Stack(
clipBehavior: Clip.none,
children: [
if (headerImageUrl != null) headerImage(context, headerImageUrl!),
Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
if (headerImageUrl != null) const SizedBox(height: 50),
Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
if (headerText?.isNotEmpty ?? false) headerTitle(context),
titleText != null
? title(context)
: SizedBox(height: 16),
isDividerExists
? Padding(
padding: EdgeInsets.only(top: 16, bottom: 8),
child: const HorizontalSectionDivider(),
)
: Offstage(),
Padding(
padding: EdgeInsets.symmetric(vertical: 25),
child: content(context),
)
],
),
// if (isBottomDividerExists) const HorizontalSectionDivider(),
actionButtons(context)
],
),
],
),
),
),
),
lib/view_model/dashboard/dashboard_view_model.dart
+5 -3
View File
@@ -482,14 +482,16 @@ abstract class DashboardViewModelBase with Store {
}
// printV("Transaction disposer callback (relevantTxs: ${relevantTxs.length} current: ${transactions.length})");
String _txIdentityString(String txHash, TransactionDirection direction) => '${txHash}_$direction';
String _txIdentityString(String txHash, TransactionDirection direction) => "${txHash}_$direction";
String _txIdentityStringConfirmations(String txHash, TransactionDirection direction, int confirmations) => "${txHash}_${direction}_$confirmations";
final existingKeys = transactions
.map((item) => _txIdentityString(item.transaction.txHash, item.transaction.direction))
.map((item) => _txIdentityStringConfirmations(item.transaction.txHash, item.transaction.direction, item.transaction.confirmations))
.toSet();
final newTransactions = relevantTxs
.where((tx) => !existingKeys.contains(_txIdentityString(tx.txHash, tx.direction)))
.where((tx) => !existingKeys.contains(_txIdentityStringConfirmations(tx.txHash, tx.direction, tx.confirmations)))
.map((tx) => TransactionListItem(
transaction: tx,
balanceViewModel: balanceViewModel,