mirror of
https://github.com/Such-Software/hash-wallet.git
synced 2026-11-17 09:46:39 +01:00
v6.3.0 Release Candidate (#3414)
* v6.3.0 Release Candidate - the new transaction history - Radar in Apps screen - Zcash update - Flutter update - Parts of the Refactor should improve how amounts are handled in the app and fix any issue with amounts improve handling sending to aliases - Improvements for Cake Pay mobile - Bug fixes * don't use memo for note/message values * save message in QR locally in the notes field * Make stealth addresses generated from silent payment, not reliant on output index (#3420) * - fix swaps showing only on primary account - switch tron default node - privacy fixes * - enlarge destination tag and make it copiable - migrate users on hashvault - minor fix
This commit is contained in:
@@ -241,7 +241,9 @@ class _NewSendPageState extends State<NewSendPage> {
|
||||
widget.initialPaymentRequest!.scheme.toLowerCase()) {
|
||||
_addressControllers[0].text = widget.initialPaymentRequest!.address;
|
||||
_amountControllers[0].text = widget.initialPaymentRequest!.amount;
|
||||
_memoControllers[0].text = widget.initialPaymentRequest!.note;
|
||||
// _memoControllers[0].text = widget.initialPaymentRequest!.note;
|
||||
_applyNote(widget.initialPaymentRequest!.note, 0);
|
||||
|
||||
final contractAddress = widget.initialPaymentRequest!.contractAddress;
|
||||
if (contractAddress != null && contractAddress.isNotEmpty) {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
@@ -1308,7 +1310,9 @@ class _NewSendPageState extends State<NewSendPage> {
|
||||
);
|
||||
} catch (e) {}
|
||||
}
|
||||
_memoControllers[_selectedOutput].text = paymentRequest.note;
|
||||
// _memoControllers[_selectedOutput].text = paymentRequest.note;
|
||||
|
||||
_applyNote(paymentRequest.note, _selectedOutput);
|
||||
}
|
||||
|
||||
Future<void> _handleSwapFlow(
|
||||
@@ -1456,6 +1460,15 @@ class _NewSendPageState extends State<NewSendPage> {
|
||||
|
||||
String _wrapAmount(String amount, int maxChars) =>
|
||||
amount.length <= maxChars ? amount : "${amount.substring(0, maxChars - 3)}...";
|
||||
|
||||
// TODO: make a separate variable for memo in payment request model
|
||||
void _applyNote(String note, int selectedOutput) {
|
||||
if (widget.sendViewModel.hasMemos && note.length <= widget.sendViewModel.maxMemoLength) {
|
||||
widget.sendViewModel.outputs[selectedOutput].memo = note;
|
||||
} else {
|
||||
widget.sendViewModel.outputs[selectedOutput].note = note;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class SendHelpPage extends StatelessWidget {
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import 'package:cake_wallet/generated/i18n.dart';
|
||||
import 'package:cake_wallet/new-ui/widgets/copy_wrapper.dart';
|
||||
import 'package:cake_wallet/new-ui/widgets/new_primary_button.dart';
|
||||
import 'package:cake_wallet/new-ui/widgets/receive_page/receive_top_bar.dart';
|
||||
import 'package:cake_wallet/new-ui/widgets/swap_page/swap_modal_header.dart';
|
||||
@@ -9,6 +10,7 @@ import 'package:cake_wallet/view_model/exchange/exchange_trade_view_model.dart';
|
||||
import 'package:cw_core/crypto_currency.dart';
|
||||
import 'package:cw_core/payment_uris.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
|
||||
class SwapSendExternalModal extends StatefulWidget {
|
||||
const SwapSendExternalModal(
|
||||
@@ -166,10 +168,59 @@ class _SwapSendExternalModalState extends State<SwapSendExternalModal> {
|
||||
),
|
||||
)),
|
||||
if (widget.exchangeTradeViewModel.trade.extraId != null)
|
||||
Text(
|
||||
"${S.of(context).destination_tag} ${widget.exchangeTradeViewModel.trade.extraId}",
|
||||
style: TextStyle(
|
||||
fontSize: 12, color: Theme.of(context).colorScheme.onSurfaceVariant),
|
||||
CopyWrapper(
|
||||
data: ClipboardData(
|
||||
text: widget.exchangeTradeViewModel.trade.extraId!),
|
||||
builder: (context, copied) => Container(
|
||||
width: double.infinity,
|
||||
decoration: BoxDecoration(
|
||||
color: Theme.of(context).colorScheme.surfaceContainer,
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(16),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
spacing: 8,
|
||||
children: [
|
||||
Text(
|
||||
S.of(context).destination_tag,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontSize: 14,
|
||||
fontWeight: FontWeight.w500,
|
||||
color: Theme.of(context).colorScheme.onSurfaceVariant),
|
||||
),
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
spacing: 8,
|
||||
children: [
|
||||
Flexible(
|
||||
child: Text(
|
||||
widget.exchangeTradeViewModel.trade.extraId!,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
fontSize: 18,
|
||||
fontWeight: FontWeight.w600,
|
||||
color: Theme.of(context).colorScheme.primary),
|
||||
),
|
||||
),
|
||||
AnimatedSwitcher(
|
||||
duration: const Duration(milliseconds: 200),
|
||||
child: Icon(
|
||||
copied ? Icons.check : Icons.copy,
|
||||
key: ValueKey(copied),
|
||||
size: 18,
|
||||
color: Theme.of(context).colorScheme.primary,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
Row(
|
||||
spacing: 8,
|
||||
|
||||
Reference in New Issue
Block a user