diff --git a/ios/Runner/InfoBase.plist b/ios/Runner/InfoBase.plist index 4f7036498..2292d0b66 100644 --- a/ios/Runner/InfoBase.plist +++ b/ios/Runner/InfoBase.plist @@ -191,7 +191,7 @@ <true/> </dict> <key>NSCameraUsageDescription</key> - <string>Used for scan QR code</string> + <string>Used for scanning QR code and can be used to capture images for identification purposes by third-party providers.</string> <key>NSDocumentsFolderUsageDescription</key> <string>We need access to documents folder for getting access to open/save backup file</string> <key>NSFaceIDUsageDescription</key> diff --git a/lib/src/screens/send/widgets/send_card.dart b/lib/src/screens/send/widgets/send_card.dart index 07fb34cb2..5f15c9c4d 100644 --- a/lib/src/screens/send/widgets/send_card.dart +++ b/lib/src/screens/send/widgets/send_card.dart @@ -189,7 +189,7 @@ class SendCardState extends State<SendCard> with AutomaticKeepAliveClientMixin<S output.loadContact(contact); }, validator: validator, - selectedCurrency: sendViewModel.currency, + selectedCurrency: sendViewModel.selectedCryptoCurrency, ); }), if (output.isParsedAddress) diff --git a/lib/src/screens/send/widgets/send_template_card.dart b/lib/src/screens/send/widgets/send_template_card.dart index fbc7e659d..4f62616e3 100644 --- a/lib/src/screens/send/widgets/send_template_card.dart +++ b/lib/src/screens/send/widgets/send_template_card.dart @@ -69,40 +69,44 @@ class SendTemplateCard extends StatelessWidget { validator: sendTemplateViewModel.templateValidator), Padding( padding: EdgeInsets.only(top: 20), - child: AddressTextField( - selectedCurrency: sendTemplateViewModel.cryptoCurrency, - controller: _addressController, - onURIScanned: (uri) { - final paymentRequest = PaymentRequest.fromUri(uri); - _addressController.text = paymentRequest.address; - _cryptoAmountController.text = paymentRequest.amount; - }, - options: [ - AddressTextFieldOption.paste, - AddressTextFieldOption.qrCode, - AddressTextFieldOption.addressBook - ], - onPushPasteButton: (context) async { - template.output.resetParsedAddress(); - await template.output.fetchParsedAddress(context); - }, - onPushAddressBookButton: (context) async { - template.output.resetParsedAddress(); - await template.output.fetchParsedAddress(context); - }, - buttonColor: Theme.of(context).extension<SendPageTheme>()!.textFieldButtonColor, - borderColor: Theme.of(context).extension<SendPageTheme>()!.textFieldBorderColor, - textStyle: TextStyle( - fontSize: 14, - fontWeight: FontWeight.w500, - color: Colors.white, - ), - hintStyle: TextStyle( - fontSize: 14, - fontWeight: FontWeight.w500, - color: Theme.of(context).extension<SendPageTheme>()!.textFieldHintColor, - ), - validator: sendTemplateViewModel.addressValidator, + child: Observer( + builder: (context) { + return AddressTextField( + selectedCurrency: template.selectedCurrency, + controller: _addressController, + onURIScanned: (uri) { + final paymentRequest = PaymentRequest.fromUri(uri); + _addressController.text = paymentRequest.address; + _cryptoAmountController.text = paymentRequest.amount; + }, + options: [ + AddressTextFieldOption.paste, + AddressTextFieldOption.qrCode, + AddressTextFieldOption.addressBook + ], + onPushPasteButton: (context) async { + template.output.resetParsedAddress(); + await template.output.fetchParsedAddress(context); + }, + onPushAddressBookButton: (context) async { + template.output.resetParsedAddress(); + await template.output.fetchParsedAddress(context); + }, + buttonColor: Theme.of(context).extension<SendPageTheme>()!.textFieldButtonColor, + borderColor: Theme.of(context).extension<SendPageTheme>()!.textFieldBorderColor, + textStyle: TextStyle( + fontSize: 14, + fontWeight: FontWeight.w500, + color: Colors.white, + ), + hintStyle: TextStyle( + fontSize: 14, + fontWeight: FontWeight.w500, + color: Theme.of(context).extension<SendPageTheme>()!.textFieldHintColor, + ), + validator: sendTemplateViewModel.addressValidator, + ); + } ), ), Padding(