From 13d0a62fec927f28f790f6bb2976ec5e26ad4430 Mon Sep 17 00:00:00 2001
From: artur <brugeman.artur@gmail.com>
Date: Mon, 12 Feb 2024 12:42:32 +0300
Subject: [PATCH] Fix bad validity checks on confirm modal

---
 .../Modal/ModalConfirmConnect/ModalConfirmConnect.tsx     | 8 +++++---
 src/modules/backend.ts                                    | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/Modal/ModalConfirmConnect/ModalConfirmConnect.tsx b/src/components/Modal/ModalConfirmConnect/ModalConfirmConnect.tsx
index 5814d30..19facda 100644
--- a/src/components/Modal/ModalConfirmConnect/ModalConfirmConnect.tsx
+++ b/src/components/Modal/ModalConfirmConnect/ModalConfirmConnect.tsx
@@ -38,7 +38,7 @@ export const ModalConfirmConnect = () => {
   const { name, url = '', icon = '' } = triggerApp || {}
 
   let appUrl = url || searchParams.get('appUrl') || ''
-  // console.log('referrer', window.document.referrer, appUrl)
+  console.log('referrer', window.document.referrer, appUrl)
   if (!appUrl && window.document.referrer) {
     try {
       const u = new URL(window.document.referrer)
@@ -62,9 +62,11 @@ export const ModalConfirmConnect = () => {
   })
 
   const isNpubExists = npub.trim().length && keys.some((key) => key.npub === npub)
-  const isAppNpubExists = appNpub.trim().length && apps.some((app) => app.appNpub === appNpub)
+  // App doesn't exist yet!
+  // const isAppNpubExists = appNpub.trim().length && apps.some((app) => app.appNpub === appNpub)
   const isPendingReqIdExists = pendingReqId.trim().length && pending.some((p) => p.id === pendingReqId)
-  if (isModalOpened && (!isNpubExists || !isAppNpubExists || (pendingReqId && !isPendingReqIdExists))) {
+  console.log("pending", {isModalOpened, isPendingReqIdExists, isNpubExists, /*isAppNpubExists,*/ pendingReqId, pending});
+  if (!isPopup && isModalOpened && (!isNpubExists /*|| !isAppNpubExists*/ || (pendingReqId && !isPendingReqIdExists))) {
     closeModalAfterRequest()
     return null
   }
diff --git a/src/modules/backend.ts b/src/modules/backend.ts
index de9889e..ade6dcc 100644
--- a/src/modules/backend.ts
+++ b/src/modules/backend.ts
@@ -745,6 +745,7 @@ export class NoauthBackend {
         // OAuth flow
         const confirmMethod = method === 'connect' ? 'confirm-connect' : 'confirm-event'
         const authUrl = `${self.swg.location.origin}/key/${npub}?${confirmMethod}=true&appNpub=${appNpub}&reqId=${id}&popup=true`
+//        const authUrl = `${self.swg.location.origin}/key/${npub}?popup=true`
         console.log('sending authUrl', authUrl, 'for', req)
         // NOTE: if you set 'Update on reload' in the Chrome SW console
         // then this message will cause a new tab opened by the peer,