Merge pull request #26 from thematters/develop

Update develop to main branch

app/routes/api.fund.ts

@@ -29,7 +29,9 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
       return json({ state: STATE.successful, rounds: [] })
     }
 
-    const baseRounds = _.orderBy(rawRounds, d => Number(d.fromBlock), ['desc'])
+    const baseRounds = _.orderBy(rawRounds, (d) => Number(d.fromBlock), [
+      'desc',
+    ])
 
     const rounds = []
     for (const round of baseRounds) {

app/routes/api.unclaim.ts

@@ -8,6 +8,7 @@ import { isAddress } from 'viem'
 import { optimism, optimismSepolia } from 'viem/chains'
 
 import { ERROR, STATE } from '@constant'
+import { formatDate, formatRoundId } from '@util/format'
 import { getPublicPath, readEnvs, readFile, sendError } from '@util/server'
 import { initClient, initDistribution } from '@util/viem'
 
@@ -58,18 +59,28 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
     }
 
     const rounds = _.orderBy(rawRounds, ['fromBlock'], ['desc']).map(
-      ({ root, amountTotal: rootAmount, dirpath: path }) => ({
+      ({
+        id,
+        root,
+        amountTotal: rootAmount,
+        dirpath: path,
+        fromTime,
+        toTime,
+      }) => ({
+        roundId: formatRoundId(id),
         root,
         rootAmount,
         path,
+        from: formatDate(fromTime),
+        to: formatDate(toTime),
       })
     )
 
     // gather each rounds' data
     let count = 0
     const data = []
     for (const round of rounds) {
-      const { root, rootAmount, path } = round
+      const { roundId, root, rootAmount, path, from, to } = round
       const distPath = getPublicPath(`${srcPath}/${path}/distrib.json`)
       const treePath = getPublicPath(`${srcPath}/${path}/treedump.json`)
 
@@ -116,12 +127,15 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
       const base = dist.reduce(
         (r, d) => {
           r.items.push({
+            roundId,
             cid: d.id,
             url: d.url,
             title: d.title,
             proof: tree[d.id]?.proof,
             share: tree[d.id]?.share,
             amount: d.clr_amount,
+            from,
+            to,
           })
           r.cids.push(d.id)
           return r
@@ -132,7 +146,7 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
       // filter out claimed
       const client = initClient(chain)
       const distribution = initDistribution(addressDistribution, client)
-      const cidChunks = _.chunk(base.cids, 2) as Array<string[]>
+      const cidChunks = _.chunk(base.cids, 3) as Array<string[]>
 
       let claimed = [] as string[]
       for (const cids of cidChunks) {

app/routes/claim/Records/Record/index.tsx

@@ -16,24 +16,31 @@ const Record = ({ data }: Props) => {
     'gap-y-4 md:gap-y-0'
   )
 
-  const leftCss = clsx('t-14', 'font-normal', 'col-span-7', 'one-line')
-  const linkCss = clsx('hover:text-grass')
+  const leftCss = clsx('font-normal', 'col-span-7')
+  const roundCss = clsx('t-12', 'opacity-60')
+  const linkCss = clsx('mt-1', 't-14', 'one-line')
   const rightCss = clsx('pr-3')
   const amountHeadCss = clsx('t-12', 'font-normal', 'opacity-60')
   const amountCss = clsx('mt-1', 't-14', 'font-medium')
+  const amountUnitCss = clsx('t-12 font-normal')
 
   return (
     <section className={baseCss}>
       <section className={leftCss}>
-        <NavLink className={linkCss} to={data.url} target="_blank">
-          {data.title}
-        </NavLink>
+        <section className={roundCss}>
+          {data.from} - {data.to} · No. {data.roundId}
+        </section>
+        <section className={linkCss}>
+          <NavLink className="hover:text-grass" to={data.url} target="_blank">
+            {data.title}
+          </NavLink>
+        </section>
       </section>
       <section className={rightCss}>
         <section className={amountHeadCss}>Amount</section>
         <section className={amountCss}>
-          {_.floor(data.amount, 2)}
-          <span className="t-12"> USDT</span>
+          {data.amount.toFixed(6)}
+          <span className={amountUnitCss}> USDT</span>
         </section>
       </section>
     </section>

app/routes/claim/Records/index.tsx

@@ -37,7 +37,7 @@ const Records = ({ data, callback }: Props) => {
     (r, v) => {
       const sub = v.items.reduce(
         (r: Record<string, any>, d: Record<string, any>) => {
-          const amount = _.floor(Number(d.amount) / 1e6, 2)
+          const amount = Number(d.amount) / 1e6
           r.items.push({ ...d, root: v.root, amount })
           r.amount = r.amount + amount
           return r
@@ -110,7 +110,7 @@ const Records = ({ data, callback }: Props) => {
       </section>
       <section className={totalCss}>
         <span className={totalHeadCss}>Total Amount:</span>
-        <span className={totalNumCss}>{base.total.toFixed(2)} USDT</span>
+        <span className={totalNumCss}>{base.total.toFixed(6)} USDT</span>
       </section>
       <ButtonBase css={btnCss} color="dim" click={claim}>
         {isPending ? <SvgSpinner css="animate-spin" height={27} /> : 'Claim'}

app/routes/showcase/Board/Meta/Basic/index.tsx

@@ -9,7 +9,7 @@ type Props = {
 }
 
 const Meta = ({ board }: Props) => {
-  const { contentURI, name, redirectURI } = board
+  const { contentURI, name, location } = board
 
   const baseCss = clsx('grid grid-cols-1', 'gap-y-4')
   const imgCss = clsx('h-auto', 'w-full', 'rounded-2xl')
@@ -31,7 +31,7 @@ const Meta = ({ board }: Props) => {
         <p className={nameCss}>{name}</p>
         <p className={locationCss}>
           Board Location:
-          <NavLink className={linkCss} to={redirectURI} target="_blank">
+          <NavLink className={linkCss} to={location} target="_blank">
             Discover Page
             <SvgLink css={svgLinkCss} />
           </NavLink>

app/util/format.ts

@@ -7,14 +7,13 @@ export const formatAddress = (address: string, size = 3) =>
 export const formatDate = (time: number | string, pattern = 'MMM DD YYYY') =>
   dayjs(time).format(pattern)
 
-export const formatRound = (round: Record<string, any>) => {
-  const id = (round.id || '').replace('#', '')
-  const amount = round.amount || 0
-  return {
-    ...round,
-    id: _.padStart(id, 3, '0'),
-    price: amount.toFixed(2),
-    from: formatDate(round.from),
-    to: formatDate(round.to),
-  }
-}
+export const formatRoundId = (id: string) =>
+  _.padStart((id || '').replace('#', ''), 3, '0')
+
+export const formatRound = (round: Record<string, any>) => ({
+  ...round,
+  id: formatRoundId(round.id),
+  price: (round.amount || 0).toFixed(2),
+  from: formatDate(round.from),
+  to: formatDate(round.to),
+})

bin/sync-up-latest-round.mjs

@@ -44,6 +44,7 @@ export const main = async (branch = 'prod') => {
     }
 
     await writeFile(`${AssetsDir}/rounds.json`, roundsContent, { signal })
+
     console.log(
       new Date(),
       `written rounds.json with ${(roundsContent.length / 1024).toFixed(1)} KBytes.`