Merge branch 'main' of github.com:interledger/testnet into fund-card-…

…wallet
interledger · Oct 25, 2024 · 599efd3 · 599efd3
2 parents c790604 + 0e4aeef
commit 599efd3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/packages/wallet/frontend/src/components/WalletAddressesTable.tsx b/packages/wallet/frontend/src/components/WalletAddressesTable.tsx
@@ -104,7 +104,7 @@ export const CopyWalletAddress = () => {
   let pointer = walletAddress.url
 
   if (walletAddress.isCard) {
-    const url = new URL(walletAddress.url)
+    const url = new URL(walletAddress.url.replace('$', 'https://'))
     pointer = `$ilp.dev${url.pathname}`
   }
 

diff --git a/packages/wallet/frontend/src/pages/auth/login.tsx b/packages/wallet/frontend/src/pages/auth/login.tsx
@@ -140,6 +140,12 @@ const LoginPage: NextPageWithLayout = () => {
             />
           </button>
         </Form>
+        <p className="mt-auto text-center font-extralight text-green dark:text-green-neon">
+          Not a customer?{' '}
+          <Link href="signup" className="font-medium underline">
+            Create an account
+          </Link>
+        </p>
       </div>
       <Image
         className="mt-auto object-cover md:hidden"
@@ -149,12 +155,6 @@ const LoginPage: NextPageWithLayout = () => {
         width={500}
         height={200}
       />
-      <p className="mt-auto text-center font-extralight text-green dark:text-green-neon">
-        Not a customer?{' '}
-        <Link href="signup" className="font-medium underline">
-          Create an account
-        </Link>
-      </p>
     </>
   )
 }

diff --git a/packages/wallet/frontend/src/pages/auth/signup.tsx b/packages/wallet/frontend/src/pages/auth/signup.tsx
@@ -40,7 +40,7 @@ const SignUpPage: NextPageWithLayout = () => {
   return (
     <>
       <HeaderLogo header="Welcome" />
-      <h2 className="mb-5 mt-10 text-xl text-green dark:text-teal-neon">
+      <h2 className="mb-5 mt-2 text-xl text-green dark:text-teal-neon">
         Create Account
       </h2>
       <div className="z-10 w-2/3">

diff --git a/packages/wallet/frontend/src/pages/index.tsx b/packages/wallet/frontend/src/pages/index.tsx
@@ -77,9 +77,6 @@ export const getServerSideProps: GetServerSideProps<{
   const response = await accountService.list(ctx.req.headers.cookie)
   const user = await userService.me(ctx.req.headers.cookie)
 
-  console.log('response', JSON.stringify(response, null, 2))
-  console.log('user', JSON.stringify(user, null, 2))
-
   if (!response.success || !user.success) {
     return {
       notFound: true