Merge branch 'main' of https://github.com/manticmarkets/mantic

web/components/contract-card.tsx

@@ -24,25 +24,24 @@ export function ContractCard(props: {
   const { probPercent } = contractMetrics(contract)
 
   return (
-    <div className={className}>
+    <div
+      className={clsx(
+        'bg-white hover:bg-gray-100 shadow-md rounded-lg p-6 relative',
+        className
+      )}
+    >
       <Link href={contractPath(contract)}>
-        <a>
-          <div className="bg-white hover:bg-gray-100 shadow-md rounded-lg p-6">
-            <Row className="justify-between gap-4 mb-2">
-              <p className="font-medium text-indigo-700">{question}</p>
-              <ResolutionOrChance
-                className="items-center"
-                resolution={resolution}
-                probPercent={probPercent}
-              />
-            </Row>
-            <AbbrContractDetails
-              contract={contract}
-              showHotVolume={showHotVolume}
-            />
-          </div>
-        </a>
+        <a className="absolute left-0 right-0 top-0 bottom-0" />
       </Link>
+      <Row className="justify-between gap-4 mb-2">
+        <p className="font-medium text-indigo-700">{question}</p>
+        <ResolutionOrChance
+          className="items-center"
+          resolution={resolution}
+          probPercent={probPercent}
+        />
+      </Row>
+      <AbbrContractDetails contract={contract} showHotVolume={showHotVolume} />
     </div>
   )
 }

web/components/user-page.tsx

@@ -1,3 +1,4 @@
+import clsx from 'clsx'
 import { firebaseLogout, User } from '../lib/firebase/users'
 import { CreatorContractsList } from './contracts-list'
 import { Title } from './title'
@@ -16,7 +17,7 @@ export function UserLink(props: {
   const { name, username, showUsername, className } = props
 
   return (
-    <SiteLink href={`/${username}`} className={className}>
+    <SiteLink href={`/${username}`} className={clsx('z-10', className)}>
       {name}
       {showUsername && ` (@${username})`}
     </SiteLink>

web/pages/activity.tsx

@@ -82,7 +82,7 @@ export function ActivityFeed(props: {
         <Title text="Recent Activity" />
         <Col className="w-full bg-white self-center divide-gray-300 divide-y">
           {activeContracts.map((contract, i) => (
-            <div className="py-6 px-2 sm:px-4">
+            <div key={contract.id} className="py-6 px-2 sm:px-4">
               <ContractFeed
                 contract={contract}
                 bets={contractBets[i]}