From f48bf9bf7cd8dccac7542ee3838c4f436fd22307 Mon Sep 17 00:00:00 2001
From: kyranjamie <kyran.burraston@gmail.com>
Date: Fri, 3 Jun 2022 11:24:56 +0100
Subject: [PATCH] chore: tidy test app, adding request accounts

---
 .../account-request.tsx                       |   6 +-
 test-app/src/components/auth.tsx              |   4 +-
 test-app/src/components/home.tsx              | 107 ++++++++++--------
 3 files changed, 61 insertions(+), 56 deletions(-)

diff --git a/src/app/pages/choose-account-request/account-request.tsx b/src/app/pages/choose-account-request/account-request.tsx
index 44b485f8813..1a4d44a30f8 100644
--- a/src/app/pages/choose-account-request/account-request.tsx
+++ b/src/app/pages/choose-account-request/account-request.tsx
@@ -29,15 +29,13 @@ export function AccountRequest() {
     if (!accounts) throw new Error('Cannot request account details with no account');
 
     if (!tabId || !id || !origin) {
-      logger.error(
-        'Missing necessary search param values. All values are necessary to respond to app'
-      );
+      logger.error('Missing necessary search param values needed to request account');
       return;
     }
 
     grantDomainPermission(origin);
     sendRequestAccountResponseToTab({ tabId, id, account: accounts[index] });
-    await delay(1000);
+    await delay(60);
     window.close();
   };
 
diff --git a/test-app/src/components/auth.tsx b/test-app/src/components/auth.tsx
index 4d0d3f469ec..9367d3e302f 100644
--- a/test-app/src/components/auth.tsx
+++ b/test-app/src/components/auth.tsx
@@ -3,7 +3,7 @@ import { Button, Text, Box, ButtonGroup } from '@stacks/ui';
 import { useConnect } from '@stacks/connect-react';
 import { OnboardingSelectors } from '@tests/integration/onboarding/onboarding.selectors';
 
-export const Auth: React.FC = () => {
+export const JwtAuth: React.FC = () => {
   const { doOpenAuth } = useConnect();
   return (
     <Box>
@@ -17,7 +17,7 @@ export const Auth: React.FC = () => {
           onClick={() => doOpenAuth()}
           data-testid={OnboardingSelectors.SignUpBtn}
         >
-          Sign up
+          JWT Authentication
         </Button>
       </ButtonGroup>
     </Box>
diff --git a/test-app/src/components/home.tsx b/test-app/src/components/home.tsx
index 18509f19b36..4dc5adbcfdd 100644
--- a/test-app/src/components/home.tsx
+++ b/test-app/src/components/home.tsx
@@ -1,7 +1,7 @@
 import React, { useContext, useState } from 'react';
 import { AppContext } from '@common/context';
 import { Box, Text, Flex, BoxProps, Button } from '@stacks/ui';
-import { Auth } from './auth';
+import { JwtAuth } from './auth';
 import { Tab } from './tab';
 import { Status } from './status';
 import { Counter } from './counter';
@@ -63,62 +63,69 @@ const Page: React.FC<{ tab: Tabs; setTab: (value: Tabs) => void }> = ({ tab, set
 export const Home: React.FC = () => {
   const state = useContext(AppContext);
   const [tab, setTab] = useState<Tabs>('debug');
-  const { doSTXTransfer } = useConnect();
   const [account, setAccount] = useState<any>(null);
   return (
     <Container>
       <Text as="h1" textStyle="display.large" fontSize={7} mb={'loose'} display="block">
         Testnet Demo
       </Text>
-      {state.userData ? <Page tab={tab} setTab={setTab} /> : <Auth />}
-      <Button
-        my="base"
-        onClick={() => {
-          // console.log('request accounts app', getStacksProvider());
-          getStacksProvider()
-            .request('stx_requestAccounts')
-            .then(resp => {
-              setAccount(resp);
-              console.log('request acct resp', resp);
+      {state.userData || account ? (
+        <Page tab={tab} setTab={setTab} />
+      ) : (
+        <>
+          <JwtAuth />
+          <Button
+            size="lg"
+            my="base"
+            onClick={() => {
+              // console.log('request accounts app', getStacksProvider());
+              getStacksProvider()
+                .request('stx_requestAccounts')
+                .then(resp => {
+                  setAccount(resp);
+                  console.log('request acct resp', resp);
+                });
+            }}
+          >
+            Request accounts
+          </Button>
+        </>
+      )}
+      {/* 
+        <Button
+          my="base"
+          ml="base"
+          // isDisabled={account === null}
+          onClick={() => {
+            // getStacksProvider()
+            //   .request('stx_signTransactionRequest', [{}])
+            //   .then(resp => {
+            //     // setAccount(resp);
+            //     console.log('transaction req from inpage', resp);
+            //   });
+            // const stxAddress = getAddressFromPublicKey(
+            //   account[0].stxPublicKey,
+            //   TransactionVersion.Testnet
+            // );
+            // console.log({ stxAddress });
+            doSTXTransfer({
+              network: network as any,
+              amount: '100',
+              memo: 'From demo app',
+              recipient: 'ST1X6M947Z7E58CNE0H8YJVJTVKS9VW0PHEG3NHN3',
+              stxAddress: 'ST17YZQB1228EK9MPHQXA8GC4G3HVWZ66X779FEBY',
+              // stxAddress,
+              onFinish: data => {
+                console.log('finished stx transfer!', data);
+              },
+              onCancel: () => {
+                console.log('popup closed!');
+              },
             });
-        }}
-      >
-        Request accounts
-      </Button>
-      <Button
-        my="base"
-        ml="base"
-        // isDisabled={account === null}
-        onClick={() => {
-          // getStacksProvider()
-          //   .request('stx_signTransactionRequest', [{}])
-          //   .then(resp => {
-          //     // setAccount(resp);
-          //     console.log('transaction req from inpage', resp);
-          //   });
-          // const stxAddress = getAddressFromPublicKey(
-          //   account[0].stxPublicKey,
-          //   TransactionVersion.Testnet
-          // );
-          // console.log({ stxAddress });
-          doSTXTransfer({
-            network: network as any,
-            amount: '100',
-            memo: 'From demo app',
-            recipient: 'ST1X6M947Z7E58CNE0H8YJVJTVKS9VW0PHEG3NHN3',
-            stxAddress: 'ST17YZQB1228EK9MPHQXA8GC4G3HVWZ66X779FEBY',
-            // stxAddress,
-            onFinish: data => {
-              console.log('finished stx transfer!', data);
-            },
-            onCancel: () => {
-              console.log('popup closed!');
-            },
-          });
-        }}
-      >
-        Sign transaction
-      </Button>
+          }}
+        >
+          Sign transaction
+        </Button> */}
 
       {/* <Button
         my="base"