fix(EWM-262): prevent sending tip3 token to yourself (#468)

Co-authored-by: Egor Komarov <[email protected]>
broxus · Sep 4, 2024 · cf51d2e · cf51d2e
1 parent 5bf8f9a
commit cf51d2e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/assets/translations/en.json b/assets/translations/en.json
@@ -550,5 +550,6 @@
   "accountAddedSheetTitle": "New account has been added successfully",
   "accountAddedSheetSubtitle": "When adding a new account, a new public key was also added. They were connected with each other.",
   "accountAddedSheetSwitch": "Switch to this account",
-  "accountAddedSheetContinue": "Continue without switching"
+  "accountAddedSheetContinue": "Continue without switching",
+  "invalidReceiverAddress": "Invalid receiver address"
 }
diff --git a/assets/translations/ko.json b/assets/translations/ko.json
@@ -550,5 +550,6 @@
   "accountAddedSheetTitle": "New account has been added successfully",
   "accountAddedSheetSubtitle": "When adding a new account, a new public key was also added. They were connected with each other.",
   "accountAddedSheetSwitch": "Switch to this account",
-  "accountAddedSheetContinue": "Continue without switching"
+  "accountAddedSheetContinue": "Continue without switching",
+  "invalidReceiverAddress": "Invalid receiver address"
 }
diff --git a/...wallet_prepare_transfer/wallet_prepare_transfer_page/wallet_prepare_transfer_page_wm.dart b/...wallet_prepare_transfer/wallet_prepare_transfer_page/wallet_prepare_transfer_page_wm.dart
@@ -209,6 +209,16 @@ class WalletPrepareTransferPageWidgetModel extends CustomWidgetModel<
 
   void onSubmittedAmountWord(_) => commentFocus.requestFocus();
 
+  String? validateAddressField(String? value) {
+    if (value?.isEmpty ?? true) {
+      return LocaleKeys.addressIsEmpty.tr();
+    }
+    if (_selectedAsset?.isNative != true && model.address.address == value) {
+      return LocaleKeys.invalidReceiverAddress.tr();
+    }
+    return null;
+  }
+
   Future<void> _init() async {
     final acc = model.findAccountByAddress(model.address);
     if (acc == null) {

diff --git a/...t_prepare_transfer/wallet_prepare_transfer_page/widgets/wallet_prepare_transfer_view.dart b/...t_prepare_transfer/wallet_prepare_transfer_page/widgets/wallet_prepare_transfer_view.dart
@@ -63,9 +63,7 @@ class WalletPrepareTransferView extends StatelessWidget {
                     focusNode: _wm.receiverFocus,
                     onSubmit: _wm.onSubmittedReceiverAddress,
                     inputFormatters: [_wm.addressFilterFormatter],
-                    validator: (value) => value?.isEmpty ?? true
-                        ? LocaleKeys.addressIsEmpty.tr()
-                        : null,
+                    validator: _wm.validateAddressField,
                     suffixes: [_buildReceiverSuffix()],
                   ),
                   WalletPrepareTransferAmountInput(

diff --git a/lib/generated/locale_keys.g.dart b/lib/generated/locale_keys.g.dart
@@ -567,4 +567,5 @@ abstract class LocaleKeys {
   static const accountAddedSheetSubtitle = 'accountAddedSheetSubtitle';
   static const accountAddedSheetSwitch = 'accountAddedSheetSwitch';
   static const accountAddedSheetContinue = 'accountAddedSheetContinue';
+  static const invalidReceiverAddress = 'invalidReceiverAddress';
 }