From e38181ce3f61a2a93b291f4c51dfb5f2a9b6534c Mon Sep 17 00:00:00 2001
From: ingawei <ingawei@gmail.com>
Date: Mon, 16 Sep 2024 10:14:20 -0700
Subject: [PATCH 1/2] heirarchy

---
 common/src/envs/constants.ts                  |  2 +-
 web/components/contract/contract-details.tsx  |  5 +-
 .../contract/twomba-contract-page.tsx         | 59 ++++++++-----------
 3 files changed, 27 insertions(+), 39 deletions(-)

diff --git a/common/src/envs/constants.ts b/common/src/envs/constants.ts
index dacb9f0b75..ac64dbfe9a 100644
--- a/common/src/envs/constants.ts
+++ b/common/src/envs/constants.ts
@@ -11,7 +11,7 @@ export const CONFIGS: { [env: string]: EnvConfig } = {
   DEV: DEV_CONFIG,
 }
 
-export const TWOMBA_ENABLED = false
+export const TWOMBA_ENABLED = true
 export const PRODUCT_MARKET_FIT_ENABLED = false
 export const SPICE_PRODUCTION_ENABLED = true
 export const SPICE_TO_MANA_CONVERSION_RATE = 1
diff --git a/web/components/contract/contract-details.tsx b/web/components/contract/contract-details.tsx
index def1e2aa19..9f7e238052 100644
--- a/web/components/contract/contract-details.tsx
+++ b/web/components/contract/contract-details.tsx
@@ -25,8 +25,9 @@ export function AuthorInfo(props: {
   contract: Contract
   resolverId?: string // live updated
   className?: string
+  userNameClass?: string
 }) {
-  const { contract, resolverId, className } = props
+  const { contract, resolverId, className, userNameClass } = props
   const { creatorId, creatorName, creatorUsername, creatorAvatarUrl } = contract
   const resolver = useDisplayUserById(resolverId)
   return (
@@ -38,7 +39,7 @@ export function AuthorInfo(props: {
           size={'xs'}
         />
       </UserHovercard>
-      <UserHovercard userId={creatorId}>
+      <UserHovercard userId={creatorId} className={userNameClass}>
         <UserLink
           user={{
             id: creatorId,
diff --git a/web/components/contract/twomba-contract-page.tsx b/web/components/contract/twomba-contract-page.tsx
index 1c306afaba..f416328ad6 100644
--- a/web/components/contract/twomba-contract-page.tsx
+++ b/web/components/contract/twomba-contract-page.tsx
@@ -327,11 +327,6 @@ export function TwombaContractPageContent(props: ContractParams) {
             <Col className="w-full gap-3 lg:gap-4">
               <Col>
                 <div ref={titleRef}>
-                  <AuthorInfo
-                    contract={props.contract}
-                    resolverId={liveContract.resolverId}
-                    className="text-ink-600 mb-0.5"
-                  />
                   <VisibilityIcon
                     contract={props.contract}
                     isLarge
@@ -342,17 +337,14 @@ export function TwombaContractPageContent(props: ContractParams) {
                     canEdit={isAdmin || isCreator || isMod}
                   />
                 </div>
-                <Row className="items-center gap-2">
-                  <MarketTopics
-                    contract={props.contract}
-                    dashboards={dashboards}
-                    topics={topics}
-                    isSpiceMarket={isSpiceMarket}
-                  />
-                </Row>
               </Col>
 
-              <div className="text-ink-600 flex flex-wrap items-center justify-end gap-y-1 text-sm">
+              <Row className="text-ink-600  items-center justify-between gap-y-1 text-sm">
+                <AuthorInfo
+                  contract={props.contract}
+                  resolverId={liveContract.resolverId}
+                  userNameClass={'hidden sm:block'}
+                />
                 <TwombaContractSummaryStats
                   contractId={props.contract.id}
                   creatorId={props.contract.creatorId}
@@ -361,7 +353,7 @@ export function TwombaContractPageContent(props: ContractParams) {
                   editable={isCreator || isAdmin || isMod}
                   isCashContract={liveContract.token === 'CASH'}
                 />
-              </div>
+              </Row>
               <ContractOverview
                 contract={liveContract}
                 key={liveContract.id} // reset state when switching play vs cash
@@ -390,14 +382,6 @@ export function TwombaContractPageContent(props: ContractParams) {
 
               <YourTrades contract={liveContract} yourNewBets={yourNewBets} />
             </Col>
-            {showRelatedMarketsBelowBet && (
-              <RelatedContractsGrid
-                contracts={relatedMarkets}
-                loadMore={loadMore}
-                showOnlyAfterBet={true}
-                justBet={justBet}
-              />
-            )}
             {showReview && user && (
               <div className="relative my-2">
                 <ReviewPanel
@@ -444,6 +428,15 @@ export function TwombaContractPageContent(props: ContractParams) {
               hasReviewed={!!userHasReviewed}
             />
             <ContractDescription contract={livePlayContract} />
+            <Row className="items-center gap-2">
+              <MarketTopics
+                contract={props.contract}
+                dashboards={dashboards}
+                topics={topics}
+                isSpiceMarket={isSpiceMarket}
+              />
+            </Row>
+
             <Row className="my-2 flex-wrap items-center justify-between gap-y-2"></Row>
             {!user && <SidebarSignUpButton className="mb-4 flex md:hidden" />}
             {!!user && (
@@ -455,19 +448,7 @@ export function TwombaContractPageContent(props: ContractParams) {
                 contract={props.contract}
               />
             )}
-            {showExplainerPanel && (
-              <div className="bg-canvas-50 -mx-4 p-4 pb-0 md:-mx-8 xl:hidden">
-                <h2 className={clsx('text-ink-600  text-xl')}>What is this?</h2>
-                <ExplainerPanel />
-              </div>
-            )}
-            {comments.length > 3 && (
-              <RelatedContractsGrid
-                contracts={relatedMarkets}
-                loadMore={loadMore}
-                justBet={!showRelatedMarketsBelowBet && justBet}
-              />
-            )}
+
             {isResolved && resolution !== 'CANCEL' && (
               <>
                 <ContractLeaderboard
@@ -507,6 +488,12 @@ export function TwombaContractPageContent(props: ContractParams) {
                 betReplies={betReplies}
               />
             </div>
+            {showExplainerPanel && (
+              <div className="bg-canvas-50 -mx-4 p-4 pb-0 md:-mx-8 xl:hidden">
+                <h2 className={clsx('text-ink-600  text-xl')}>What is this?</h2>
+                <ExplainerPanel />
+              </div>
+            )}
             <RelatedContractsGrid
               contracts={relatedMarkets}
               loadMore={loadMore}

From 1f3c248fd1cdad72dfb9b5014b91c10cbe40c09d Mon Sep 17 00:00:00 2001
From: ingawei <ingawei@gmail.com>
Date: Mon, 16 Sep 2024 10:15:01 -0700
Subject: [PATCH 2/2] no true

---
 common/src/envs/constants.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/src/envs/constants.ts b/common/src/envs/constants.ts
index ac64dbfe9a..dacb9f0b75 100644
--- a/common/src/envs/constants.ts
+++ b/common/src/envs/constants.ts
@@ -11,7 +11,7 @@ export const CONFIGS: { [env: string]: EnvConfig } = {
   DEV: DEV_CONFIG,
 }
 
-export const TWOMBA_ENABLED = true
+export const TWOMBA_ENABLED = false
 export const PRODUCT_MARKET_FIT_ENABLED = false
 export const SPICE_PRODUCTION_ENABLED = true
 export const SPICE_TO_MANA_CONVERSION_RATE = 1