Merge branch 'mochi-web-preview'

consolelabs · Apr 4, 2024 · 44c0cec · 44c0cec
2 parents 25645f8 + 2e6a332
commit 44c0cec
Show file tree

Hide file tree

Showing 108 changed files with 951 additions and 132 deletions.
diff --git a/.changeset/cuddly-bears-push.md b/.changeset/cuddly-bears-push.md
diff --git a/.changeset/dirty-berries-try.md b/.changeset/dirty-berries-try.md
diff --git a/.changeset/silver-dryers-bathe.md b/.changeset/silver-dryers-bathe.md
diff --git a/.changeset/twelve-dolphins-add.md b/.changeset/twelve-dolphins-add.md
diff --git a/apps/mochi-web/components/Amount.tsx b/apps/mochi-web/components/Amount.tsx
@@ -71,23 +71,25 @@ export default function Amount({
         'gap-y-1.5 grid-cols-1': isLongNumber,
       })}
     >
-      {isMoniker ? (
-        <div className="my-auto flex justify-center items-center w-7 h-7 rounded-full border border-[#E5E4E3]">
-          <span className="text-sm">{MonikerIcons.get(tokenIcon)}</span>
-        </div>
-      ) : (
-        <Avatar
-          size={size === 'lg' || size === 'md' ? 'xs' : 'xxs'}
-          className={clsx('shrink-0 aspect-square [&>img]:rounded-none', {
-            /* 'my-1': size === 'md' && alignment === 'center' && !isLongNumber, */
-            'row-start-1 row-span-2 my-auto':
-              alignment === 'left' && !isLongNumber,
-            'mx-auto': isLongNumber,
-          })}
-          src={tokenIcon || coinIcon.src}
-          smallSrc={platformIcon}
-        />
-      )}
+      <div className="h-8 flex items-center">
+        {isMoniker ? (
+          <div className="my-auto flex justify-center items-center w-7 h-7 rounded-full border border-[#E5E4E3]">
+            <span className="text-sm">{MonikerIcons.get(tokenIcon)}</span>
+          </div>
+        ) : (
+          <Avatar
+            size={size === 'lg' || size === 'md' ? 'xs' : 'xxs'}
+            className={clsx('shrink-0 aspect-square [&>img]:rounded-none', {
+              /* 'my-1': size === 'md' && alignment === 'center' && !isLongNumber, */
+              'row-start-1 row-span-2 my-auto':
+                alignment === 'left' && !isLongNumber,
+              'mx-auto': isLongNumber,
+            })}
+            src={tokenIcon || coinIcon.src}
+            smallSrc={platformIcon}
+          />
+        )}
+      </div>
       <div
         className={clsx('flex gap-x-1 items-center', {
           'flex-col items-center': isLongNumber,

diff --git a/apps/mochi-web/components/MochiWidget/AmountInput/AmountInput.tsx b/apps/mochi-web/components/MochiWidget/AmountInput/AmountInput.tsx
@@ -240,7 +240,10 @@ export const AmountInput: React.FC<AmountInputProps> = ({
 
   useEffect(() => {
     function focusInput() {
-      ref.current?.focus()
+      document
+        .querySelector('.mochi-widget')
+        ?.scrollIntoView({ behavior: 'smooth' })
+      ref.current?.focus({ preventScroll: true })
     }
 
     window.addEventListener(events.TIP_WIDGET.FOCUS_AMOUNT, focusInput)

diff --git a/apps/mochi-web/components/MochiWidget/TransactionPreview/TransactionPreview.tsx b/apps/mochi-web/components/MochiWidget/TransactionPreview/TransactionPreview.tsx
@@ -11,7 +11,9 @@ import {
 import { useProfileStore } from '~store'
 import UI, { Platform } from '@consolelabs/mochi-formatter'
 import stripEmoji from 'emoji-strip'
+import { formatTokenAmount } from '~utils/number'
 import { useTipWidget } from '../Tip/store'
+import { isToken } from '../TokenPicker/utils'
 
 function Recipient({
   children,
@@ -55,7 +57,7 @@ function Recipient({
 
 function TipPreview() {
   const { me } = useProfileStore()
-  const { wallet, request, amountUsd } = useTipWidget()
+  const { wallet, request } = useTipWidget()
 
   const receivers = useMemo(() => {
     if (!request.recipients) return null
@@ -120,7 +122,12 @@ function TipPreview() {
           )}
         </div>
         <span>They will receive</span>
-        <span className="text-right">{amountUsd} USD</span>
+        <span className="text-right">
+          {formatTokenAmount(request.amount ?? 0).display}{' '}
+          {isToken(request.asset)
+            ? request.asset?.token?.symbol ?? ''
+            : request.asset?.name ?? ''}
+        </span>
       </div>
     </div>
   )

diff --git a/apps/mochi-web/components/MochiWidget/index.tsx b/apps/mochi-web/components/MochiWidget/index.tsx
@@ -67,6 +67,7 @@ export default function MochiWidget({ wrapperClassName, className }: Props) {
     <BottomSheetProvider
       className={clsx(
         'w-auto lg:w-full overflow-hidden rounded-2xl border shadow-xl border-divider',
+        'mochi-widget',
         wrapperClassName,
       )}
     >

diff --git a/apps/mochi-web/package.json b/apps/mochi-web/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mochi-web",
   "private": true,
-  "version": "1.4.1",
+  "version": "1.5.0-rc.1",
   "scripts": {
     "proxy-ssl": "local-ssl-proxy --config proxy-config.json",
     "dev:https": "(trap 'kill 0' SIGINT; pnpm proxy-ssl & next dev -p 3001)",

diff --git a/apps/mochi-web/utils/string.ts b/apps/mochi-web/utils/string.ts
@@ -29,8 +29,15 @@ export function truncateWallet(address?: string) {
 }
 
 export function formatTokenDigit(value: any) {
+  const bound = {
+    hi: 1_000_000,
+    lo: -1_000_000,
+  }
+  if (typeof value === 'object')
+    return utils.formatTokenDigit({ value: value.value, bound })
+
   return utils.formatTokenDigit({
     value,
-    bound: { hi: 1_000_000, lo: -1_000_000 },
+    bound,
   })
 }
diff --git a/packages/components/accordion/CHANGELOG.md b/packages/components/accordion/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @mochi-ui/accordion
 
+## 0.1.21
+
+### Patch Changes
+
+- Updated dependencies [[`e3782a7`](https://github.com/consolelabs/mochi-ui/commit/e3782a7693be72a82e9ba66895b8a1f379c99337), [`6d96390`](https://github.com/consolelabs/mochi-ui/commit/6d96390ade07ccac69baa4807e1b8bc3cbca4424)]:
+  - @mochi-ui/theme@0.18.0
+
 ## 0.1.20
 
 ### Patch Changes

diff --git a/packages/components/accordion/package.json b/packages/components/accordion/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mochi-ui/accordion",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "sideEffects": false,
   "main": "src/index.ts",
   "files": [

diff --git a/packages/components/action-bar/CHANGELOG.md b/packages/components/action-bar/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @mochi-ui/action-bar
 
+## 0.2.2
+
+### Patch Changes
+
+- Updated dependencies [[`e3782a7`](https://github.com/consolelabs/mochi-ui/commit/e3782a7693be72a82e9ba66895b8a1f379c99337), [`6d96390`](https://github.com/consolelabs/mochi-ui/commit/6d96390ade07ccac69baa4807e1b8bc3cbca4424)]:
+  - @mochi-ui/theme@0.18.0
+  - @mochi-ui/alert@1.2.11
+
 ## 0.2.1
 
 ### Patch Changes

diff --git a/packages/components/action-bar/package.json b/packages/components/action-bar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mochi-ui/action-bar",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "sideEffects": false,
   "main": "src/index.ts",
   "files": [

diff --git a/packages/components/alert/CHANGELOG.md b/packages/components/alert/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @mochi-ui/alert
 
+## 1.2.11
+
+### Patch Changes
+
+- Updated dependencies [[`e3782a7`](https://github.com/consolelabs/mochi-ui/commit/e3782a7693be72a82e9ba66895b8a1f379c99337), [`6d96390`](https://github.com/consolelabs/mochi-ui/commit/6d96390ade07ccac69baa4807e1b8bc3cbca4424)]:
+  - @mochi-ui/theme@0.18.0
+  - @mochi-ui/button@0.4.17
+  - @mochi-ui/icon-button@0.4.18
+
 ## 1.2.10
 
 ### Patch Changes

diff --git a/packages/components/alert/package.json b/packages/components/alert/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mochi-ui/alert",
-  "version": "1.2.10",
+  "version": "1.2.11",
   "sideEffects": false,
   "main": "src/index.ts",
   "files": [

diff --git a/packages/components/avatar-group/CHANGELOG.md b/packages/components/avatar-group/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @mochi-ui/avatar-group
 
+## 0.3.5
+
+### Patch Changes
+
+- Updated dependencies [[`e3782a7`](https://github.com/consolelabs/mochi-ui/commit/e3782a7693be72a82e9ba66895b8a1f379c99337), [`6d96390`](https://github.com/consolelabs/mochi-ui/commit/6d96390ade07ccac69baa4807e1b8bc3cbca4424)]:
+  - @mochi-ui/theme@0.18.0
+  - @mochi-ui/avatar@0.3.2
+
 ## 0.3.4
 
 ### Patch Changes

diff --git a/packages/components/avatar-group/package.json b/packages/components/avatar-group/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mochi-ui/avatar-group",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "sideEffects": false,
   "main": "src/index.ts",
   "files": [

diff --git a/packages/components/avatar/CHANGELOG.md b/packages/components/avatar/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @mochi-ui/avatar
 
+## 0.3.2
+
+### Patch Changes
+
+- Updated dependencies [[`e3782a7`](https://github.com/consolelabs/mochi-ui/commit/e3782a7693be72a82e9ba66895b8a1f379c99337), [`6d96390`](https://github.com/consolelabs/mochi-ui/commit/6d96390ade07ccac69baa4807e1b8bc3cbca4424)]:
+  - @mochi-ui/theme@0.18.0
+  - @mochi-ui/skeleton@1.0.11
+
 ## 0.3.1
 
 ### Patch Changes

diff --git a/packages/components/avatar/package.json b/packages/components/avatar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mochi-ui/avatar",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "sideEffects": false,
   "main": "src/index.ts",
   "files": [

diff --git a/packages/components/badge/CHANGELOG.md b/packages/components/badge/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @mochi-ui/badge
 
+## 0.3.6
+
+### Patch Changes
+
+- Updated dependencies [[`e3782a7`](https://github.com/consolelabs/mochi-ui/commit/e3782a7693be72a82e9ba66895b8a1f379c99337), [`6d96390`](https://github.com/consolelabs/mochi-ui/commit/6d96390ade07ccac69baa4807e1b8bc3cbca4424)]:
+  - @mochi-ui/theme@0.18.0
+
 ## 0.3.5
 
 ### Patch Changes

diff --git a/packages/components/badge/package.json b/packages/components/badge/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mochi-ui/badge",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "sideEffects": false,
   "main": "src/index.ts",
   "files": [

diff --git a/packages/components/button/CHANGELOG.md b/packages/components/button/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @mochi-ui/button
 
+## 0.4.17
+
+### Patch Changes
+
+- Updated dependencies [[`e3782a7`](https://github.com/consolelabs/mochi-ui/commit/e3782a7693be72a82e9ba66895b8a1f379c99337), [`6d96390`](https://github.com/consolelabs/mochi-ui/commit/6d96390ade07ccac69baa4807e1b8bc3cbca4424)]:
+  - @mochi-ui/theme@0.18.0
+
 ## 0.4.16
 
 ### Patch Changes

diff --git a/packages/components/button/package.json b/packages/components/button/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mochi-ui/button",
-  "version": "0.4.16",
+  "version": "0.4.17",
   "sideEffects": false,
   "main": "src/index.ts",
   "files": [

diff --git a/packages/components/card/CHANGELOG.md b/packages/components/card/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @mochi-ui/card
 
+## 0.1.9
+
+### Patch Changes
+
+- Updated dependencies [[`e3782a7`](https://github.com/consolelabs/mochi-ui/commit/e3782a7693be72a82e9ba66895b8a1f379c99337), [`6d96390`](https://github.com/consolelabs/mochi-ui/commit/6d96390ade07ccac69baa4807e1b8bc3cbca4424)]:
+  - @mochi-ui/theme@0.18.0
+
 ## 0.1.8
 
 ### Patch Changes

diff --git a/packages/components/card/package.json b/packages/components/card/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mochi-ui/card",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "...",
   "keywords": [
     "card"

diff --git a/packages/components/checkbox/CHANGELOG.md b/packages/components/checkbox/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @mochi-ui/checkbox
 
+## 0.1.21
+
+### Patch Changes
+
+- Updated dependencies [[`e3782a7`](https://github.com/consolelabs/mochi-ui/commit/e3782a7693be72a82e9ba66895b8a1f379c99337), [`6d96390`](https://github.com/consolelabs/mochi-ui/commit/6d96390ade07ccac69baa4807e1b8bc3cbca4424)]:
+  - @mochi-ui/theme@0.18.0
+
 ## 0.1.20
 
 ### Patch Changes

diff --git a/packages/components/checkbox/package.json b/packages/components/checkbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mochi-ui/checkbox",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "sideEffects": false,
   "main": "src/index.ts",
   "files": [

diff --git a/packages/components/content-editable/CHANGELOG.md b/packages/components/content-editable/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @mochi-ui/content-editable
 
+## 1.1.9
+
+### Patch Changes
+
+- Updated dependencies [[`e3782a7`](https://github.com/consolelabs/mochi-ui/commit/e3782a7693be72a82e9ba66895b8a1f379c99337), [`6d96390`](https://github.com/consolelabs/mochi-ui/commit/6d96390ade07ccac69baa4807e1b8bc3cbca4424)]:
+  - @mochi-ui/theme@0.18.0
+
 ## 1.1.8
 
 ### Patch Changes

diff --git a/packages/components/content-editable/package.json b/packages/components/content-editable/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mochi-ui/content-editable",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "description": "React component for a div with editable contents",
   "keywords": [
     "content-editable"

diff --git a/packages/components/drawer/CHANGELOG.md b/packages/components/drawer/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @mochi-ui/drawer
 
+## 0.3.8
+
+### Patch Changes
+
+- Updated dependencies [[`e3782a7`](https://github.com/consolelabs/mochi-ui/commit/e3782a7693be72a82e9ba66895b8a1f379c99337), [`6d96390`](https://github.com/consolelabs/mochi-ui/commit/6d96390ade07ccac69baa4807e1b8bc3cbca4424)]:
+  - @mochi-ui/theme@0.18.0
+
 ## 0.3.7
 
 ### Patch Changes

diff --git a/packages/components/drawer/package.json b/packages/components/drawer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mochi-ui/drawer",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "sideEffects": false,
   "main": "src/index.ts",
   "files": [

diff --git a/packages/components/dropdown/CHANGELOG.md b/packages/components/dropdown/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @mochi-ui/dropdown
 
+## 0.2.8
+
+### Patch Changes
+
+- Updated dependencies [[`e3782a7`](https://github.com/consolelabs/mochi-ui/commit/e3782a7693be72a82e9ba66895b8a1f379c99337), [`6d96390`](https://github.com/consolelabs/mochi-ui/commit/6d96390ade07ccac69baa4807e1b8bc3cbca4424)]:
+  - @mochi-ui/theme@0.18.0
+
 ## 0.2.7
 
 ### Patch Changes