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

fix new send UI (#2103)

Browse Source 
* minor ui fixes

* localization

* Update confirm_sending_bottom_sheet_widget.dart
This commit is contained in:
Serhii
2025-03-21 19:11:26 +02:00
committed by GitHub
parent 597a716f9d
commit d44621e6c7
33 changed files with 87 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/src/screens/cake_pay/cards/cake_pay_confirm_purchase_card_page.dart
+2 -2
View File
@@ -384,7 +384,7 @@ class CakePayBuyCardDetailPage extends BasePage {
paymentId: S.of(popupContext).payment_id,
paymentIdValue: order?.orderId,
expirationTime: cakePayPurchaseViewModel.formattedRemainingTime,
titleText: 'Confirm Transaction',
titleText: S.of(popupContext).confirm_transaction,
titleIconPath: cakePayPurchaseViewModel.sendViewModel.selectedCryptoCurrency.iconPath,
currency: cakePayPurchaseViewModel.sendViewModel.selectedCryptoCurrency,
amount: S.of(popupContext).send_amount,
@@ -432,7 +432,7 @@ class CakePayBuyCardDetailPage extends BasePage {
builder: (BuildContext context) {
loadingBottomSheetContext = context;
return LoadingBottomSheet(
titleText: 'Generating transaction',
titleText: S.of(context).generating_transaction,
);
},
);
lib/src/screens/exchange_trade/exchange_trade_page.dart
+3 -3
View File
@@ -252,7 +252,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
builder: (BuildContext context) {
loadingBottomSheetContext = context;
return LoadingBottomSheet(
titleText: 'Generating transaction',
titleText: S.of(context).generating_transaction,
);
},
);
@@ -271,7 +271,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
return ConfirmSendingBottomSheet(
key: ValueKey('exchange_trade_page_confirm_sending_bottom_sheet_key'),
currentTheme: widget.currentTheme,
titleText: 'Confirm Transaction',
titleText: S.of(bottomSheetContext).confirm_transaction,
titleIconPath: widget.exchangeTradeViewModel.sendViewModel.selectedCryptoCurrency.iconPath,
currency: widget.exchangeTradeViewModel.sendViewModel.selectedCryptoCurrency,
amount: S.of(bottomSheetContext).send_amount,
@@ -307,7 +307,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
builder: (BuildContext bottomSheetContext) {
return InfoBottomSheet(
currentTheme: widget.currentTheme,
titleText: 'Transaction Sent',
titleText: S.of(bottomSheetContext).transaction_sent,
contentImage: 'assets/images/birthday_cake.svg',
actionButtonText: S.of(bottomSheetContext).close,
actionButtonKey: ValueKey('send_page_sent_dialog_ok_button_key'),
lib/src/screens/send/send_page.dart
+13 -5
View File
@@ -532,7 +532,7 @@ class SendPage extends BasePage {
builder: (BuildContext context) {
loadingBottomSheetContext = context;
return LoadingBottomSheet(
titleText: 'Generating transaction',
titleText: S.of(context).generating_transaction,
);
},
);
@@ -550,7 +550,7 @@ class SendPage extends BasePage {
builder: (BuildContext bottomSheetContext) {
return ConfirmSendingBottomSheet(
key: ValueKey('send_page_confirm_sending_dialog_key'),
titleText: 'Confirm Transaction',
titleText: S.of(bottomSheetContext).confirm_transaction,
currentTheme: currentTheme,
titleIconPath: sendViewModel.selectedCryptoCurrency.iconPath,
currency: sendViewModel.selectedCryptoCurrency,
@@ -598,7 +598,7 @@ class SendPage extends BasePage {
currentTheme: currentTheme,
showDontAskMeCheckbox: true,
onCheckboxChanged: (value) => sendViewModel.setShowAddressBookPopup(!value),
titleText: 'Transaction Sent',
titleText: S.of(bottomSheetContext).transaction_sent,
contentImage: 'assets/images/contact_icon.svg',
contentImageColor: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
content: S.of(bottomSheetContext).add_contact_to_address_book,
@@ -607,6 +607,8 @@ class SendPage extends BasePage {
rightButtonText: 'Yes',
actionLeftButton: () {
Navigator.of(bottomSheetContext).pop();
Navigator.of(context)
.pushNamedAndRemoveUntil(Routes.dashboard, (route) => false);
RequestReviewHandler.requestReview();
newContactAddress = null;
},
@@ -620,11 +622,17 @@ class SendPage extends BasePage {
)
: InfoBottomSheet(
currentTheme: currentTheme,
titleText: 'Transaction Sent',
titleText: S.of(bottomSheetContext).transaction_sent,
contentImage: 'assets/images/birthday_cake.svg',
actionButtonText: S.of(bottomSheetContext).close,
actionButtonKey: ValueKey('send_page_sent_dialog_ok_button_key'),
actionButton: () => Navigator.of(bottomSheetContext).pop());
actionButton: () {
Navigator.of(bottomSheetContext).pop();
Navigator.of(context)
.pushNamedAndRemoveUntil(Routes.dashboard, (route) => false);
RequestReviewHandler.requestReview();
newContactAddress = null;
});
},
);
lib/src/screens/transaction_details/rbf_details_page.dart
+2 -2
View File
@@ -170,7 +170,7 @@ class RBFDetailsPage extends BasePage {
builder: (BuildContext context) {
loadingBottomSheetContext = context;
return LoadingBottomSheet(
titleText: 'Generating transaction',
titleText: S.of(context).generating_transaction,
);
},
);
@@ -188,7 +188,7 @@ class RBFDetailsPage extends BasePage {
builder: (BuildContext bottomSheetContext) {
return ConfirmSendingBottomSheet(
key: ValueKey('rbf_confirm_sending_bottom_sheet'),
titleText: 'Confirm Transaction',
titleText: S.of(bottomSheetContext).confirm_transaction,
currentTheme: currentTheme,
titleIconPath: transactionDetailsViewModel.sendViewModel.selectedCryptoCurrency.iconPath,
currency: transactionDetailsViewModel.sendViewModel.selectedCryptoCurrency,
lib/src/widgets/bottom_sheet/confirm_sending_bottom_sheet_widget.dart
+9 -18
View File
@@ -275,7 +275,7 @@ class AddressTile extends StatelessWidget {
fontFamily: 'Lato',
fontWeight: FontWeight.w600,
color: currentTheme.type == ThemeType.bright
? Theme.of(context).extension<BalancePageTheme>()!.labelTextColor
? Theme.of(context).extension<CakeTextTheme>()!.titleColor.withOpacity(0.5)
: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
decoration: TextDecoration.none,
);
@@ -297,9 +297,7 @@ class AddressTile extends StatelessWidget {
),
buildSegmentedAddress(
address: address,
evenTextStyle: currentTheme.type == ThemeType.bright
? itemSubTitleTextStyle
: addressTextStyle,
evenTextStyle: addressTextStyle,
oddTextStyle: itemSubTitleTextStyle,
),
],
@@ -363,7 +361,7 @@ class AddressExpansionTile extends StatelessWidget {
fontFamily: 'Lato',
fontWeight: FontWeight.w600,
color: currentTheme.type == ThemeType.bright
? Theme.of(context).extension<BalancePageTheme>()!.labelTextColor
? Theme.of(context).extension<CakeTextTheme>()!.titleColor.withOpacity(0.5)
: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
decoration: TextDecoration.none,
);
@@ -378,14 +376,14 @@ class AddressExpansionTile extends StatelessWidget {
child: Padding(
padding: EdgeInsets.symmetric(horizontal: 14, vertical: isBatchSending ? 0 : 8),
child: ExpansionTile(
childrenPadding: EdgeInsets.zero,
childrenPadding: isBatchSending ? const EdgeInsets.only(bottom: 8) : EdgeInsets.zero,
tilePadding: EdgeInsets.zero,
dense: true,
visualDensity: VisualDensity.compact,
title: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(isBatchSending ? name : contactType, style: itemTitleTextStyle),
Expanded(child: Text(isBatchSending ? name : contactType, style: itemTitleTextStyle, softWrap: true)),
Text(isBatchSending ? amount : name,
style: TextStyle(
fontSize: 14,
@@ -400,17 +398,10 @@ class AddressExpansionTile extends StatelessWidget {
Row(
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
buildSegmentedAddress(
address: address,
evenTextStyle: currentTheme.type == ThemeType.bright
? itemSubTitleTextStyle
: addressTextStyle,
oddTextStyle: itemSubTitleTextStyle,
),
],
child: buildSegmentedAddress(
address: address,
evenTextStyle: addressTextStyle,
oddTextStyle: itemSubTitleTextStyle,
),
),
],