From d6c8af8eba601236d8eeeffc5783f9dc3071f2b6 Mon Sep 17 00:00:00 2001
From: ieow <cwlee0@gmail.com>
Date: Wed, 7 Dec 2022 13:30:34 +0800
Subject: [PATCH 1/3] fix: solana pay request link

---
 src/components/payments/SolanaPay.vue | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/components/payments/SolanaPay.vue b/src/components/payments/SolanaPay.vue
index ca6a1c3e..e6c1f1ca 100644
--- a/src/components/payments/SolanaPay.vue
+++ b/src/components/payments/SolanaPay.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { createTransfer, parseURL, TransferRequestURL } from "@solana/pay";
+import { createTransfer, parseURL, TransactionRequestURL, TransferRequestURL } from "@solana/pay";
 import { LAMPORTS_PER_SOL, PublicKey, TransactionMessage, VersionedTransaction } from "@solana/web3.js";
 import { findAllLookUpTable } from "@toruslabs/solana-controllers";
 import log from "loglevel";
@@ -43,17 +43,7 @@ const onCancel = () => {
 const onConfirm = () => {
   emits("onApproved", transaction.value);
 };
-const isUrl = (UrlString: string) => {
-  try {
-    const splitString = UrlString.split(":");
-    if (["https", "http"].includes(splitString[1])) {
-      return Boolean(new URL(UrlString));
-    }
-    return false;
-  } catch (e) {
-    return false;
-  }
-};
+
 const estimateTxFee = ref(0);
 const router = useRouter();
 watch(transaction, async () => {
@@ -88,7 +78,12 @@ onMounted(async () => {
     if (!requestLink.length) {
       // set loaded
       invalidLink.value = "Invalid Link";
-    } else if (isUrl(requestLink)) {
+      return;
+    }
+
+    const parsed = parseURL(requestLink);
+
+    if ((parsed as TransactionRequestURL).link) {
       // request link is an url. fetch transaction from url
       const result = await parseSolanaPayRequestLink(requestLink, ControllerModule.selectedAddress, ControllerModule.connection);
       if (result.transaction.feePayer && result.transaction.recentBlockhash) {

From 835d6d35b0c4a4a3d76748181373f2bdd31602fc Mon Sep 17 00:00:00 2001
From: ieow <cwlee0@gmail.com>
Date: Wed, 7 Dec 2022 13:57:05 +0800
Subject: [PATCH 2/3] fix: refactor

---
 src/components/payments/SolanaPay.vue | 4 ++--
 src/utils/solanaHelpers.ts            | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/payments/SolanaPay.vue b/src/components/payments/SolanaPay.vue
index e6c1f1ca..2c8d8b35 100644
--- a/src/components/payments/SolanaPay.vue
+++ b/src/components/payments/SolanaPay.vue
@@ -85,7 +85,7 @@ onMounted(async () => {
 
     if ((parsed as TransactionRequestURL).link) {
       // request link is an url. fetch transaction from url
-      const result = await parseSolanaPayRequestLink(requestLink, ControllerModule.selectedAddress, ControllerModule.connection);
+      const result = await parseSolanaPayRequestLink(parsed as TransactionRequestURL, ControllerModule.selectedAddress, ControllerModule.connection);
       if (result.transaction.feePayer && result.transaction.recentBlockhash) {
         const messageV0 = new TransactionMessage({
           payerKey: result.transaction.feePayer,
@@ -115,7 +115,7 @@ onMounted(async () => {
         return;
       } catch (e) {}
       // parse solanapay format
-      const result = parseURL(requestLink) as TransferRequestURL;
+      const result = parsed as TransferRequestURL;
       const { recipient, splToken, reference, memo, amount, message } = result;
       // redirect to transfer page if amount is not available
       if (amount === undefined) {
diff --git a/src/utils/solanaHelpers.ts b/src/utils/solanaHelpers.ts
index bddae629..53805429 100644
--- a/src/utils/solanaHelpers.ts
+++ b/src/utils/solanaHelpers.ts
@@ -1,4 +1,4 @@
-import { parseURL, TransactionRequestURL } from "@solana/pay";
+import { TransactionRequestURL } from "@solana/pay";
 import {
   Account,
   AccountLayout,
@@ -445,9 +445,9 @@ export const validateUrlTransactionSignature = (transaction: Transaction, select
   transaction.serialize({ requireAllSignatures: false });
 };
 
-export const parseSolanaPayRequestLink = async (request: string, account: string, connection: Connection) => {
+export const parseSolanaPayRequestLink = async (request: TransactionRequestURL, account: string, connection: Connection) => {
   log.info(request);
-  const { label, message, link } = parseURL(request) as TransactionRequestURL;
+  const { label, message, link } = request;
   // get link
   // return {"label":"<label>","icon":"<icon>"}
   // update label and icon on tx display

From 2fc0edfc05446a29ca09fadbbe1730cb76f0bae2 Mon Sep 17 00:00:00 2001
From: ieow <cwlee0@gmail.com>
Date: Wed, 7 Dec 2022 14:12:37 +0800
Subject: [PATCH 3/3] fix: publickey qrcode transfer

---
 src/components/payments/SolanaPay.vue | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/components/payments/SolanaPay.vue b/src/components/payments/SolanaPay.vue
index 2c8d8b35..95079512 100644
--- a/src/components/payments/SolanaPay.vue
+++ b/src/components/payments/SolanaPay.vue
@@ -81,6 +81,18 @@ onMounted(async () => {
       return;
     }
 
+    // check for publickey format, redirect to transfer page
+    try {
+      const address = new PublicKey(requestLink);
+      router.push({
+        name: "walletTransfer",
+        query: {
+          receiverPubKey: address.toBase58(),
+        },
+      });
+      return;
+    } catch (e) {}
+
     const parsed = parseURL(requestLink);
 
     if ((parsed as TransactionRequestURL).link) {
@@ -103,17 +115,6 @@ onMounted(async () => {
         };
       }
     } else {
-      // check for publickey format, redirect to transfer page
-      try {
-        const address = new PublicKey(requestLink);
-        router.push({
-          name: "walletTransfer",
-          query: {
-            receiverPubKey: address.toBase58(),
-          },
-        });
-        return;
-      } catch (e) {}
       // parse solanapay format
       const result = parsed as TransferRequestURL;
       const { recipient, splToken, reference, memo, amount, message } = result;