Merge pull request #8067

53be72c make_uri disallows standalone payment ids (woodser)

1 files changed, 2 insertions, 6 deletions

diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 2a190add5..bdac3109f 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -13728,12 +13728,8 @@ std::string wallet2::make_uri(const std::string &address, const std::string &pay
 
   if (!payment_id.empty())
   {
-    crypto::hash pid32;
-    if (!wallet2::parse_long_payment_id(payment_id, pid32))
-    {
-      error = "Invalid payment id";
-      return std::string();
-    }
+    error = "Standalone payment id deprecated, use integrated address instead";
+    return std::string();
   }
 
   std::string uri = "monero:" + address;