From 42e7fd9a0dd906d141c3ccfc6b78173451bc28b5 Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:03:23 -0500 Subject: [PATCH 01/39] add import/no-default-export --- packages/web/.eslintrc.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/web/.eslintrc.json b/packages/web/.eslintrc.json index 1c409e00b0..384d5175b9 100644 --- a/packages/web/.eslintrc.json +++ b/packages/web/.eslintrc.json @@ -25,6 +25,7 @@ "simple-import-sort/imports": "error", "simple-import-sort/exports": "error", "unused-imports/no-unused-imports": "error", - "react/no-unescaped-entities": "off" + "react/no-unescaped-entities": "off", + "import/no-default-export": "error" } } From 5fff6012d0e4222703453e2e04dd81740460458f Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:09:59 -0500 Subject: [PATCH 02/39] Add overrides for next.js pages --- packages/web/.eslintrc.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/web/.eslintrc.json b/packages/web/.eslintrc.json index 384d5175b9..cc322aefb8 100644 --- a/packages/web/.eslintrc.json +++ b/packages/web/.eslintrc.json @@ -27,5 +27,15 @@ "unused-imports/no-unused-imports": "error", "react/no-unescaped-entities": "off", "import/no-default-export": "error" - } + // see https://stackoverflow.com/questions/44378395/how-to-configure-eslint-so-that-it-disallows-default-exports + }, + "overrides": [ + // Pages router + { + "files": ["pages/**/*"], + "rules": { + "import/no-default-export": "off" + } + } + ] } From 6016516b9bf792120619b02df3977a617c243d29 Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:12:48 -0500 Subject: [PATCH 03/39] wallet-tutorial --- packages/web/modals/wallet-select/cosmos-wallet-state.tsx | 2 +- packages/web/modals/wallet-select/wallet-tutorial.tsx | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/web/modals/wallet-select/cosmos-wallet-state.tsx b/packages/web/modals/wallet-select/cosmos-wallet-state.tsx index 05e34a0672..38c97e7bda 100644 --- a/packages/web/modals/wallet-select/cosmos-wallet-state.tsx +++ b/packages/web/modals/wallet-select/cosmos-wallet-state.tsx @@ -27,7 +27,7 @@ import { ModalView, OnConnectWallet } from "~/modals/wallet-select/utils"; import { useStore } from "~/stores"; import QRCodeView from "./qr-code-view"; -import WalletTutorial from "./wallet-tutorial"; +import { WalletTutorial } from "./wallet-tutorial"; enum WalletSelect1CTScreens { Introduction = "Introduction", diff --git a/packages/web/modals/wallet-select/wallet-tutorial.tsx b/packages/web/modals/wallet-select/wallet-tutorial.tsx index ad9aceb205..4ba566d9b1 100644 --- a/packages/web/modals/wallet-select/wallet-tutorial.tsx +++ b/packages/web/modals/wallet-select/wallet-tutorial.tsx @@ -29,7 +29,7 @@ const OnboardingSteps = (t: MultiLanguageT) => [ }, ]; -const WalletTutorial = () => { +export const WalletTutorial = () => { const { t } = useTranslation(); return (
@@ -65,5 +65,3 @@ const WalletTutorial = () => {
); }; - -export default WalletTutorial; From a0d46a04f1e1726d6c2c92182d70c3b5d4218ca1 Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:13:13 -0500 Subject: [PATCH 04/39] QRCodeView --- packages/web/modals/wallet-select/cosmos-wallet-state.tsx | 2 +- packages/web/modals/wallet-select/qr-code-view.tsx | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/web/modals/wallet-select/cosmos-wallet-state.tsx b/packages/web/modals/wallet-select/cosmos-wallet-state.tsx index 38c97e7bda..2aa9e176aa 100644 --- a/packages/web/modals/wallet-select/cosmos-wallet-state.tsx +++ b/packages/web/modals/wallet-select/cosmos-wallet-state.tsx @@ -26,7 +26,7 @@ import { WalletSelectModalProps } from "~/modals/wallet-select"; import { ModalView, OnConnectWallet } from "~/modals/wallet-select/utils"; import { useStore } from "~/stores"; -import QRCodeView from "./qr-code-view"; +import { QRCodeView } from "./qr-code-view"; import { WalletTutorial } from "./wallet-tutorial"; enum WalletSelect1CTScreens { diff --git a/packages/web/modals/wallet-select/qr-code-view.tsx b/packages/web/modals/wallet-select/qr-code-view.tsx index 6b92b9eb73..9d75e1eaa2 100644 --- a/packages/web/modals/wallet-select/qr-code-view.tsx +++ b/packages/web/modals/wallet-select/qr-code-view.tsx @@ -21,7 +21,8 @@ const QRCodeLoader = () => ( ); type QRCodeStatus = "pending" | "done" | "error" | "expired" | undefined; -const QRCodeView: FunctionComponent<{ wallet?: ChainWalletBase }> = ({ + +export const QRCodeView: FunctionComponent<{ wallet?: ChainWalletBase }> = ({ wallet, }) => { const { t } = useTranslation(); @@ -183,5 +184,3 @@ const QRCodeView: FunctionComponent<{ wallet?: ChainWalletBase }> = ({ ); }; - -export default QRCodeView; From 65d1011520fdcd90ea00597cbcaf81c2fcbe44e1 Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:13:55 -0500 Subject: [PATCH 05/39] useGetEarnStrategies --- packages/web/hooks/use-get-earn-strategies.ts | 4 +--- packages/web/pages/earn/index.tsx | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/web/hooks/use-get-earn-strategies.ts b/packages/web/hooks/use-get-earn-strategies.ts index 65ce617e7c..40b06a0d4b 100644 --- a/packages/web/hooks/use-get-earn-strategies.ts +++ b/packages/web/hooks/use-get-earn-strategies.ts @@ -11,7 +11,7 @@ import { useMemo } from "react"; import { LevanaGeoBlockedResponse } from "~/pages/_app"; import { api } from "~/utils/trpc"; -const useGetEarnStrategies = ( +export const useGetEarnStrategies = ( userOsmoAddress: string, isWalletConnected: boolean ) => { @@ -224,5 +224,3 @@ const useGetEarnStrategies = ( refetch, }; }; - -export default useGetEarnStrategies; diff --git a/packages/web/pages/earn/index.tsx b/packages/web/pages/earn/index.tsx index 98b915084a..857c65ea65 100644 --- a/packages/web/pages/earn/index.tsx +++ b/packages/web/pages/earn/index.tsx @@ -30,7 +30,7 @@ import { useTranslation, useWalletSelect, } from "~/hooks"; -import useGetEarnStrategies from "~/hooks/use-get-earn-strategies"; +import { useGetEarnStrategies } from "~/hooks/use-get-earn-strategies"; import { useStore } from "~/stores"; function Earn() { From 3bbedc2b2fc2989503dda14e3edfcf22deb50b74 Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:14:21 -0500 Subject: [PATCH 06/39] useDraggableScroll --- packages/web/components/drawers/token-select-drawer.tsx | 2 +- packages/web/hooks/use-draggable-scroll.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/web/components/drawers/token-select-drawer.tsx b/packages/web/components/drawers/token-select-drawer.tsx index 328503aba3..1663b4102a 100644 --- a/packages/web/components/drawers/token-select-drawer.tsx +++ b/packages/web/components/drawers/token-select-drawer.tsx @@ -23,7 +23,7 @@ import { UnverifiedAssetsState } from "~/stores/user-settings"; import { formatPretty } from "~/utils/formatter"; import { useConst } from "../../hooks/use-const"; -import useDraggableScroll from "../../hooks/use-draggable-scroll"; +import { useDraggableScroll } from "../../hooks/use-draggable-scroll"; import { useKeyActions } from "../../hooks/use-key-actions"; import { useStateRef } from "../../hooks/use-state-ref"; import { useWindowKeyActions } from "../../hooks/window/use-window-key-actions"; diff --git a/packages/web/hooks/use-draggable-scroll.ts b/packages/web/hooks/use-draggable-scroll.ts index 16489ed5d7..75afb21cf9 100644 --- a/packages/web/hooks/use-draggable-scroll.ts +++ b/packages/web/hooks/use-draggable-scroll.ts @@ -10,7 +10,7 @@ interface Options { direction?: Direction; } -export default function useDraggableScroll( +export function useDraggableScroll( ref: RefObject, options: Options = { direction: Direction.Horizontal } ) { From aea8a31b59b2c82b0a0db74d9219d6c748b81a79 Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:14:57 -0500 Subject: [PATCH 07/39] Markdown --- packages/web/components/markdown.tsx | 4 +--- packages/web/components/token-details/token-details.tsx | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/web/components/markdown.tsx b/packages/web/components/markdown.tsx index b707dfa67d..d6994bb1d4 100644 --- a/packages/web/components/markdown.tsx +++ b/packages/web/components/markdown.tsx @@ -26,7 +26,7 @@ const MarkdownParagraph: NormalMarkdownComponent<"p"> = ({ ); }; -const Markdown: FunctionComponent = ({ children }) => { +export const Markdown: FunctionComponent = ({ children }) => { return ( = ({ children }) => { ); }; - -export default Markdown; diff --git a/packages/web/components/token-details/token-details.tsx b/packages/web/components/token-details/token-details.tsx index aa00d025bc..aff8f8ffee 100644 --- a/packages/web/components/token-details/token-details.tsx +++ b/packages/web/components/token-details/token-details.tsx @@ -7,7 +7,7 @@ import React, { FunctionComponent, useMemo, useState } from "react"; import { Icon } from "~/components/assets"; import ClipboardButton from "~/components/buttons/clipboard-button"; -import Markdown from "~/components/markdown"; +import { Markdown } from "~/components/markdown"; import { LinkIconButton } from "~/components/ui/button"; import { COINGECKO_PUBLIC_URL, EventName, TWITTER_PUBLIC_URL } from "~/config"; import { AssetLists } from "~/config/generated/asset-lists"; From 80ff23997e984c1aa2ad08996c76300d792e9e68 Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:16:12 -0500 Subject: [PATCH 08/39] Modal --- packages/web/hooks/use-controllable-state.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/web/hooks/use-controllable-state.ts b/packages/web/hooks/use-controllable-state.ts index 65b9436a7a..2c864ccb11 100644 --- a/packages/web/hooks/use-controllable-state.ts +++ b/packages/web/hooks/use-controllable-state.ts @@ -28,7 +28,7 @@ export interface UseControllableStateProps { * onToggle?: (open: boolean) => void; * } * - * const Modal: React.FC = ({ isOpen, onToggle }) => { + * export const Modal: React.FC = ({ isOpen, onToggle }) => { * const [open, setOpen] = useControllableState({ * value: isOpen, * defaultValue: false, @@ -51,8 +51,6 @@ export interface UseControllableStateProps { * * ); * }; - * - * export default Modal; * ``` * * To let the component handle its own state, just don't send the `isOpen` prop: From 9643b23bd8961255264bf5db640aefb335f9fddf Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:16:39 -0500 Subject: [PATCH 09/39] ErrorFallback --- packages/web/components/error/error-fallback.tsx | 4 +--- packages/web/pages/_app.tsx | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/web/components/error/error-fallback.tsx b/packages/web/components/error/error-fallback.tsx index a66cf415ca..87393772c1 100644 --- a/packages/web/components/error/error-fallback.tsx +++ b/packages/web/components/error/error-fallback.tsx @@ -2,7 +2,7 @@ import Image from "next/image"; import { useTranslation } from "~/hooks"; -const ErrorFallback = () => { +export const ErrorFallback = () => { const { t } = useTranslation(); return (
@@ -38,5 +38,3 @@ const ErrorFallback = () => {
); }; - -export default ErrorFallback; diff --git a/packages/web/pages/_app.tsx b/packages/web/pages/_app.tsx index 6ac7f71fef..da1ec26378 100644 --- a/packages/web/pages/_app.tsx +++ b/packages/web/pages/_app.tsx @@ -24,7 +24,7 @@ import { WagmiProvider } from "wagmi"; import { Icon } from "~/components/assets"; import ErrorBoundary from "~/components/error/error-boundary"; -import ErrorFallback from "~/components/error/error-fallback"; +import { ErrorFallback } from "~/components/error/error-fallback"; import { Pill } from "~/components/indicators/pill"; import { MainLayout } from "~/components/layouts"; import { MainLayoutMenu } from "~/components/main-menu"; From efc7f17e74aa21b0cf5d8e0d87e971ee4c860a88 Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:17:09 -0500 Subject: [PATCH 10/39] Clipboard button --- packages/web/components/buttons/clipboard-button.tsx | 4 +--- packages/web/components/token-details/token-details.tsx | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/web/components/buttons/clipboard-button.tsx b/packages/web/components/buttons/clipboard-button.tsx index 2efe543bfa..151b8d41ed 100644 --- a/packages/web/components/buttons/clipboard-button.tsx +++ b/packages/web/components/buttons/clipboard-button.tsx @@ -10,7 +10,7 @@ import IconButton from "./icon-button"; /** * Renders an icon within a button. */ -const ClipboardButton = forwardRef< +export const ClipboardButton = forwardRef< HTMLButtonElement, { value?: string; @@ -78,5 +78,3 @@ const ClipboardButton = forwardRef< ); }); - -export default ClipboardButton; diff --git a/packages/web/components/token-details/token-details.tsx b/packages/web/components/token-details/token-details.tsx index aff8f8ffee..0897f12861 100644 --- a/packages/web/components/token-details/token-details.tsx +++ b/packages/web/components/token-details/token-details.tsx @@ -6,7 +6,7 @@ import { observer } from "mobx-react-lite"; import React, { FunctionComponent, useMemo, useState } from "react"; import { Icon } from "~/components/assets"; -import ClipboardButton from "~/components/buttons/clipboard-button"; +import { ClipboardButton } from "~/components/buttons/clipboard-button"; import { Markdown } from "~/components/markdown"; import { LinkIconButton } from "~/components/ui/button"; import { COINGECKO_PUBLIC_URL, EventName, TWITTER_PUBLIC_URL } from "~/config"; From 21da05fca658cccf47755dc2a2eb11e3b424cd0c Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:18:06 -0500 Subject: [PATCH 11/39] AxelarTransfer --- packages/web/integrations/axelar/transfer.tsx | 5 +---- packages/web/modals/bridge-transfer-v1.tsx | 12 +++++++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/packages/web/integrations/axelar/transfer.tsx b/packages/web/integrations/axelar/transfer.tsx index 4f9e10b93d..30efca3d7f 100644 --- a/packages/web/integrations/axelar/transfer.tsx +++ b/packages/web/integrations/axelar/transfer.tsx @@ -52,7 +52,7 @@ import { /** * @deprecated */ -const AxelarTransfer: FunctionComponent< +export const AxelarTransfer: FunctionComponent< { isWithdraw: boolean; ethWalletClient: EthWallet; @@ -620,6 +620,3 @@ const AxelarTransfer: FunctionComponent< ); } ); - -// accommodate next/dynamic -export default AxelarTransfer; diff --git a/packages/web/modals/bridge-transfer-v1.tsx b/packages/web/modals/bridge-transfer-v1.tsx index c95bdb7de7..4c116feadb 100644 --- a/packages/web/modals/bridge-transfer-v1.tsx +++ b/packages/web/modals/bridge-transfer-v1.tsx @@ -10,9 +10,15 @@ import type { ObservableWallet } from "~/integrations/wallets"; import { ModalBase, ModalBaseProps } from "~/modals/base"; import { IBCBalance } from "~/stores/assets"; -const AxelarTransfer = dynamic(() => import("~/integrations/axelar/transfer"), { - ssr: false, -}); +const AxelarTransfer = dynamic( + () => + import("~/integrations/axelar/transfer").then( + (module) => module.AxelarTransfer + ), + { + ssr: false, + } +); const NomicTransfer = dynamic( () => import("~/integrations/nomic/transfer").then( From 44fc37bb7e853890b0f3d6a9387354d72a3d7a43 Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:18:57 -0500 Subject: [PATCH 12/39] ClientOnly --- packages/web/components/client-only.tsx | 6 +++--- packages/web/components/navbar/index.tsx | 2 +- packages/web/modals/wallet-select/index.tsx | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/web/components/client-only.tsx b/packages/web/components/client-only.tsx index 90827a0cda..6908ac9d08 100644 --- a/packages/web/components/client-only.tsx +++ b/packages/web/components/client-only.tsx @@ -1,6 +1,8 @@ import { PropsWithChildren, useEffect, useState } from "react"; -const ClientOnly = (props: PropsWithChildren<{ className?: string }>) => { +export const ClientOnly = ( + props: PropsWithChildren<{ className?: string }> +) => { const [hasMounted, setHasMounted] = useState(false); useEffect(() => { @@ -13,5 +15,3 @@ const ClientOnly = (props: PropsWithChildren<{ className?: string }>) => { return
; }; - -export default ClientOnly; diff --git a/packages/web/components/navbar/index.tsx b/packages/web/components/navbar/index.tsx index 6ca63b3bbc..2beed2daa3 100644 --- a/packages/web/components/navbar/index.tsx +++ b/packages/web/components/navbar/index.tsx @@ -24,7 +24,7 @@ import { useLocalStorage } from "react-use"; import { Icon } from "~/components/assets"; import IconButton from "~/components/buttons/icon-button"; -import ClientOnly from "~/components/client-only"; +import { ClientOnly } from "~/components/client-only"; import SkeletonLoader from "~/components/loaders/skeleton-loader"; import { MainLayoutMenu, MainMenu } from "~/components/main-menu"; import { CustomClasses } from "~/components/types"; diff --git a/packages/web/modals/wallet-select/index.tsx b/packages/web/modals/wallet-select/index.tsx index 93174ba26e..9e765c7fb7 100644 --- a/packages/web/modals/wallet-select/index.tsx +++ b/packages/web/modals/wallet-select/index.tsx @@ -18,7 +18,7 @@ import { useUpdateEffect } from "react-use"; import { Connector } from "wagmi"; import { Icon } from "~/components/assets"; -import ClientOnly from "~/components/client-only"; +import { ClientOnly } from "~/components/client-only"; import { Button } from "~/components/ui/button"; import { CosmosWalletRegistry } from "~/config"; import { EthereumChainIds } from "~/config/wagmi"; From 6c03095951f14bc433bb9d1f2cb2d898cf2f98cd Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:20:25 -0500 Subject: [PATCH 13/39] NavbarOsmoPrice --- packages/web/components/layouts/main.tsx | 2 +- packages/web/components/navbar-osmo-price.tsx | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/web/components/layouts/main.tsx b/packages/web/components/layouts/main.tsx index 8ed8d56fbe..8d79d3050d 100644 --- a/packages/web/components/layouts/main.tsx +++ b/packages/web/components/layouts/main.tsx @@ -6,7 +6,7 @@ import React, { type FunctionComponent, type PropsWithChildren } from "react"; import IconButton from "~/components/buttons/icon-button"; import { MainLayoutMenu, MainMenu } from "~/components/main-menu"; import { NavBar } from "~/components/navbar"; -import NavbarOsmoPrice from "~/components/navbar-osmo-price"; +import { NavbarOsmoPrice } from "~/components/navbar-osmo-price"; import NavbarOsmosisUpdates from "~/components/navbar-osmosis-update"; import { useCurrentLanguage, useWindowSize } from "~/hooks"; diff --git a/packages/web/components/navbar-osmo-price.tsx b/packages/web/components/navbar-osmo-price.tsx index 2816746067..02211503ac 100644 --- a/packages/web/components/navbar-osmo-price.tsx +++ b/packages/web/components/navbar-osmo-price.tsx @@ -21,7 +21,7 @@ const osmoAsset = AssetLists.flatMap(({ assets }) => assets).find( ); const osmoCurrency = makeMinimalAsset(osmoAsset!); -const NavbarOsmoPrice = observer(() => { +export const NavbarOsmoPrice = observer(() => { const { accountStore, chainStore } = useStore(); const { t } = useTranslation(); const flags = useFeatureFlags(); @@ -128,5 +128,3 @@ const OsmoPriceAndChart: FunctionComponent = () => { ); }; - -export default NavbarOsmoPrice; From b99318f232e13a86b99b27a67a18ec9734fcf894 Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:21:16 -0500 Subject: [PATCH 14/39] use-steps --- packages/web/components/stepper/index.tsx | 2 +- packages/web/components/stepper/use-steps.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/web/components/stepper/index.tsx b/packages/web/components/stepper/index.tsx index d11a3a7ae3..abdf9ba881 100644 --- a/packages/web/components/stepper/index.tsx +++ b/packages/web/components/stepper/index.tsx @@ -12,7 +12,7 @@ import { import { Icon } from "~/components/assets"; import IconButton from "~/components/buttons/icon-button"; -import useSteps, { UseStepsReturn } from "~/components/stepper/use-steps"; +import { useSteps, UseStepsReturn } from "~/components/stepper/use-steps"; import { createContext } from "~/utils/react-context"; interface StepsProps { diff --git a/packages/web/components/stepper/use-steps.ts b/packages/web/components/stepper/use-steps.ts index dce4b6fcf3..a9aee4784e 100644 --- a/packages/web/components/stepper/use-steps.ts +++ b/packages/web/components/stepper/use-steps.ts @@ -7,7 +7,7 @@ export interface UseStepsProps { count: number; } -export default function useSteps(props: UseStepsProps) { +export function useSteps(props: UseStepsProps) { const { index, count } = props; const [activeStep, _setActiveStep] = useControllableState({ From d42dd5f12f09a5c074f99fa397786c3275d15284 Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:23:08 -0500 Subject: [PATCH 15/39] NavbarOsmosisUpdates --- packages/web/components/layouts/main.tsx | 2 +- packages/web/components/navbar-osmosis-update/index.ts | 2 +- .../navbar-osmosis-update/navbar-osmosis-update.tsx | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/web/components/layouts/main.tsx b/packages/web/components/layouts/main.tsx index 8d79d3050d..7b395f7d37 100644 --- a/packages/web/components/layouts/main.tsx +++ b/packages/web/components/layouts/main.tsx @@ -7,7 +7,7 @@ import IconButton from "~/components/buttons/icon-button"; import { MainLayoutMenu, MainMenu } from "~/components/main-menu"; import { NavBar } from "~/components/navbar"; import { NavbarOsmoPrice } from "~/components/navbar-osmo-price"; -import NavbarOsmosisUpdates from "~/components/navbar-osmosis-update"; +import { NavbarOsmosisUpdates } from "~/components/navbar-osmosis-update"; import { useCurrentLanguage, useWindowSize } from "~/hooks"; export const MainLayout = observer( diff --git a/packages/web/components/navbar-osmosis-update/index.ts b/packages/web/components/navbar-osmosis-update/index.ts index 4525a52def..d483aa8b94 100644 --- a/packages/web/components/navbar-osmosis-update/index.ts +++ b/packages/web/components/navbar-osmosis-update/index.ts @@ -1 +1 @@ -export { default } from "./navbar-osmosis-update"; +export * from "./navbar-osmosis-update"; diff --git a/packages/web/components/navbar-osmosis-update/navbar-osmosis-update.tsx b/packages/web/components/navbar-osmosis-update/navbar-osmosis-update.tsx index a4c929ff62..a33dae6097 100644 --- a/packages/web/components/navbar-osmosis-update/navbar-osmosis-update.tsx +++ b/packages/web/components/navbar-osmosis-update/navbar-osmosis-update.tsx @@ -12,7 +12,7 @@ import { useDisclosure } from "~/hooks/use-disclosure"; import { useLocalStorageState } from "~/hooks/window/use-localstorage-state"; import { ModalBase } from "~/modals/base"; -const NavbarOsmosisUpdates = () => { +export const NavbarOsmosisUpdates = () => { const { t } = useTranslation(); const { isOpen, onClose, onOpen } = useDisclosure(); const featureFlags = useFeatureFlags(); @@ -109,5 +109,3 @@ const OsmosisUpdateModal: FunctionComponent<{ ); }; - -export default NavbarOsmosisUpdates; From cbeaea7334eac437871d0c9f1a5253ab81cca50d Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:23:56 -0500 Subject: [PATCH 16/39] OneClickTradingSettings --- .../one-click-trading/one-click-trading-settings.tsx | 4 +--- .../one-click-trading/profile-one-click-trading-settings.tsx | 2 +- packages/web/modals/one-click-trading-intro-modal.tsx | 4 +--- packages/web/modals/wallet-select/cosmos-wallet-state.tsx | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/web/components/one-click-trading/one-click-trading-settings.tsx b/packages/web/components/one-click-trading/one-click-trading-settings.tsx index bb1ebbd8c1..e7204b43da 100644 --- a/packages/web/components/one-click-trading/one-click-trading-settings.tsx +++ b/packages/web/components/one-click-trading/one-click-trading-settings.tsx @@ -110,7 +110,7 @@ function formatSpendLimit(spendLimit: PricePretty | undefined) { )}`; } -const OneClickTradingSettings = ({ +export const OneClickTradingSettings = ({ classes, onGoBack, transaction1CTParams, @@ -632,5 +632,3 @@ const DiscardChangesConfirmationModal: FunctionComponent<{ ); }; - -export default OneClickTradingSettings; diff --git a/packages/web/components/one-click-trading/profile-one-click-trading-settings.tsx b/packages/web/components/one-click-trading/profile-one-click-trading-settings.tsx index b08a113651..e45811cdad 100644 --- a/packages/web/components/one-click-trading/profile-one-click-trading-settings.tsx +++ b/packages/web/components/one-click-trading/profile-one-click-trading-settings.tsx @@ -1,6 +1,6 @@ import { displayErrorRemovingSessionToast } from "~/components/alert/one-click-trading-toasts"; import { isRejectedTxErrorMessage } from "~/components/alert/prettify"; -import OneClickTradingSettings from "~/components/one-click-trading/one-click-trading-settings"; +import { OneClickTradingSettings } from "~/components/one-click-trading/one-click-trading-settings"; import { useOneClickTradingParams, useOneClickTradingSession } from "~/hooks"; import { useCreateOneClickTradingSession } from "~/hooks/mutations/one-click-trading"; import { useRemoveOneClickTradingSession } from "~/hooks/mutations/one-click-trading/use-remove-one-click-trading-session"; diff --git a/packages/web/modals/one-click-trading-intro-modal.tsx b/packages/web/modals/one-click-trading-intro-modal.tsx index bf09fb7eac..88283246a3 100644 --- a/packages/web/modals/one-click-trading-intro-modal.tsx +++ b/packages/web/modals/one-click-trading-intro-modal.tsx @@ -12,7 +12,7 @@ import { isRejectedTxErrorMessage } from "~/components/alert/prettify"; import { Button } from "~/components/buttons"; import { Spinner } from "~/components/loaders"; import { IntroducingOneClick } from "~/components/one-click-trading/introducing-one-click-trading"; -import OneClickTradingSettings from "~/components/one-click-trading/one-click-trading-settings"; +import { OneClickTradingSettings } from "~/components/one-click-trading/one-click-trading-settings"; import { Screen, ScreenManager } from "~/components/screen-manager"; import { useOneClickTradingParams, @@ -268,5 +268,3 @@ const IntroModal1CTScreens = observer( ); } ); - -export default OneClickTradingIntroModal; diff --git a/packages/web/modals/wallet-select/cosmos-wallet-state.tsx b/packages/web/modals/wallet-select/cosmos-wallet-state.tsx index 2aa9e176aa..6df2aaf297 100644 --- a/packages/web/modals/wallet-select/cosmos-wallet-state.tsx +++ b/packages/web/modals/wallet-select/cosmos-wallet-state.tsx @@ -13,7 +13,7 @@ import { useLocalStorage } from "react-use"; import { IntroducingOneClick } from "~/components/one-click-trading/introducing-one-click-trading"; import { OneClickFloatingBannerDoNotShowKey } from "~/components/one-click-trading/one-click-floating-banner"; import OneClickTradingConnectToContinue from "~/components/one-click-trading/one-click-trading-connect-to-continue"; -import OneClickTradingSettings from "~/components/one-click-trading/one-click-trading-settings"; +import { OneClickTradingSettings } from "~/components/one-click-trading/one-click-trading-settings"; import OneClickTradingWelcomeBack from "~/components/one-click-trading/one-click-trading-welcome-back"; import { Screen, ScreenManager } from "~/components/screen-manager"; import { Button } from "~/components/ui/button"; From fa280207cf73b0c84446e593a77e5a065b4ca0f3 Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:24:36 -0500 Subject: [PATCH 17/39] OneClickTradingIntroModal --- packages/web/modals/one-click-trading-intro-modal.tsx | 2 +- packages/web/pages/_app.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/web/modals/one-click-trading-intro-modal.tsx b/packages/web/modals/one-click-trading-intro-modal.tsx index 88283246a3..686bda7664 100644 --- a/packages/web/modals/one-click-trading-intro-modal.tsx +++ b/packages/web/modals/one-click-trading-intro-modal.tsx @@ -30,7 +30,7 @@ export const useGlobalIs1CTIntroModalScreen = createGlobalState( null ); -const OneClickTradingIntroModal = observer(() => { +export const OneClickTradingIntroModal = observer(() => { const { accountStore, chainStore } = useStore(); const { oneClickTradingInfo, isOneClickTradingEnabled, isLoadingInfo } = useOneClickTradingSession(); diff --git a/packages/web/pages/_app.tsx b/packages/web/pages/_app.tsx index da1ec26378..4a6ef7d642 100644 --- a/packages/web/pages/_app.tsx +++ b/packages/web/pages/_app.tsx @@ -43,7 +43,7 @@ import { useFeatureFlags } from "~/hooks/use-feature-flags"; import { useNewApps } from "~/hooks/use-new-apps"; import { WalletSelectProvider } from "~/hooks/use-wallet-select"; import { ExternalLinkModal, handleExternalLink } from "~/modals"; -import OneClickTradingIntroModal from "~/modals/one-click-trading-intro-modal"; +import { OneClickTradingIntroModal } from "~/modals/one-click-trading-intro-modal"; import DefaultSeo from "~/next-seo.config"; import { api } from "~/utils/trpc"; From e9303259dcd07f9277c4c31e574f16d3ee08a5df Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:29:09 -0500 Subject: [PATCH 18/39] QRCode --- packages/web/components/qrcode.tsx | 4 +--- packages/web/modals/profile.tsx | 4 +++- packages/web/modals/wallet-select/qr-code-view.tsx | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/web/components/qrcode.tsx b/packages/web/components/qrcode.tsx index 1a4bcb8044..bb9e08e795 100644 --- a/packages/web/components/qrcode.tsx +++ b/packages/web/components/qrcode.tsx @@ -20,7 +20,7 @@ const generateMatrix = ( ); }; -const QRCode: FunctionComponent<{ +export const QRCode: FunctionComponent<{ errorCorrectionLevel?: QRCodeUtil.QRCodeErrorCorrectionLevel; logoUrl?: string; logoMargin?: number; @@ -151,5 +151,3 @@ const QRCode: FunctionComponent<{
); }; - -export default QRCode; diff --git a/packages/web/modals/profile.tsx b/packages/web/modals/profile.tsx index d6101fec34..23fe97e935 100644 --- a/packages/web/modals/profile.tsx +++ b/packages/web/modals/profile.tsx @@ -48,7 +48,9 @@ import { useStore } from "~/stores"; import { formatPretty } from "~/utils/formatter"; import { api } from "~/utils/trpc"; -const QRCode = dynamic(() => import("~/components/qrcode")); +const QRCode = dynamic(() => + import("~/components/qrcode").then((module) => module.QRCode) +); export const ProfileModal: FunctionComponent< ModalBaseProps & { icnsName?: string } diff --git a/packages/web/modals/wallet-select/qr-code-view.tsx b/packages/web/modals/wallet-select/qr-code-view.tsx index 9d75e1eaa2..f8be29bb1d 100644 --- a/packages/web/modals/wallet-select/qr-code-view.tsx +++ b/packages/web/modals/wallet-select/qr-code-view.tsx @@ -8,7 +8,9 @@ import SkeletonLoader from "~/components/loaders/skeleton-loader"; import { Button } from "~/components/ui/button"; import { useTranslation } from "~/hooks"; -const QRCode = React.lazy(() => import("~/components/qrcode")); +const QRCode = React.lazy(() => + import("~/components/qrcode").then((module) => ({ default: module.QRCode })) +); const QRCodeLoader = () => (
From daaf4ba188984c68523f2fa49e2b90fe3b50b25e Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:30:54 -0500 Subject: [PATCH 19/39] AvatarIcon --- packages/web/components/cards/validator-squad-card.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/web/components/cards/validator-squad-card.tsx b/packages/web/components/cards/validator-squad-card.tsx index 8bdc65fb42..0c9c16fa3a 100644 --- a/packages/web/components/cards/validator-squad-card.tsx +++ b/packages/web/components/cards/validator-squad-card.tsx @@ -172,5 +172,3 @@ const AvatarIcon: React.FC<{ extraValidators?: number }> = ({
); }; - -export default AvatarIcon; From 007326f008e375e8064bcfddc8660765581282d6 Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:31:37 -0500 Subject: [PATCH 20/39] OneClickTradingWelcomeBack --- .../one-click-trading/one-click-trading-welcome-back.tsx | 4 +--- packages/web/modals/wallet-select/cosmos-wallet-state.tsx | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/web/components/one-click-trading/one-click-trading-welcome-back.tsx b/packages/web/components/one-click-trading/one-click-trading-welcome-back.tsx index c32f765b1d..cf34cdd7ce 100644 --- a/packages/web/components/one-click-trading/one-click-trading-welcome-back.tsx +++ b/packages/web/components/one-click-trading/one-click-trading-welcome-back.tsx @@ -18,7 +18,7 @@ interface OneClickTradingWelcomeBackProps { isDisabled?: boolean; } -const OneClickTradingWelcomeBack = ({ +export const OneClickTradingWelcomeBack = ({ transaction1CTParams, setTransaction1CTParams, onClickEditParams, @@ -98,5 +98,3 @@ const OneClickTradingWelcomeBack = ({ ); }; - -export default OneClickTradingWelcomeBack; diff --git a/packages/web/modals/wallet-select/cosmos-wallet-state.tsx b/packages/web/modals/wallet-select/cosmos-wallet-state.tsx index 6df2aaf297..a7aed818f8 100644 --- a/packages/web/modals/wallet-select/cosmos-wallet-state.tsx +++ b/packages/web/modals/wallet-select/cosmos-wallet-state.tsx @@ -14,7 +14,7 @@ import { IntroducingOneClick } from "~/components/one-click-trading/introducing- import { OneClickFloatingBannerDoNotShowKey } from "~/components/one-click-trading/one-click-floating-banner"; import OneClickTradingConnectToContinue from "~/components/one-click-trading/one-click-trading-connect-to-continue"; import { OneClickTradingSettings } from "~/components/one-click-trading/one-click-trading-settings"; -import OneClickTradingWelcomeBack from "~/components/one-click-trading/one-click-trading-welcome-back"; +import { OneClickTradingWelcomeBack } from "~/components/one-click-trading/one-click-trading-welcome-back"; import { Screen, ScreenManager } from "~/components/screen-manager"; import { Button } from "~/components/ui/button"; import { ConnectingWalletState } from "~/components/wallet-states"; From f5815078674681486ba4dcfddabfc39d59ace5ae Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:33:29 -0500 Subject: [PATCH 21/39] HistoricalPriceChart --- .../components/cards/my-position/expanded.tsx | 5 +- .../web/components/chart/price-historical.tsx | 4 +- .../components/complex/add-conc-liquidity.tsx | 5 +- .../web/components/earn/position/index.tsx | 155 ------------------ .../increase-concentrated-liquidity.tsx | 5 +- 5 files changed, 13 insertions(+), 161 deletions(-) diff --git a/packages/web/components/cards/my-position/expanded.tsx b/packages/web/components/cards/my-position/expanded.tsx index 2ea673fda8..7c1b06b1a7 100644 --- a/packages/web/components/cards/my-position/expanded.tsx +++ b/packages/web/components/cards/my-position/expanded.tsx @@ -45,7 +45,10 @@ const ConcentratedLiquidityDepthChart = dynamic( { ssr: false } ); const HistoricalPriceChart = dynamic( - () => import("~/components/chart/price-historical"), + () => + import("~/components/chart/price-historical").then( + (module) => module.HistoricalPriceChart + ), { ssr: false } ); diff --git a/packages/web/components/chart/price-historical.tsx b/packages/web/components/chart/price-historical.tsx index 2967af0c44..2831c6abc2 100644 --- a/packages/web/components/chart/price-historical.tsx +++ b/packages/web/components/chart/price-historical.tsx @@ -33,7 +33,7 @@ import { } from "~/utils/formatter"; import { getDecimalCount } from "~/utils/number"; -const HistoricalPriceChart: FunctionComponent<{ +export const HistoricalPriceChart: FunctionComponent<{ data: { close: number; time: number }[]; margin?: Partial; annotations: Dec[]; @@ -246,8 +246,6 @@ const HistoricalPriceChart: FunctionComponent<{ ) ); -export default HistoricalPriceChart; - export const PriceChartHeader: FunctionComponent<{ historicalRange: PriceRange; setHistoricalRange: (pr: PriceRange) => void; diff --git a/packages/web/components/complex/add-conc-liquidity.tsx b/packages/web/components/complex/add-conc-liquidity.tsx index ba9163f0ad..6e31053e1e 100644 --- a/packages/web/components/complex/add-conc-liquidity.tsx +++ b/packages/web/components/complex/add-conc-liquidity.tsx @@ -49,7 +49,10 @@ const ConcentratedLiquidityDepthChart = dynamic( { ssr: false } ); const HistoricalPriceChart = dynamic( - () => import("~/components/chart/price-historical"), + () => + import("~/components/chart/price-historical").then( + (module) => module.HistoricalPriceChart + ), { ssr: false } ); diff --git a/packages/web/components/earn/position/index.tsx b/packages/web/components/earn/position/index.tsx index 6eadca4f02..4c543c53e2 100644 --- a/packages/web/components/earn/position/index.tsx +++ b/packages/web/components/earn/position/index.tsx @@ -3,97 +3,6 @@ import classNames from "classnames"; import { Spinner } from "~/components/loaders"; import { useTranslation } from "~/hooks"; -// const mockData = [ -// { -// time: 1700841000000, -// close: 0.65400126, -// high: 0.65403389, -// low: 0.65373768, -// open: 0.65395691, -// volume: 14924.6249708296, -// }, -// { -// time: 1700841300000, -// close: 0.65441089, -// high: 0.65441089, -// low: 0.65400126, -// open: 0.65400126, -// volume: 19703.3007456919, -// }, -// { -// time: 1700841600000, -// close: 0.65503813, -// high: 0.65507399, -// low: 0.65441089, -// open: 0.65441089, -// volume: 13458.9162743022, -// }, -// { -// time: 1700841900000, -// close: 0.65612501, -// high: 0.6561639, -// low: 0.6549041, -// open: 0.65509209, -// volume: 26237.4484187444, -// }, -// { -// time: 1700842200000, -// close: 0.65651969, -// high: 0.65689089, -// low: 0.65608492, -// open: 0.65612501, -// volume: 19748.608984616, -// }, -// { -// time: 1700842500000, -// close: 0.6571733, -// high: 0.65732227, -// low: 0.65651969, -// open: 0.65651969, -// volume: 19163.6796236313, -// }, -// { -// time: 1700842800000, -// close: 0.65673653, -// high: 0.65732804, -// low: 0.65668747, -// open: 0.6571733, -// volume: 9782.0254345117, -// }, -// { -// time: 1700843100000, -// close: 0.65816234, -// high: 0.65823109, -// low: 0.65678242, -// open: 0.65678242, -// volume: 48806.164623421, -// }, -// { -// time: 1700843400000, -// close: 0.65774444, -// high: 0.65824681, -// low: 0.65770708, -// open: 0.65816234, -// volume: 15678.1349349541, -// }, -// { -// time: 1700843700000, -// close: 0.65813635, -// high: 0.65835, -// low: 0.65773638, -// open: 0.65774444, -// volume: 10095.653257161, -// }, -// { -// time: 1700844000000, -// close: 0.65792152, -// high: 0.65813635, -// low: 0.65792152, -// open: 0.65813635, -// volume: 8362.6096812617, -// }, -// ]; - export const EarnPosition = ({ totalBalance, isLoading, @@ -139,70 +48,6 @@ export const EarnPosition = ({

{totalBalance}

- {/*
-
-

- $23,347.23 -

-
-

- {t("earnPage.value")} -

-

- {t("convertToStake.APR")} -

-
-
- -
*/} ); }; - -// const EarnPositionChartSection = () => { -// const { t } = useTranslation(); - -// return ( -//
-//
-// {}} -// selected={false} -// /> -// {}} -// selected={false} -// /> -// {}} selected={true} /> -// {}} -// selected={false} -// /> -// {}} -// selected={false} -// /> -//
-// -//
-// ); -// }; diff --git a/packages/web/modals/increase-concentrated-liquidity.tsx b/packages/web/modals/increase-concentrated-liquidity.tsx index 492c143a14..59d108bbbd 100644 --- a/packages/web/modals/increase-concentrated-liquidity.tsx +++ b/packages/web/modals/increase-concentrated-liquidity.tsx @@ -34,7 +34,10 @@ const ConcentratedLiquidityDepthChart = dynamic( { ssr: false } ); const HistoricalPriceChart = dynamic( - () => import("~/components/chart/price-historical"), + () => + import("~/components/chart/price-historical").then( + (module) => module.HistoricalPriceChart + ), { ssr: false } ); From e2aa8c685aef2a46599e86748e11d539cce74bb2 Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:34:04 -0500 Subject: [PATCH 22/39] PoolComposition --- packages/web/components/chart/pool-composition.tsx | 4 +--- packages/web/components/pool-detail/share.tsx | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/web/components/chart/pool-composition.tsx b/packages/web/components/chart/pool-composition.tsx index 0e47481083..148fba6b7c 100644 --- a/packages/web/components/chart/pool-composition.tsx +++ b/packages/web/components/chart/pool-composition.tsx @@ -2,7 +2,7 @@ import { CoinPretty } from "@keplr-wallet/unit"; import Image from "next/image"; import { FunctionComponent } from "react"; -const PoolComposition: FunctionComponent<{ +export const PoolComposition: FunctionComponent<{ assets: CoinPretty[]; }> = ({ assets }) => { return ( @@ -28,5 +28,3 @@ const PoolComposition: FunctionComponent<{ ); }; - -export default PoolComposition; diff --git a/packages/web/components/pool-detail/share.tsx b/packages/web/components/pool-detail/share.tsx index 8765e188d9..045772dd3d 100644 --- a/packages/web/components/pool-detail/share.tsx +++ b/packages/web/components/pool-detail/share.tsx @@ -17,7 +17,7 @@ import { useMeasure } from "react-use"; import { Icon, PoolAssetsIcon } from "~/components/assets"; import { BondCard } from "~/components/cards"; import { AssetBreakdownChart, PriceBreakdownChart } from "~/components/chart"; -import PoolComposition from "~/components/chart/pool-composition"; +import { PoolComposition } from "~/components/chart/pool-composition"; import { Disableable } from "~/components/types"; import { ArrowButton } from "~/components/ui/button"; import { Button } from "~/components/ui/button"; From ab82eaf46851d12ac47c462045061ca7b9515510 Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:35:15 -0500 Subject: [PATCH 23/39] IconButton --- packages/web/components/buttons/clipboard-button.tsx | 2 +- packages/web/components/buttons/icon-button.tsx | 4 +--- packages/web/components/complex/add-conc-liquidity.tsx | 2 +- packages/web/components/complex/transfer.tsx | 2 +- packages/web/components/drawers/token-select-drawer.tsx | 2 +- packages/web/components/layouts/main.tsx | 2 +- .../navbar-osmosis-update/navbar-osmosis-update.tsx | 2 +- packages/web/components/navbar/index.tsx | 2 +- .../one-click-trading/one-click-trading-welcome-back.tsx | 2 +- packages/web/components/stepper/index.tsx | 2 +- packages/web/components/swap-tool/index.tsx | 2 +- packages/web/components/transactions/transaction-details.tsx | 2 +- packages/web/integrations/notifi/notifi-modal.tsx | 2 +- packages/web/integrations/notifi/notifi-popover.tsx | 2 +- .../notifi-subscription-card/fetched-card/edit-view.tsx | 2 +- .../fetched-card/history-detail-view.tsx | 2 +- .../notifi-subscription-card/fetched-card/history-view.tsx | 2 +- 17 files changed, 17 insertions(+), 19 deletions(-) diff --git a/packages/web/components/buttons/clipboard-button.tsx b/packages/web/components/buttons/clipboard-button.tsx index 151b8d41ed..35f56570a2 100644 --- a/packages/web/components/buttons/clipboard-button.tsx +++ b/packages/web/components/buttons/clipboard-button.tsx @@ -5,7 +5,7 @@ import { useState } from "react"; import { Icon } from "~/components/assets"; import { SpriteIconId } from "~/config"; -import IconButton from "./icon-button"; +import { IconButton } from "./icon-button"; /** * Renders an icon within a button. diff --git a/packages/web/components/buttons/icon-button.tsx b/packages/web/components/buttons/icon-button.tsx index 263b88260c..3d2bd68349 100644 --- a/packages/web/components/buttons/icon-button.tsx +++ b/packages/web/components/buttons/icon-button.tsx @@ -11,7 +11,7 @@ import { Button } from "~/components/buttons/button"; /** * Renders an icon within a button. */ -const IconButton = forwardRef< +export const IconButton = forwardRef< HTMLButtonElement, { icon?: ReactNode; @@ -41,5 +41,3 @@ const IconButton = forwardRef< ); }); - -export default IconButton; diff --git a/packages/web/components/complex/add-conc-liquidity.tsx b/packages/web/components/complex/add-conc-liquidity.tsx index 6e31053e1e..47b31623f0 100644 --- a/packages/web/components/complex/add-conc-liquidity.tsx +++ b/packages/web/components/complex/add-conc-liquidity.tsx @@ -16,7 +16,7 @@ import React, { } from "react"; import { Icon, PoolAssetsIcon, PoolAssetsName } from "~/components/assets"; -import IconButton from "~/components/buttons/icon-button"; +import { IconButton } from "~/components/buttons/icon-button"; import { ChartUnavailable, PriceChartHeader, diff --git a/packages/web/components/complex/transfer.tsx b/packages/web/components/complex/transfer.tsx index 0a387a0161..39263728cb 100644 --- a/packages/web/components/complex/transfer.tsx +++ b/packages/web/components/complex/transfer.tsx @@ -12,7 +12,7 @@ import { useClickAway } from "react-use"; import { Icon } from "~/components/assets"; import { GradientView } from "~/components/assets/gradient-view"; -import IconButton from "~/components/buttons/icon-button"; +import { IconButton } from "~/components/buttons/icon-button"; import { SwitchWalletButton } from "~/components/buttons/switch-wallet"; import { BridgeFromToNetwork } from "~/components/complex/bridge-from-to-network"; import { MenuDropdown, MenuToggle } from "~/components/control"; diff --git a/packages/web/components/drawers/token-select-drawer.tsx b/packages/web/components/drawers/token-select-drawer.tsx index 1663b4102a..3ace319963 100644 --- a/packages/web/components/drawers/token-select-drawer.tsx +++ b/packages/web/components/drawers/token-select-drawer.tsx @@ -12,7 +12,7 @@ import { import { useLatest } from "react-use"; import { Icon } from "~/components/assets"; -import IconButton from "~/components/buttons/icon-button"; +import { IconButton } from "~/components/buttons/icon-button"; import { SearchBox } from "~/components/input"; import { Tooltip } from "~/components/tooltip"; import { useTranslation } from "~/hooks"; diff --git a/packages/web/components/layouts/main.tsx b/packages/web/components/layouts/main.tsx index 7b395f7d37..b4ef5471de 100644 --- a/packages/web/components/layouts/main.tsx +++ b/packages/web/components/layouts/main.tsx @@ -3,7 +3,7 @@ import { observer } from "mobx-react-lite"; import { useRouter } from "next/router"; import React, { type FunctionComponent, type PropsWithChildren } from "react"; -import IconButton from "~/components/buttons/icon-button"; +import { IconButton } from "~/components/buttons/icon-button"; import { MainLayoutMenu, MainMenu } from "~/components/main-menu"; import { NavBar } from "~/components/navbar"; import { NavbarOsmoPrice } from "~/components/navbar-osmo-price"; diff --git a/packages/web/components/navbar-osmosis-update/navbar-osmosis-update.tsx b/packages/web/components/navbar-osmosis-update/navbar-osmosis-update.tsx index a33dae6097..cd798ddfcb 100644 --- a/packages/web/components/navbar-osmosis-update/navbar-osmosis-update.tsx +++ b/packages/web/components/navbar-osmosis-update/navbar-osmosis-update.tsx @@ -4,7 +4,7 @@ import classNames from "classnames"; import React, { FunctionComponent } from "react"; import { Icon } from "~/components/assets"; -import IconButton from "~/components/buttons/icon-button"; +import { IconButton } from "~/components/buttons/icon-button"; import { Spinner } from "~/components/loaders/spinner"; import { ArrowButton } from "~/components/ui/button"; import { useFeatureFlags, useTranslation } from "~/hooks"; diff --git a/packages/web/components/navbar/index.tsx b/packages/web/components/navbar/index.tsx index 2beed2daa3..f1d79cee7e 100644 --- a/packages/web/components/navbar/index.tsx +++ b/packages/web/components/navbar/index.tsx @@ -23,7 +23,7 @@ import { import { useLocalStorage } from "react-use"; import { Icon } from "~/components/assets"; -import IconButton from "~/components/buttons/icon-button"; +import { IconButton } from "~/components/buttons/icon-button"; import { ClientOnly } from "~/components/client-only"; import SkeletonLoader from "~/components/loaders/skeleton-loader"; import { MainLayoutMenu, MainMenu } from "~/components/main-menu"; diff --git a/packages/web/components/one-click-trading/one-click-trading-welcome-back.tsx b/packages/web/components/one-click-trading/one-click-trading-welcome-back.tsx index cf34cdd7ce..0fbd611db5 100644 --- a/packages/web/components/one-click-trading/one-click-trading-welcome-back.tsx +++ b/packages/web/components/one-click-trading/one-click-trading-welcome-back.tsx @@ -3,7 +3,7 @@ import Image from "next/image"; import { Dispatch, SetStateAction } from "react"; import { Icon } from "~/components/assets"; -import IconButton from "~/components/buttons/icon-button"; +import { IconButton } from "~/components/buttons/icon-button"; import { Spinner } from "~/components/loaders"; import { Switch } from "~/components/ui/switch"; import { useTranslation } from "~/hooks"; diff --git a/packages/web/components/stepper/index.tsx b/packages/web/components/stepper/index.tsx index abdf9ba881..d0f68d733b 100644 --- a/packages/web/components/stepper/index.tsx +++ b/packages/web/components/stepper/index.tsx @@ -11,7 +11,7 @@ import { } from "react"; import { Icon } from "~/components/assets"; -import IconButton from "~/components/buttons/icon-button"; +import { IconButton } from "~/components/buttons/icon-button"; import { useSteps, UseStepsReturn } from "~/components/stepper/use-steps"; import { createContext } from "~/utils/react-context"; diff --git a/packages/web/components/swap-tool/index.tsx b/packages/web/components/swap-tool/index.tsx index 44ddf41132..d1d8aadef1 100644 --- a/packages/web/components/swap-tool/index.tsx +++ b/packages/web/components/swap-tool/index.tsx @@ -18,7 +18,7 @@ import { import { useMeasure } from "react-use"; import { Icon } from "~/components/assets"; -import IconButton from "~/components/buttons/icon-button"; +import { IconButton } from "~/components/buttons/icon-button"; import { TokenSelectWithDrawer } from "~/components/control/token-select-with-drawer"; import { InputBox } from "~/components/input"; import SkeletonLoader from "~/components/loaders/skeleton-loader"; diff --git a/packages/web/components/transactions/transaction-details.tsx b/packages/web/components/transactions/transaction-details.tsx index cde8a0b7ac..6cc95408e8 100644 --- a/packages/web/components/transactions/transaction-details.tsx +++ b/packages/web/components/transactions/transaction-details.tsx @@ -8,7 +8,7 @@ import { FunctionComponent, useEffect, useMemo, useState } from "react"; import { Icon } from "~/components/assets"; import { FallbackImg } from "~/components/assets"; import { CopyIconButton } from "~/components/buttons/copy-icon-button"; -import IconButton from "~/components/buttons/icon-button"; +import { IconButton } from "~/components/buttons/icon-button"; import { displayFiatPrice } from "~/components/transactions/transaction-utils"; import { Button } from "~/components/ui/button"; import { EventName } from "~/config"; diff --git a/packages/web/integrations/notifi/notifi-modal.tsx b/packages/web/integrations/notifi/notifi-modal.tsx index 64216e257b..0929900af9 100644 --- a/packages/web/integrations/notifi/notifi-modal.tsx +++ b/packages/web/integrations/notifi/notifi-modal.tsx @@ -2,7 +2,7 @@ import { useNotifiClientContext } from "@notifi-network/notifi-react-card"; import { FunctionComponent } from "react"; import { Icon } from "~/components/assets"; -import IconButton from "~/components/buttons/icon-button"; +import { IconButton } from "~/components/buttons/icon-button"; import { useWindowSize } from "~/hooks"; import { useNotifiModalContext } from "~/integrations/notifi/notifi-modal-context"; import { NotifiSubscriptionCard } from "~/integrations/notifi/notifi-subscription-card"; diff --git a/packages/web/integrations/notifi/notifi-popover.tsx b/packages/web/integrations/notifi/notifi-popover.tsx index 041e37e129..bbe181b760 100644 --- a/packages/web/integrations/notifi/notifi-popover.tsx +++ b/packages/web/integrations/notifi/notifi-popover.tsx @@ -11,7 +11,7 @@ import React, { import { forwardRef } from "react"; import { Icon } from "~/components/assets"; -import IconButton from "~/components/buttons/icon-button"; +import { IconButton } from "~/components/buttons/icon-button"; import { Popover } from "~/components/popover"; import { Button } from "~/components/ui/button"; import { EventName } from "~/config"; diff --git a/packages/web/integrations/notifi/notifi-subscription-card/fetched-card/edit-view.tsx b/packages/web/integrations/notifi/notifi-subscription-card/fetched-card/edit-view.tsx index 62d78131a9..b61e0ff8bd 100644 --- a/packages/web/integrations/notifi/notifi-subscription-card/fetched-card/edit-view.tsx +++ b/packages/web/integrations/notifi/notifi-subscription-card/fetched-card/edit-view.tsx @@ -9,7 +9,7 @@ import classNames from "classnames"; import { FunctionComponent, useCallback, useEffect, useMemo } from "react"; import { Icon } from "~/components/assets"; -import IconButton from "~/components/buttons/icon-button"; +import { IconButton } from "~/components/buttons/icon-button"; import { Button } from "~/components/ui/button"; import { EventName } from "~/config"; import { useTranslation } from "~/hooks"; diff --git a/packages/web/integrations/notifi/notifi-subscription-card/fetched-card/history-detail-view.tsx b/packages/web/integrations/notifi/notifi-subscription-card/fetched-card/history-detail-view.tsx index 897c29863f..85e31698a9 100644 --- a/packages/web/integrations/notifi/notifi-subscription-card/fetched-card/history-detail-view.tsx +++ b/packages/web/integrations/notifi/notifi-subscription-card/fetched-card/history-detail-view.tsx @@ -1,7 +1,7 @@ import { FunctionComponent } from "react"; import { Icon } from "~/components/assets"; -import IconButton from "~/components/buttons/icon-button"; +import { IconButton } from "~/components/buttons/icon-button"; import { useWindowSize } from "~/hooks"; import { DisplayingView, diff --git a/packages/web/integrations/notifi/notifi-subscription-card/fetched-card/history-view.tsx b/packages/web/integrations/notifi/notifi-subscription-card/fetched-card/history-view.tsx index 788ac93243..6db8d424af 100644 --- a/packages/web/integrations/notifi/notifi-subscription-card/fetched-card/history-view.tsx +++ b/packages/web/integrations/notifi/notifi-subscription-card/fetched-card/history-view.tsx @@ -9,7 +9,7 @@ import { import { Icon } from "~/components/assets"; import { TeamUpdateIcon } from "~/components/assets/notifi-alerts/team-update"; -import IconButton from "~/components/buttons/icon-button"; +import { IconButton } from "~/components/buttons/icon-button"; import { useTranslation } from "~/hooks"; import { useWindowSize } from "~/hooks"; import { useNotifiLocalStorage } from "~/integrations/notifi/hooks"; From 558b088823a38ae819c3b7fcfec1a14bde2ec07e Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:36:22 -0500 Subject: [PATCH 24/39] ConcentratedLiquidityDepthChart --- packages/web/components/cards/my-position/expanded.tsx | 5 ++++- .../components/chart/concentrated-liquidity-depth.tsx | 5 +---- packages/web/components/complex/add-conc-liquidity.tsx | 5 ++++- packages/web/components/pool-detail/concentrated.tsx | 10 ++++++++-- .../web/modals/increase-concentrated-liquidity.tsx | 5 ++++- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/packages/web/components/cards/my-position/expanded.tsx b/packages/web/components/cards/my-position/expanded.tsx index 7c1b06b1a7..0270ce3f06 100644 --- a/packages/web/components/cards/my-position/expanded.tsx +++ b/packages/web/components/cards/my-position/expanded.tsx @@ -41,7 +41,10 @@ import { formatPretty, getPriceExtendedFormatOptions } from "~/utils/formatter"; import { RouterOutputs } from "~/utils/trpc"; const ConcentratedLiquidityDepthChart = dynamic( - () => import("~/components/chart/concentrated-liquidity-depth"), + () => + import("~/components/chart/concentrated-liquidity-depth").then( + (module) => module.ConcentratedLiquidityDepthChart + ), { ssr: false } ); const HistoricalPriceChart = dynamic( diff --git a/packages/web/components/chart/concentrated-liquidity-depth.tsx b/packages/web/components/chart/concentrated-liquidity-depth.tsx index cbfeb069dc..a926349d2a 100644 --- a/packages/web/components/chart/concentrated-liquidity-depth.tsx +++ b/packages/web/components/chart/concentrated-liquidity-depth.tsx @@ -19,7 +19,7 @@ export type DepthData = { depth: number; }; -const ConcentratedLiquidityDepthChart: FunctionComponent<{ +export const ConcentratedLiquidityDepthChart: FunctionComponent<{ min?: number; max?: number; yRange: [number, number]; @@ -252,6 +252,3 @@ const DragContainer: FunctionComponent<{ /> ); - -// needed for next/dynamic to avoid including visx in main bundle -export default ConcentratedLiquidityDepthChart; diff --git a/packages/web/components/complex/add-conc-liquidity.tsx b/packages/web/components/complex/add-conc-liquidity.tsx index 47b31623f0..9a191293f8 100644 --- a/packages/web/components/complex/add-conc-liquidity.tsx +++ b/packages/web/components/complex/add-conc-liquidity.tsx @@ -45,7 +45,10 @@ import { formatPretty, getPriceExtendedFormatOptions } from "~/utils/formatter"; import { Tooltip } from "../tooltip"; const ConcentratedLiquidityDepthChart = dynamic( - () => import("~/components/chart/concentrated-liquidity-depth"), + () => + import("~/components/chart/concentrated-liquidity-depth").then( + (module) => module.ConcentratedLiquidityDepthChart + ), { ssr: false } ); const HistoricalPriceChart = dynamic( diff --git a/packages/web/components/pool-detail/concentrated.tsx b/packages/web/components/pool-detail/concentrated.tsx index 952484e79e..21737b9221 100644 --- a/packages/web/components/pool-detail/concentrated.tsx +++ b/packages/web/components/pool-detail/concentrated.tsx @@ -35,11 +35,17 @@ import { AprBreakdownLegacy } from "../cards/apr-breakdown"; import SkeletonLoader from "../loaders/skeleton-loader"; const ConcentratedLiquidityDepthChart = dynamic( - () => import("~/components/chart/concentrated-liquidity-depth"), + () => + import("~/components/chart/concentrated-liquidity-depth").then( + (module) => module.ConcentratedLiquidityDepthChart + ), { ssr: false } ); const HistoricalPriceChart = dynamic( - () => import("~/components/chart/price-historical"), + () => + import("~/components/chart/price-historical").then( + (module) => module.HistoricalPriceChart + ), { ssr: false } ); diff --git a/packages/web/modals/increase-concentrated-liquidity.tsx b/packages/web/modals/increase-concentrated-liquidity.tsx index 59d108bbbd..05855ebe48 100644 --- a/packages/web/modals/increase-concentrated-liquidity.tsx +++ b/packages/web/modals/increase-concentrated-liquidity.tsx @@ -30,7 +30,10 @@ import { useStore } from "~/stores"; import { formatPretty, getPriceExtendedFormatOptions } from "~/utils/formatter"; const ConcentratedLiquidityDepthChart = dynamic( - () => import("~/components/chart/concentrated-liquidity-depth"), + () => + import("~/components/chart/concentrated-liquidity-depth").then( + (module) => module.ConcentratedLiquidityDepthChart + ), { ssr: false } ); const HistoricalPriceChart = dynamic( From d03cab6c3400765504cf5ff0065fc58f81ecee9d Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:36:56 -0500 Subject: [PATCH 25/39] LinkButton --- packages/web/components/buttons/link-button.tsx | 2 +- packages/web/pages/assets/[denom].tsx | 2 +- packages/web/pages/components.tsx | 6 +++--- packages/web/pages/transactions.tsx | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/web/components/buttons/link-button.tsx b/packages/web/components/buttons/link-button.tsx index 49d2e4e8c3..5257240d89 100644 --- a/packages/web/components/buttons/link-button.tsx +++ b/packages/web/components/buttons/link-button.tsx @@ -4,7 +4,7 @@ import { ReactElement } from "react"; import { Button } from "~/components/ui/button"; -export default function LinkButton({ +export function LinkButton({ label, icon, ariaLabel, diff --git a/packages/web/pages/assets/[denom].tsx b/packages/web/pages/assets/[denom].tsx index 440fd96b1f..38889b6472 100644 --- a/packages/web/pages/assets/[denom].tsx +++ b/packages/web/pages/assets/[denom].tsx @@ -23,7 +23,7 @@ import { useEffect } from "react"; import { useUnmount } from "react-use"; import { Icon } from "~/components/assets"; -import LinkButton from "~/components/buttons/link-button"; +import { LinkButton } from "~/components/buttons/link-button"; import { ChartUnavailable, PriceChartHeader, diff --git a/packages/web/pages/components.tsx b/packages/web/pages/components.tsx index ea412364cc..976d9aa448 100644 --- a/packages/web/pages/components.tsx +++ b/packages/web/pages/components.tsx @@ -22,9 +22,9 @@ import { CreditCardIcon } from "~/components/assets/credit-card-icon"; import { GradientView } from "~/components/assets/gradient-view"; import { RightArrowIcon } from "~/components/assets/right-arrow-icon"; import { UnlockIcon } from "~/components/assets/unlock-icon"; -import ClipboardButton from "~/components/buttons/clipboard-button"; -import IconButton from "~/components/buttons/icon-button"; -import LinkButton from "~/components/buttons/link-button"; +import { ClipboardButton } from "~/components/buttons/clipboard-button"; +import { IconButton } from "~/components/buttons/icon-button"; +import { LinkButton } from "~/components/buttons/link-button"; import { SwitchWalletButton } from "~/components/buttons/switch-wallet"; import { CheckboxSelect, diff --git a/packages/web/pages/transactions.tsx b/packages/web/pages/transactions.tsx index 3e7a48d1a3..56bbccad7f 100644 --- a/packages/web/pages/transactions.tsx +++ b/packages/web/pages/transactions.tsx @@ -3,7 +3,7 @@ import Image from "next/image"; import { useRouter } from "next/router"; import { useEffect, useMemo, useState } from "react"; -import LinkButton from "~/components/buttons/link-button"; +import { LinkButton } from "~/components/buttons/link-button"; import { TransactionContent } from "~/components/transactions/transaction-content"; import { TransactionDetailsModal, From 90e72d4f7566f4f2840169f5c330b711957323e1 Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:37:38 -0500 Subject: [PATCH 26/39] OneClickTradingConnectToContinue --- .../one-click-trading-connect-to-continue.tsx | 4 +--- packages/web/modals/wallet-select/cosmos-wallet-state.tsx | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/web/components/one-click-trading/one-click-trading-connect-to-continue.tsx b/packages/web/components/one-click-trading/one-click-trading-connect-to-continue.tsx index 19c0ddf086..872eac9b6a 100644 --- a/packages/web/components/one-click-trading/one-click-trading-connect-to-continue.tsx +++ b/packages/web/components/one-click-trading/one-click-trading-connect-to-continue.tsx @@ -3,7 +3,7 @@ import React from "react"; import { useTranslation } from "~/hooks"; -const OneClickTradingConnectToContinue = () => { +export const OneClickTradingConnectToContinue = () => { const { t } = useTranslation(); return (
@@ -24,5 +24,3 @@ const OneClickTradingConnectToContinue = () => {
); }; - -export default OneClickTradingConnectToContinue; diff --git a/packages/web/modals/wallet-select/cosmos-wallet-state.tsx b/packages/web/modals/wallet-select/cosmos-wallet-state.tsx index a7aed818f8..0831cf3cdc 100644 --- a/packages/web/modals/wallet-select/cosmos-wallet-state.tsx +++ b/packages/web/modals/wallet-select/cosmos-wallet-state.tsx @@ -12,7 +12,7 @@ import { useLocalStorage } from "react-use"; import { IntroducingOneClick } from "~/components/one-click-trading/introducing-one-click-trading"; import { OneClickFloatingBannerDoNotShowKey } from "~/components/one-click-trading/one-click-floating-banner"; -import OneClickTradingConnectToContinue from "~/components/one-click-trading/one-click-trading-connect-to-continue"; +import { OneClickTradingConnectToContinue } from "~/components/one-click-trading/one-click-trading-connect-to-continue"; import { OneClickTradingSettings } from "~/components/one-click-trading/one-click-trading-settings"; import { OneClickTradingWelcomeBack } from "~/components/one-click-trading/one-click-trading-welcome-back"; import { Screen, ScreenManager } from "~/components/screen-manager"; From c336171aba1610e49065bb27b1600b58dd076e54 Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:37:58 -0500 Subject: [PATCH 27/39] HistoricalPriceChartV2 --- packages/web/components/chart/price-historical-v2.tsx | 4 +--- packages/web/pages/assets/[denom].tsx | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/web/components/chart/price-historical-v2.tsx b/packages/web/components/chart/price-historical-v2.tsx index 7827f3a9bf..3531f413a1 100644 --- a/packages/web/components/chart/price-historical-v2.tsx +++ b/packages/web/components/chart/price-historical-v2.tsx @@ -20,7 +20,7 @@ const seriesOpt: DeepPartial = { crosshairMarkerRadius: 8, }; -const HistoricalPriceChartV2: FunctionComponent<{ +export const HistoricalPriceChartV2: FunctionComponent<{ data: { close: number; time: number }[]; onPointerHover?: (price: number) => void; onPointerOut?: () => void; @@ -50,5 +50,3 @@ const HistoricalPriceChartV2: FunctionComponent<{ /> ); }); - -export default HistoricalPriceChartV2; diff --git a/packages/web/pages/assets/[denom].tsx b/packages/web/pages/assets/[denom].tsx index 38889b6472..1054792e06 100644 --- a/packages/web/pages/assets/[denom].tsx +++ b/packages/web/pages/assets/[denom].tsx @@ -28,7 +28,7 @@ import { ChartUnavailable, PriceChartHeader, } from "~/components/chart/price-historical"; -import HistoricalPriceChartV2 from "~/components/chart/price-historical-v2"; +import { HistoricalPriceChartV2 } from "~/components/chart/price-historical-v2"; import { Spinner } from "~/components/loaders/spinner"; import { SwapTool } from "~/components/swap-tool"; import { TokenDetailsWithObserver } from "~/components/token-details"; From 58f689ebf9dd45e5ca2d5d3d4bee726b2501eac7 Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:40:07 -0500 Subject: [PATCH 28/39] TokenDetails --- packages/web/components/earn/table/index.tsx | 4 ++-- packages/web/components/token-details/token-details.tsx | 4 ++-- packages/web/pages/assets/[denom].tsx | 4 ++-- packages/web/pages/earn/index.tsx | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/web/components/earn/table/index.tsx b/packages/web/components/earn/table/index.tsx index 8d8454d98e..c11e17430c 100644 --- a/packages/web/components/earn/table/index.tsx +++ b/packages/web/components/earn/table/index.tsx @@ -21,7 +21,7 @@ interface StrategiesTableProps { refetch: () => void; } -const StrategiesTable = ({ +const _StrategiesTable = ({ showBalance, strategies, areStrategiesLoading, @@ -176,7 +176,7 @@ const StrategiesTable = ({ ); }; -export default observer(StrategiesTable); +export const StrategiesTable = observer(_StrategiesTable); const LoadingStrategies = () => { const { t } = useTranslation(); diff --git a/packages/web/components/token-details/token-details.tsx b/packages/web/components/token-details/token-details.tsx index 0897f12861..3dd9ba0d2e 100644 --- a/packages/web/components/token-details/token-details.tsx +++ b/packages/web/components/token-details/token-details.tsx @@ -26,7 +26,7 @@ export interface TokenDetailsProps { className?: string; } -const TokenDetails = ({ +const _TokenDetails = ({ denom, tokenDetailsByLanguage, className, @@ -270,7 +270,7 @@ const TokenDetails = ({ ); }; -export const TokenDetailsWithObserver = observer(TokenDetails); +export const TokenDetails = observer(_TokenDetails); interface TokenStatsProps { usdFiat?: FiatCurrency; diff --git a/packages/web/pages/assets/[denom].tsx b/packages/web/pages/assets/[denom].tsx index 1054792e06..afa29758e2 100644 --- a/packages/web/pages/assets/[denom].tsx +++ b/packages/web/pages/assets/[denom].tsx @@ -31,7 +31,7 @@ import { import { HistoricalPriceChartV2 } from "~/components/chart/price-historical-v2"; import { Spinner } from "~/components/loaders/spinner"; import { SwapTool } from "~/components/swap-tool"; -import { TokenDetailsWithObserver } from "~/components/token-details"; +import { TokenDetails } from "~/components/token-details"; import { TwitterSection } from "~/components/twitter-section"; import { LinkIconButton } from "~/components/ui/button"; import { Button } from "~/components/ui/button"; @@ -245,7 +245,7 @@ const AssetInfoView: FunctionComponent = observer( tokenDetailsByLanguage={tokenDetailsByLanguage} /> - Date: Tue, 4 Jun 2024 17:40:37 -0500 Subject: [PATCH 29/39] FiltersModal --- packages/web/components/earn/filters/filters-modal.tsx | 4 +--- packages/web/components/earn/filters/top-filters.tsx | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/web/components/earn/filters/filters-modal.tsx b/packages/web/components/earn/filters/filters-modal.tsx index 84b17f6225..bb7fa8cbe1 100644 --- a/packages/web/components/earn/filters/filters-modal.tsx +++ b/packages/web/components/earn/filters/filters-modal.tsx @@ -16,7 +16,7 @@ interface StrategiesFilter extends ListOption { icon: ReactNode; } -const FiltersModal = ( +export const FiltersModal = ( props: ModalBaseProps & { rewardTypes: ListOption[]; lockDurationTypes: ListOption[]; @@ -130,5 +130,3 @@ const FiltersModal = ( ); }; - -export default FiltersModal; diff --git a/packages/web/components/earn/filters/top-filters.tsx b/packages/web/components/earn/filters/top-filters.tsx index a69ffc0cea..d99de9f7d5 100644 --- a/packages/web/components/earn/filters/top-filters.tsx +++ b/packages/web/components/earn/filters/top-filters.tsx @@ -7,7 +7,7 @@ import { Icon } from "~/components/assets"; import { DropdownWithLabel } from "~/components/dropdown-with-label"; import { DropdownWithMultiSelect } from "~/components/dropdown-with-multi-select"; import { FilterContext } from "~/components/earn/filters/filter-context"; -import FiltersModal from "~/components/earn/filters/filters-modal"; +import { FiltersModal } from "~/components/earn/filters/filters-modal"; import { ListOption } from "~/components/earn/table/types/filters"; import { getListOptions } from "~/components/earn/table/utils"; import { SearchBox } from "~/components/input"; From 38d5c05c83d853e2440c13d19a902693db48fbb1 Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:41:24 -0500 Subject: [PATCH 30/39] ErrorBoundary --- packages/web/components/error/error-boundary.tsx | 4 +--- packages/web/pages/_app.tsx | 2 +- packages/web/pages/index.tsx | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/web/components/error/error-boundary.tsx b/packages/web/components/error/error-boundary.tsx index a16fd1bf4a..9189483371 100644 --- a/packages/web/components/error/error-boundary.tsx +++ b/packages/web/components/error/error-boundary.tsx @@ -10,7 +10,7 @@ interface ErrorBoundaryState { hasError: boolean; } -class ErrorBoundary extends React.Component< +export class ErrorBoundary extends React.Component< ErrorBoundaryProps, ErrorBoundaryState > { @@ -35,5 +35,3 @@ class ErrorBoundary extends React.Component< return this.props.children; } } - -export default ErrorBoundary; diff --git a/packages/web/pages/_app.tsx b/packages/web/pages/_app.tsx index 4a6ef7d642..3b9eec1248 100644 --- a/packages/web/pages/_app.tsx +++ b/packages/web/pages/_app.tsx @@ -23,7 +23,7 @@ import { Bounce, ToastContainer } from "react-toastify"; import { WagmiProvider } from "wagmi"; import { Icon } from "~/components/assets"; -import ErrorBoundary from "~/components/error/error-boundary"; +import { ErrorBoundary } from "~/components/error/error-boundary"; import { ErrorFallback } from "~/components/error/error-fallback"; import { Pill } from "~/components/indicators/pill"; import { MainLayout } from "~/components/layouts"; diff --git a/packages/web/pages/index.tsx b/packages/web/pages/index.tsx index d831c64f69..5f149675fa 100644 --- a/packages/web/pages/index.tsx +++ b/packages/web/pages/index.tsx @@ -3,7 +3,7 @@ import { observer } from "mobx-react-lite"; import { useLocalStorage } from "react-use"; import { Ad, AdBanners } from "~/components/ad-banner"; -import ErrorBoundary from "~/components/error/error-boundary"; +import { ErrorBoundary } from "~/components/error/error-boundary"; import { ProgressiveSvgImage } from "~/components/progressive-svg-image"; import { SwapTool } from "~/components/swap-tool"; import { EventName } from "~/config"; From e7fb849ae82b501d7ddbb2aac3693f27b22c9fd8 Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:43:59 -0500 Subject: [PATCH 31/39] SkeletonLoader --- packages/web/components/assets/highlights-categories.tsx | 2 +- packages/web/components/cards/my-position/index.tsx | 2 +- packages/web/components/chart/price-historical.tsx | 2 +- packages/web/components/complex/my-pools-card-grid.tsx | 2 +- packages/web/components/complex/my-positions-section.tsx | 2 +- packages/web/components/complex/transfer.tsx | 2 +- packages/web/components/earn/table/cells.tsx | 2 +- packages/web/components/loaders/skeleton-loader.tsx | 4 +--- packages/web/components/navbar-osmo-price.tsx | 2 +- packages/web/components/navbar/index.tsx | 2 +- .../one-click-trading/one-click-trading-settings.tsx | 2 +- .../one-click-trading/screens/network-fee-limit-screen.tsx | 2 +- .../one-click-trading/screens/spend-limit-screen.tsx | 2 +- packages/web/components/swap-tool/index.tsx | 2 +- packages/web/components/your-balance/your-balance.tsx | 2 +- packages/web/integrations/nomic/transfer.tsx | 2 +- packages/web/modals/remove-concentrated-liquidity.tsx | 2 +- packages/web/modals/wallet-select/qr-code-view.tsx | 2 +- 18 files changed, 18 insertions(+), 20 deletions(-) diff --git a/packages/web/components/assets/highlights-categories.tsx b/packages/web/components/assets/highlights-categories.tsx index 4ea063383b..4af56149d5 100644 --- a/packages/web/components/assets/highlights-categories.tsx +++ b/packages/web/components/assets/highlights-categories.tsx @@ -4,7 +4,7 @@ import Link from "next/link"; import { FunctionComponent, ReactNode } from "react"; import { PriceChange } from "~/components/assets/price"; -import SkeletonLoader from "~/components/loaders/skeleton-loader"; +import { SkeletonLoader } from "~/components/loaders/skeleton-loader"; import { EventName } from "~/config"; import { Breakpoint, diff --git a/packages/web/components/cards/my-position/index.tsx b/packages/web/components/cards/my-position/index.tsx index 074c6db4ec..c669eff97a 100644 --- a/packages/web/components/cards/my-position/index.tsx +++ b/packages/web/components/cards/my-position/index.tsx @@ -7,7 +7,7 @@ import { FunctionComponent, ReactNode, useState } from "react"; import { Icon, PoolAssetsIcon, PoolAssetsName } from "~/components/assets"; import { MyPositionCardExpandedSection } from "~/components/cards/my-position/expanded"; import { MyPositionStatus } from "~/components/cards/my-position/status"; -import SkeletonLoader from "~/components/loaders/skeleton-loader"; +import { SkeletonLoader } from "~/components/loaders/skeleton-loader"; import { EventName } from "~/config"; import { useFeatureFlags, useTranslation } from "~/hooks"; import { useAmplitudeAnalytics } from "~/hooks"; diff --git a/packages/web/components/chart/price-historical.tsx b/packages/web/components/chart/price-historical.tsx index 2831c6abc2..07de50a271 100644 --- a/packages/web/components/chart/price-historical.tsx +++ b/packages/web/components/chart/price-historical.tsx @@ -21,7 +21,7 @@ import { observer } from "mobx-react-lite"; import React, { FunctionComponent, memo, useCallback, useMemo } from "react"; import { Icon } from "~/components/assets"; -import SkeletonLoader from "~/components/loaders/skeleton-loader"; +import { SkeletonLoader } from "~/components/loaders/skeleton-loader"; import { ChartButton } from "~/components/ui/button"; import { type PriceRange, useTranslation } from "~/hooks"; import { theme } from "~/tailwind.config"; diff --git a/packages/web/components/complex/my-pools-card-grid.tsx b/packages/web/components/complex/my-pools-card-grid.tsx index 7ddba167b3..a8051c9f9a 100644 --- a/packages/web/components/complex/my-pools-card-grid.tsx +++ b/packages/web/components/complex/my-pools-card-grid.tsx @@ -3,7 +3,7 @@ import { observer } from "mobx-react-lite"; import { useCallback, useMemo, useRef, useState } from "react"; import { PoolCard } from "~/components/cards"; -import SkeletonLoader from "~/components/loaders/skeleton-loader"; +import { SkeletonLoader } from "~/components/loaders/skeleton-loader"; import { ShowMoreButton } from "~/components/ui/button"; import { EventName } from "~/config"; import { diff --git a/packages/web/components/complex/my-positions-section.tsx b/packages/web/components/complex/my-positions-section.tsx index 3c99a0151f..551252f340 100644 --- a/packages/web/components/complex/my-positions-section.tsx +++ b/packages/web/components/complex/my-positions-section.tsx @@ -2,7 +2,7 @@ import { observer } from "mobx-react-lite"; import React, { FunctionComponent, useState } from "react"; import { MyPositionCard } from "~/components/cards"; -import SkeletonLoader from "~/components/loaders/skeleton-loader"; +import { SkeletonLoader } from "~/components/loaders/skeleton-loader"; import { ShowMoreButton } from "~/components/ui/button"; import { useWalletSelect } from "~/hooks"; import { useStore } from "~/stores"; diff --git a/packages/web/components/complex/transfer.tsx b/packages/web/components/complex/transfer.tsx index 39263728cb..c7cfbba42e 100644 --- a/packages/web/components/complex/transfer.tsx +++ b/packages/web/components/complex/transfer.tsx @@ -17,7 +17,7 @@ import { SwitchWalletButton } from "~/components/buttons/switch-wallet"; import { BridgeFromToNetwork } from "~/components/complex/bridge-from-to-network"; import { MenuDropdown, MenuToggle } from "~/components/control"; import { InputBox } from "~/components/input"; -import SkeletonLoader from "~/components/loaders/skeleton-loader"; +import { SkeletonLoader } from "~/components/loaders/skeleton-loader"; import { Tooltip } from "~/components/tooltip"; import { Disableable, InputProps } from "~/components/types"; import { Button } from "~/components/ui/button"; diff --git a/packages/web/components/earn/table/cells.tsx b/packages/web/components/earn/table/cells.tsx index 2c113bdf27..ed9dca6402 100644 --- a/packages/web/components/earn/table/cells.tsx +++ b/packages/web/components/earn/table/cells.tsx @@ -9,7 +9,7 @@ import { ReactNode, useMemo } from "react"; import { Icon } from "~/components/assets"; import { ColumnCellCell } from "~/components/earn/table/columns"; -import SkeletonLoader from "~/components/loaders/skeleton-loader"; +import { SkeletonLoader } from "~/components/loaders/skeleton-loader"; import { Tooltip } from "~/components/tooltip"; import { Button } from "~/components/ui/button"; import { EventName } from "~/config"; diff --git a/packages/web/components/loaders/skeleton-loader.tsx b/packages/web/components/loaders/skeleton-loader.tsx index 058d342dbb..8b3ccf33c9 100644 --- a/packages/web/components/loaders/skeleton-loader.tsx +++ b/packages/web/components/loaders/skeleton-loader.tsx @@ -1,7 +1,7 @@ import classNames from "classnames"; import { DetailedHTMLProps, FunctionComponent } from "react"; -const SkeletonLoader: FunctionComponent< +export const SkeletonLoader: FunctionComponent< { isLoaded?: boolean; } & DetailedHTMLProps, HTMLDivElement> @@ -20,5 +20,3 @@ const SkeletonLoader: FunctionComponent< /> ); }; - -export default SkeletonLoader; diff --git a/packages/web/components/navbar-osmo-price.tsx b/packages/web/components/navbar-osmo-price.tsx index 02211503ac..19e3cc7751 100644 --- a/packages/web/components/navbar-osmo-price.tsx +++ b/packages/web/components/navbar-osmo-price.tsx @@ -7,7 +7,7 @@ import { FunctionComponent } from "react"; import { CoinsIcon } from "~/components/assets/coins-icon"; import { CreditCardIcon } from "~/components/assets/credit-card-icon"; import { Sparkline } from "~/components/chart/sparkline"; -import SkeletonLoader from "~/components/loaders/skeleton-loader"; +import { SkeletonLoader } from "~/components/loaders/skeleton-loader"; import { Button } from "~/components/ui/button"; import { AssetLists } from "~/config/generated/asset-lists"; import { useFeatureFlags, useTranslation } from "~/hooks"; diff --git a/packages/web/components/navbar/index.tsx b/packages/web/components/navbar/index.tsx index f1d79cee7e..9c25f18f32 100644 --- a/packages/web/components/navbar/index.tsx +++ b/packages/web/components/navbar/index.tsx @@ -25,7 +25,7 @@ import { useLocalStorage } from "react-use"; import { Icon } from "~/components/assets"; import { IconButton } from "~/components/buttons/icon-button"; import { ClientOnly } from "~/components/client-only"; -import SkeletonLoader from "~/components/loaders/skeleton-loader"; +import { SkeletonLoader } from "~/components/loaders/skeleton-loader"; import { MainLayoutMenu, MainMenu } from "~/components/main-menu"; import { CustomClasses } from "~/components/types"; import { Button } from "~/components/ui/button"; diff --git a/packages/web/components/one-click-trading/one-click-trading-settings.tsx b/packages/web/components/one-click-trading/one-click-trading-settings.tsx index e7204b43da..24cb28aa98 100644 --- a/packages/web/components/one-click-trading/one-click-trading-settings.tsx +++ b/packages/web/components/one-click-trading/one-click-trading-settings.tsx @@ -14,7 +14,7 @@ import React, { import { Icon } from "~/components/assets"; import { Spinner } from "~/components/loaders"; -import SkeletonLoader from "~/components/loaders/skeleton-loader"; +import { SkeletonLoader } from "~/components/loaders/skeleton-loader"; import { NetworkFeeLimitScreen } from "~/components/one-click-trading/screens/network-fee-limit-screen"; import { getResetPeriodTranslationKey, diff --git a/packages/web/components/one-click-trading/screens/network-fee-limit-screen.tsx b/packages/web/components/one-click-trading/screens/network-fee-limit-screen.tsx index 7d6fcac9fb..4e4772452e 100644 --- a/packages/web/components/one-click-trading/screens/network-fee-limit-screen.tsx +++ b/packages/web/components/one-click-trading/screens/network-fee-limit-screen.tsx @@ -5,7 +5,7 @@ import { useState } from "react"; import { Button } from "~/components/buttons"; import { InputBox } from "~/components/input"; -import SkeletonLoader from "~/components/loaders/skeleton-loader"; +import { SkeletonLoader } from "~/components/loaders/skeleton-loader"; import { OneClickTradingBaseScreenProps } from "~/components/one-click-trading/screens/types"; import { ScreenGoBackButton } from "~/components/screen-manager"; import { useTranslation } from "~/hooks"; diff --git a/packages/web/components/one-click-trading/screens/spend-limit-screen.tsx b/packages/web/components/one-click-trading/screens/spend-limit-screen.tsx index 32b46bf799..fe076e9b68 100644 --- a/packages/web/components/one-click-trading/screens/spend-limit-screen.tsx +++ b/packages/web/components/one-click-trading/screens/spend-limit-screen.tsx @@ -6,7 +6,7 @@ import { useState } from "react"; import { MenuToggle } from "~/components/control"; import { InputBox } from "~/components/input"; -import SkeletonLoader from "~/components/loaders/skeleton-loader"; +import { SkeletonLoader } from "~/components/loaders/skeleton-loader"; import { OneClickTradingBaseScreenProps } from "~/components/one-click-trading/screens/types"; import { Screen, diff --git a/packages/web/components/swap-tool/index.tsx b/packages/web/components/swap-tool/index.tsx index d1d8aadef1..02f8a60e33 100644 --- a/packages/web/components/swap-tool/index.tsx +++ b/packages/web/components/swap-tool/index.tsx @@ -21,7 +21,7 @@ import { Icon } from "~/components/assets"; import { IconButton } from "~/components/buttons/icon-button"; import { TokenSelectWithDrawer } from "~/components/control/token-select-with-drawer"; import { InputBox } from "~/components/input"; -import SkeletonLoader from "~/components/loaders/skeleton-loader"; +import { SkeletonLoader } from "~/components/loaders/skeleton-loader"; import { tError } from "~/components/localization"; import { Popover } from "~/components/popover"; import { SplitRoute } from "~/components/swap-tool/split-route"; diff --git a/packages/web/components/your-balance/your-balance.tsx b/packages/web/components/your-balance/your-balance.tsx index 0c21662a7a..571eb71704 100644 --- a/packages/web/components/your-balance/your-balance.tsx +++ b/packages/web/components/your-balance/your-balance.tsx @@ -14,7 +14,7 @@ import { ReactElement, useMemo } from "react"; import { Icon } from "~/components/assets"; import { CreditCardIcon } from "~/components/assets/credit-card-icon"; -import SkeletonLoader from "~/components/loaders/skeleton-loader"; +import { SkeletonLoader } from "~/components/loaders/skeleton-loader"; import { Button } from "~/components/ui/button"; import { EventName } from "~/config"; import { ChainList } from "~/config/generated/chain-list"; diff --git a/packages/web/integrations/nomic/transfer.tsx b/packages/web/integrations/nomic/transfer.tsx index 1490c83387..8d14c291af 100644 --- a/packages/web/integrations/nomic/transfer.tsx +++ b/packages/web/integrations/nomic/transfer.tsx @@ -16,7 +16,7 @@ import { displayToast, ToastType } from "~/components/alert"; import { GradientView } from "~/components/assets/gradient-view"; import { BridgeFromToNetwork } from "~/components/complex/bridge-from-to-network"; import { InputBox } from "~/components/input"; -import SkeletonLoader from "~/components/loaders/skeleton-loader"; +import { SkeletonLoader } from "~/components/loaders/skeleton-loader"; import { Button } from "~/components/ui/button"; import { IS_TESTNET } from "~/config"; import { useAmountConfig, useFakeFeeConfig } from "~/hooks"; diff --git a/packages/web/modals/remove-concentrated-liquidity.tsx b/packages/web/modals/remove-concentrated-liquidity.tsx index dc0cccfa17..d488b32e95 100644 --- a/packages/web/modals/remove-concentrated-liquidity.tsx +++ b/packages/web/modals/remove-concentrated-liquidity.tsx @@ -11,7 +11,7 @@ import Image from "next/image"; import React, { FunctionComponent, ReactNode } from "react"; import { MyPositionStatus } from "~/components/cards/my-position/status"; -import SkeletonLoader from "~/components/loaders/skeleton-loader"; +import { SkeletonLoader } from "~/components/loaders/skeleton-loader"; import { tError } from "~/components/localization"; import { Slider } from "~/components/ui/slider"; import { useTranslation } from "~/hooks"; diff --git a/packages/web/modals/wallet-select/qr-code-view.tsx b/packages/web/modals/wallet-select/qr-code-view.tsx index f8be29bb1d..c9e2815521 100644 --- a/packages/web/modals/wallet-select/qr-code-view.tsx +++ b/packages/web/modals/wallet-select/qr-code-view.tsx @@ -4,7 +4,7 @@ import classNames from "classnames"; import Image from "next/image"; import React, { Fragment, FunctionComponent, Suspense, useMemo } from "react"; -import SkeletonLoader from "~/components/loaders/skeleton-loader"; +import { SkeletonLoader } from "~/components/loaders/skeleton-loader"; import { Button } from "~/components/ui/button"; import { useTranslation } from "~/hooks"; From 9e6974a54235f0df975ffccdf64735fc693ba071 Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:44:31 -0500 Subject: [PATCH 32/39] get --- packages/web/hooks/data/data-sorter.ts | 2 +- packages/web/hooks/data/utils.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/web/hooks/data/data-sorter.ts b/packages/web/hooks/data/data-sorter.ts index 0f2112cb59..e03ada1849 100644 --- a/packages/web/hooks/data/data-sorter.ts +++ b/packages/web/hooks/data/data-sorter.ts @@ -1,7 +1,7 @@ import { Dec } from "@keplr-wallet/unit"; import { DataProcessor } from "~/hooks/data/types"; -import get from "~/hooks/data/utils"; +import { get } from "~/hooks/data/utils"; export type SortingData = string | Dec | { toDec(): Dec } | undefined; diff --git a/packages/web/hooks/data/utils.ts b/packages/web/hooks/data/utils.ts index 7a788c271c..24b36e4d11 100644 --- a/packages/web/hooks/data/utils.ts +++ b/packages/web/hooks/data/utils.ts @@ -1,7 +1,7 @@ import { isArray, isDefined, isString } from "~/hooks/data/types"; // adapted from https://github.com/krisk/Fuse/tree/master/src/helpers -export default function get(obj: any, path: any) { +export function get(obj: any, path: any) { const list: any[] = []; let arr = false; From 002cb5c9fb1da207e8684db01903ef10c50bd4b1 Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:47:58 -0500 Subject: [PATCH 33/39] SEO --- packages/web/.eslintrc.json | 4 ++-- packages/web/next-seo.config.tsx | 4 +--- packages/web/pages/_app.tsx | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/web/.eslintrc.json b/packages/web/.eslintrc.json index cc322aefb8..64943dc141 100644 --- a/packages/web/.eslintrc.json +++ b/packages/web/.eslintrc.json @@ -30,9 +30,9 @@ // see https://stackoverflow.com/questions/44378395/how-to-configure-eslint-so-that-it-disallows-default-exports }, "overrides": [ - // Pages router + // Pages router, config files { - "files": ["pages/**/*"], + "files": ["pages/**/*", "playwright.config.ts"], "rules": { "import/no-default-export": "off" } diff --git a/packages/web/next-seo.config.tsx b/packages/web/next-seo.config.tsx index 6769d5d118..33c1ac4ec0 100644 --- a/packages/web/next-seo.config.tsx +++ b/packages/web/next-seo.config.tsx @@ -12,7 +12,7 @@ const SEO_VALUES = { FAVICON: "/favicon.ico", }; -const SEO: React.FC = () => { +export const SEO: React.FC = () => { const { t } = useTranslation(); const [shortcutIcon, setShortcutIcon] = useState(""); @@ -70,5 +70,3 @@ const SEO: React.FC = () => { return ; }; - -export default SEO; diff --git a/packages/web/pages/_app.tsx b/packages/web/pages/_app.tsx index 3b9eec1248..e6b51be27e 100644 --- a/packages/web/pages/_app.tsx +++ b/packages/web/pages/_app.tsx @@ -44,7 +44,7 @@ import { useNewApps } from "~/hooks/use-new-apps"; import { WalletSelectProvider } from "~/hooks/use-wallet-select"; import { ExternalLinkModal, handleExternalLink } from "~/modals"; import { OneClickTradingIntroModal } from "~/modals/one-click-trading-intro-modal"; -import DefaultSeo from "~/next-seo.config"; +import { SEO } from "~/next-seo.config"; import { api } from "~/utils/trpc"; // Note: for some reason, the above two icons were displaying black backgrounds when using sprite SVG. @@ -78,7 +78,7 @@ function MyApp({ Component, pageProps }: AppProps) { - + Date: Tue, 4 Jun 2024 17:49:07 -0500 Subject: [PATCH 34/39] dayjs --- .../src/queries/complex/assets/__tests__/categories.spec.ts | 2 +- packages/server/src/queries/complex/assets/categories.ts | 2 +- packages/server/src/queries/complex/assets/price/historical.ts | 2 +- packages/server/src/queries/complex/earn/strategies.ts | 2 +- packages/server/src/queries/complex/osmosis/lockup.ts | 2 +- packages/server/src/queries/complex/pools/bonding.ts | 2 +- packages/server/src/utils/dayjs.ts | 3 +-- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/server/src/queries/complex/assets/__tests__/categories.spec.ts b/packages/server/src/queries/complex/assets/__tests__/categories.spec.ts index f5f6c6687f..253d1bba23 100644 --- a/packages/server/src/queries/complex/assets/__tests__/categories.spec.ts +++ b/packages/server/src/queries/complex/assets/__tests__/categories.spec.ts @@ -1,4 +1,4 @@ -import dayjs from "../../../../utils/dayjs"; +import { dayjs } from "../../../../utils/dayjs"; import { AssetLists } from "../../../__tests__/mock-asset-lists"; import { isAssetInCategories } from "../categories"; diff --git a/packages/server/src/queries/complex/assets/categories.ts b/packages/server/src/queries/complex/assets/categories.ts index 292e104a58..c835053172 100644 --- a/packages/server/src/queries/complex/assets/categories.ts +++ b/packages/server/src/queries/complex/assets/categories.ts @@ -3,7 +3,7 @@ import cachified, { CacheEntry } from "cachified"; import { LRUCache } from "lru-cache"; import { DEFAULT_LRU_OPTIONS } from "../../../utils"; -import dayjs from "../../../utils/dayjs"; +import { dayjs } from "../../../utils/dayjs"; import { queryUpcomingAssets } from "../../github"; /** Filters an asset for whether it is included in the given list of categories. */ diff --git a/packages/server/src/queries/complex/assets/price/historical.ts b/packages/server/src/queries/complex/assets/price/historical.ts index f96ee6a9e0..a297cc47a2 100644 --- a/packages/server/src/queries/complex/assets/price/historical.ts +++ b/packages/server/src/queries/complex/assets/price/historical.ts @@ -2,7 +2,7 @@ import cachified, { CacheEntry } from "cachified"; import { LRUCache } from "lru-cache"; import { DEFAULT_LRU_OPTIONS } from "../../../../utils/cache"; -import dayjs from "../../../../utils/dayjs"; +import { dayjs } from "../../../../utils/dayjs"; import { queryMarketChart } from "../../../coingecko"; import { queryTokenHistoricalChart, diff --git a/packages/server/src/queries/complex/earn/strategies.ts b/packages/server/src/queries/complex/earn/strategies.ts index 0c130b1e83..016f1e7b32 100644 --- a/packages/server/src/queries/complex/earn/strategies.ts +++ b/packages/server/src/queries/complex/earn/strategies.ts @@ -17,7 +17,7 @@ import { } from "../../../queries/data-services/earn"; import { queryOsmosisCMS } from "../../../queries/github"; import { DEFAULT_LRU_OPTIONS } from "../../../utils/cache"; -import dayjs from "../../../utils/dayjs"; +import { dayjs } from "../../../utils/dayjs"; import { captureIfError } from "../../../utils/error"; import { type Asset, getAsset } from "../assets"; import { DEFAULT_VS_CURRENCY } from "../assets/config"; diff --git a/packages/server/src/queries/complex/osmosis/lockup.ts b/packages/server/src/queries/complex/osmosis/lockup.ts index 0917d24233..788ae9738c 100644 --- a/packages/server/src/queries/complex/osmosis/lockup.ts +++ b/packages/server/src/queries/complex/osmosis/lockup.ts @@ -1,7 +1,7 @@ import { Chain } from "@osmosis-labs/types"; import { Duration } from "dayjs/plugin/duration"; -import dayjs from "../../../utils/dayjs"; +import { dayjs } from "../../../utils/dayjs"; import { queryAccountLockedLongerDuration } from "../../osmosis/lockup"; export type UserLock = { diff --git a/packages/server/src/queries/complex/pools/bonding.ts b/packages/server/src/queries/complex/pools/bonding.ts index 0daf655eee..9ad52a6e6e 100644 --- a/packages/server/src/queries/complex/pools/bonding.ts +++ b/packages/server/src/queries/complex/pools/bonding.ts @@ -2,7 +2,7 @@ import { CoinPretty, PricePretty, RatePretty } from "@keplr-wallet/unit"; import { AssetList, Chain } from "@osmosis-labs/types"; import type { Duration } from "dayjs/plugin/duration"; -import dayjs from "../../../utils/dayjs"; +import { dayjs } from "../../../utils/dayjs"; import { captureErrorAndReturn } from "../../../utils/error"; import { querySyntheticLockupsByLockId } from "../../osmosis/lockup"; import { diff --git a/packages/server/src/utils/dayjs.ts b/packages/server/src/utils/dayjs.ts index 0ccaba912d..62caf9abdb 100644 --- a/packages/server/src/utils/dayjs.ts +++ b/packages/server/src/utils/dayjs.ts @@ -5,5 +5,4 @@ import duration from "dayjs/plugin/duration"; dayjs.extend(duration); -// eslint-disable-next-line import/no-default-export -export default dayjs; +export { dayjs }; From a50fbc5a288becff8b8112dafe6c003ca1e83121 Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Tue, 4 Jun 2024 17:57:59 -0500 Subject: [PATCH 35/39] Cleanup 1 --- packages/web/components/complex/portfolio-page.tsx | 2 +- .../__tests__/navbar-osmosis-update.spec.tsx | 2 +- packages/web/components/overview/pools.tsx | 2 +- packages/web/components/pool-detail/concentrated.tsx | 2 +- packages/web/components/pool-detail/share.tsx | 2 +- packages/web/pages/components.tsx | 2 +- packages/web/pages/earn/index.tsx | 2 +- packages/web/pages/pool/[id].tsx | 2 +- packages/web/pages/stake.tsx | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/web/components/complex/portfolio-page.tsx b/packages/web/components/complex/portfolio-page.tsx index 2f0440a8bb..c31b262c4e 100644 --- a/packages/web/components/complex/portfolio-page.tsx +++ b/packages/web/components/complex/portfolio-page.tsx @@ -20,7 +20,7 @@ import { api } from "~/utils/trpc"; import { CreditCardIcon } from "../assets/credit-card-icon"; import { Spinner } from "../loaders"; -import SkeletonLoader from "../loaders/skeleton-loader"; +import { SkeletonLoader } from "../loaders/skeleton-loader"; import { RecentTransfers } from "../transactions/recent-transfers"; import { CustomClasses } from "../types"; import { Button } from "../ui/button"; diff --git a/packages/web/components/navbar-osmosis-update/__tests__/navbar-osmosis-update.spec.tsx b/packages/web/components/navbar-osmosis-update/__tests__/navbar-osmosis-update.spec.tsx index 61713dbffb..01f490be9f 100644 --- a/packages/web/components/navbar-osmosis-update/__tests__/navbar-osmosis-update.spec.tsx +++ b/packages/web/components/navbar-osmosis-update/__tests__/navbar-osmosis-update.spec.tsx @@ -7,7 +7,7 @@ import { rest } from "msw"; import { server } from "~/__tests__/msw"; import { mockFeatureFlags, renderWithProviders } from "~/__tests__/test-utils"; -import NavbarOsmosisUpdate from "~/components/navbar-osmosis-update"; +import { NavbarOsmosisUpdate } from "~/components/navbar-osmosis-update"; beforeEach(() => { resetLDMocks(); diff --git a/packages/web/components/overview/pools.tsx b/packages/web/components/overview/pools.tsx index a45027cebb..a894b40ab3 100644 --- a/packages/web/components/overview/pools.tsx +++ b/packages/web/components/overview/pools.tsx @@ -11,7 +11,7 @@ import { useWindowSize } from "~/hooks"; import { useStore } from "~/stores"; import { api } from "~/utils/trpc"; -import SkeletonLoader from "../loaders/skeleton-loader"; +import { SkeletonLoader } from "../loaders/skeleton-loader"; const REWARD_EPOCH_IDENTIFIER = "day"; diff --git a/packages/web/components/pool-detail/concentrated.tsx b/packages/web/components/pool-detail/concentrated.tsx index 21737b9221..270b484bb9 100644 --- a/packages/web/components/pool-detail/concentrated.tsx +++ b/packages/web/components/pool-detail/concentrated.tsx @@ -32,7 +32,7 @@ import { api } from "~/utils/trpc"; import { removeQueryParam } from "~/utils/url"; import { AprBreakdownLegacy } from "../cards/apr-breakdown"; -import SkeletonLoader from "../loaders/skeleton-loader"; +import { SkeletonLoader } from "../loaders/skeleton-loader"; const ConcentratedLiquidityDepthChart = dynamic( () => diff --git a/packages/web/components/pool-detail/share.tsx b/packages/web/components/pool-detail/share.tsx index 045772dd3d..2468e30b81 100644 --- a/packages/web/components/pool-detail/share.tsx +++ b/packages/web/components/pool-detail/share.tsx @@ -41,7 +41,7 @@ import { formatPretty } from "~/utils/formatter"; import { api } from "~/utils/trpc"; import { Spinner } from "../loaders"; -import SkeletonLoader from "../loaders/skeleton-loader"; +import { SkeletonLoader } from "../loaders/skeleton-loader"; const E = EventName.PoolDetail; diff --git a/packages/web/pages/components.tsx b/packages/web/pages/components.tsx index 976d9aa448..f9411d11b3 100644 --- a/packages/web/pages/components.tsx +++ b/packages/web/pages/components.tsx @@ -36,7 +36,7 @@ import { FilterProvider } from "~/components/earn/filters/filter-context"; import { FilterContext } from "~/components/earn/filters/filter-context"; import { InputBox, SearchBox } from "~/components/input"; import { MetricLoader } from "~/components/loaders"; -import SkeletonLoader from "~/components/loaders/skeleton-loader"; +import { SkeletonLoader } from "~/components/loaders/skeleton-loader"; import { Spinner } from "~/components/loaders/spinner"; import { RadioWithOptions } from "~/components/radio-with-options"; import { Step, Stepper } from "~/components/stepper"; diff --git a/packages/web/pages/earn/index.tsx b/packages/web/pages/earn/index.tsx index d03c2dbbad..06164085c8 100644 --- a/packages/web/pages/earn/index.tsx +++ b/packages/web/pages/earn/index.tsx @@ -21,7 +21,7 @@ import { TabPanels, Tabs, } from "~/components/earn/tabs"; -import SkeletonLoader from "~/components/loaders/skeleton-loader"; +import { SkeletonLoader } from "~/components/loaders/skeleton-loader"; import { EventName } from "~/config"; import { useAmplitudeAnalytics, diff --git a/packages/web/pages/pool/[id].tsx b/packages/web/pages/pool/[id].tsx index f2e5482f89..8de838c8f1 100644 --- a/packages/web/pages/pool/[id].tsx +++ b/packages/web/pages/pool/[id].tsx @@ -3,7 +3,7 @@ import { useRouter } from "next/router"; import { NextSeo } from "next-seo"; import { FunctionComponent, useEffect, useState } from "react"; -import SkeletonLoader from "~/components/loaders/skeleton-loader"; +import { SkeletonLoader } from "~/components/loaders/skeleton-loader"; import { BasePoolDetails, ConcentratedLiquidityPool, diff --git a/packages/web/pages/stake.tsx b/packages/web/pages/stake.tsx index 5d1cb37129..077cef8e5c 100644 --- a/packages/web/pages/stake.tsx +++ b/packages/web/pages/stake.tsx @@ -9,7 +9,7 @@ import { AlertBanner } from "~/components/alert-banner"; import { StakeDashboard } from "~/components/cards/stake-dashboard"; import { StakeLearnMore } from "~/components/cards/stake-learn-more"; import { StakeTool } from "~/components/cards/stake-tool"; -import SkeletonLoader from "~/components/loaders/skeleton-loader"; +import { SkeletonLoader } from "~/components/loaders/skeleton-loader"; import { Spinner } from "~/components/loaders/spinner"; import { UnbondingInProgress } from "~/components/stake/unbonding-in-progress"; import { StakeOrUnstake } from "~/components/types"; From d1f4f29422475d8e53b2af439a1bcf1b30468f0d Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Thu, 6 Jun 2024 10:20:11 -0500 Subject: [PATCH 36/39] Fix QR code import --- packages/web/pages/components.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web/pages/components.tsx b/packages/web/pages/components.tsx index f9411d11b3..608568baf1 100644 --- a/packages/web/pages/components.tsx +++ b/packages/web/pages/components.tsx @@ -1011,7 +1011,7 @@ const InputsShadcn = () => { ); }; -import QRCode from "~/components/qrcode"; +import { QRCode } from "~/components/qrcode"; const QRCodes = () => ( From 5b0758a73fbdc6ba1bfd52cd2ebb44a16c55e76a Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Thu, 6 Jun 2024 10:25:35 -0500 Subject: [PATCH 37/39] Clean up component name to match file --- packages/web/components/layouts/main.tsx | 4 ++-- .../navbar-osmosis-update/navbar-osmosis-update.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/web/components/layouts/main.tsx b/packages/web/components/layouts/main.tsx index b4ef5471de..d614c496be 100644 --- a/packages/web/components/layouts/main.tsx +++ b/packages/web/components/layouts/main.tsx @@ -7,7 +7,7 @@ import { IconButton } from "~/components/buttons/icon-button"; import { MainLayoutMenu, MainMenu } from "~/components/main-menu"; import { NavBar } from "~/components/navbar"; import { NavbarOsmoPrice } from "~/components/navbar-osmo-price"; -import { NavbarOsmosisUpdates } from "~/components/navbar-osmosis-update"; +import { NavbarOsmosisUpdate } from "~/components/navbar-osmosis-update"; import { useCurrentLanguage, useWindowSize } from "~/hooks"; export const MainLayout = observer( @@ -53,7 +53,7 @@ export const MainLayout = observer( />
- +
diff --git a/packages/web/components/navbar-osmosis-update/navbar-osmosis-update.tsx b/packages/web/components/navbar-osmosis-update/navbar-osmosis-update.tsx index cd798ddfcb..dc8daa549b 100644 --- a/packages/web/components/navbar-osmosis-update/navbar-osmosis-update.tsx +++ b/packages/web/components/navbar-osmosis-update/navbar-osmosis-update.tsx @@ -12,7 +12,7 @@ import { useDisclosure } from "~/hooks/use-disclosure"; import { useLocalStorageState } from "~/hooks/window/use-localstorage-state"; import { ModalBase } from "~/modals/base"; -export const NavbarOsmosisUpdates = () => { +export const NavbarOsmosisUpdate = () => { const { t } = useTranslation(); const { isOpen, onClose, onOpen } = useDisclosure(); const featureFlags = useFeatureFlags(); From a4929dad537cb67b4d7e093f43b8c1db1bdd2eb9 Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Thu, 6 Jun 2024 10:31:30 -0500 Subject: [PATCH 38/39] Remove t value --- packages/web/localizations/de.json | 1 - packages/web/localizations/en.json | 1 - packages/web/localizations/es.json | 1 - packages/web/localizations/fa.json | 1 - packages/web/localizations/fr.json | 1 - packages/web/localizations/gu.json | 1 - packages/web/localizations/hi.json | 1 - packages/web/localizations/ja.json | 1 - packages/web/localizations/ko.json | 1 - packages/web/localizations/pl.json | 1 - packages/web/localizations/pt-br.json | 1 - packages/web/localizations/ro.json | 1 - packages/web/localizations/ru.json | 1 - packages/web/localizations/tr.json | 1 - packages/web/localizations/zh-cn.json | 1 - 15 files changed, 15 deletions(-) diff --git a/packages/web/localizations/de.json b/packages/web/localizations/de.json index 394d206f17..9dbbe62710 100644 --- a/packages/web/localizations/de.json +++ b/packages/web/localizations/de.json @@ -995,7 +995,6 @@ "positions": "Positionen", "strategiesCount": "{number} Strategien", "oneStrategy": "1 Strategie", - "value": "Wert", "discoverStrategies": "Entdecken Sie Strategien", "myStrategies": "Ihre Strategien", "strategyPlatform": "Strategie", diff --git a/packages/web/localizations/en.json b/packages/web/localizations/en.json index 97135fd452..3ba1a7cf1f 100644 --- a/packages/web/localizations/en.json +++ b/packages/web/localizations/en.json @@ -995,7 +995,6 @@ "positions": "Positions", "strategiesCount": "{number} strategies", "oneStrategy": "1 strategy", - "value": "Value", "discoverStrategies": "Discover Strategies", "myStrategies": "Your Strategies", "strategyPlatform": "Strategy", diff --git a/packages/web/localizations/es.json b/packages/web/localizations/es.json index a3efd692c2..1a2325e194 100644 --- a/packages/web/localizations/es.json +++ b/packages/web/localizations/es.json @@ -995,7 +995,6 @@ "positions": "Posiciones", "strategiesCount": "{number} estrategias", "oneStrategy": "1 estrategia", - "value": "Valor", "discoverStrategies": "Descubra estrategias", "myStrategies": "Tus estrategias", "strategyPlatform": "Estrategia", diff --git a/packages/web/localizations/fa.json b/packages/web/localizations/fa.json index fc1e61d85a..a852c4c7f9 100644 --- a/packages/web/localizations/fa.json +++ b/packages/web/localizations/fa.json @@ -995,7 +995,6 @@ "positions": "موقعیت ها", "strategiesCount": "استراتژی های {number}", "oneStrategy": "1 استراتژی", - "value": "ارزش", "discoverStrategies": "استراتژی ها را کشف کنید", "myStrategies": "استراتژی های شما", "strategyPlatform": "استراتژی", diff --git a/packages/web/localizations/fr.json b/packages/web/localizations/fr.json index 21213ee8e2..78310e7724 100644 --- a/packages/web/localizations/fr.json +++ b/packages/web/localizations/fr.json @@ -995,7 +995,6 @@ "positions": "Postes", "strategiesCount": "Stratégies {number}", "oneStrategy": "1 stratégie", - "value": "Valeur", "discoverStrategies": "Découvrez les stratégies", "myStrategies": "Vos stratégies", "strategyPlatform": "Stratégie", diff --git a/packages/web/localizations/gu.json b/packages/web/localizations/gu.json index 91d2b316f3..01c2a0769a 100644 --- a/packages/web/localizations/gu.json +++ b/packages/web/localizations/gu.json @@ -995,7 +995,6 @@ "positions": "હોદ્દાઓ", "strategiesCount": "{number} વ્યૂહરચના", "oneStrategy": "1 વ્યૂહરચના", - "value": "મૂલ્ય", "discoverStrategies": "વ્યૂહરચના શોધો", "myStrategies": "તમારી વ્યૂહરચનાઓ", "strategyPlatform": "વ્યૂહરચના", diff --git a/packages/web/localizations/hi.json b/packages/web/localizations/hi.json index 85ddf1c141..dcaa5b7440 100644 --- a/packages/web/localizations/hi.json +++ b/packages/web/localizations/hi.json @@ -995,7 +995,6 @@ "positions": "स्थितियां", "strategiesCount": "{number} रणनीतियाँ", "oneStrategy": "1 रणनीति", - "value": "कीमत", "discoverStrategies": "रणनीतियों की खोज करें", "myStrategies": "आपकी रणनीतियाँ", "strategyPlatform": "रणनीति", diff --git a/packages/web/localizations/ja.json b/packages/web/localizations/ja.json index 3603efd0b9..1c53735922 100644 --- a/packages/web/localizations/ja.json +++ b/packages/web/localizations/ja.json @@ -995,7 +995,6 @@ "positions": "ポジション", "strategiesCount": "{number}戦略", "oneStrategy": "1つの戦略", - "value": "価値", "discoverStrategies": "戦略を発見する", "myStrategies": "あなたの戦略", "strategyPlatform": "戦略", diff --git a/packages/web/localizations/ko.json b/packages/web/localizations/ko.json index 1838d008b2..b5011ac789 100644 --- a/packages/web/localizations/ko.json +++ b/packages/web/localizations/ko.json @@ -995,7 +995,6 @@ "positions": "직위", "strategiesCount": "{number} 전략", "oneStrategy": "전략 1개", - "value": "값", "discoverStrategies": "전략 발견", "myStrategies": "귀하의 전략", "strategyPlatform": "전략", diff --git a/packages/web/localizations/pl.json b/packages/web/localizations/pl.json index ec35fb1bb0..6dbab55e71 100644 --- a/packages/web/localizations/pl.json +++ b/packages/web/localizations/pl.json @@ -995,7 +995,6 @@ "positions": "Pozycje", "strategiesCount": "Strategie {number}", "oneStrategy": "1 strategia", - "value": "Wartość", "discoverStrategies": "Odkryj strategie", "myStrategies": "Twoje strategie", "strategyPlatform": "Strategia", diff --git a/packages/web/localizations/pt-br.json b/packages/web/localizations/pt-br.json index 9e617f661c..347e0e3ecc 100644 --- a/packages/web/localizations/pt-br.json +++ b/packages/web/localizations/pt-br.json @@ -995,7 +995,6 @@ "positions": "Posições", "strategiesCount": "{number} estratégias", "oneStrategy": "1 estratégia", - "value": "Valor", "discoverStrategies": "Descubra estratégias", "myStrategies": "Suas estratégias", "strategyPlatform": "Estratégia", diff --git a/packages/web/localizations/ro.json b/packages/web/localizations/ro.json index 0caaf722db..114f0db193 100644 --- a/packages/web/localizations/ro.json +++ b/packages/web/localizations/ro.json @@ -995,7 +995,6 @@ "positions": "Poziții", "strategiesCount": "{number} strategii", "oneStrategy": "1 strategie", - "value": "Valoare", "discoverStrategies": "Descoperiți strategii", "myStrategies": "Strategiile tale", "strategyPlatform": "Strategie", diff --git a/packages/web/localizations/ru.json b/packages/web/localizations/ru.json index 6f64a071c1..483fc5021c 100644 --- a/packages/web/localizations/ru.json +++ b/packages/web/localizations/ru.json @@ -995,7 +995,6 @@ "positions": "Позиции", "strategiesCount": "{number} стратегии", "oneStrategy": "1 стратегия", - "value": "Ценить", "discoverStrategies": "Откройте для себя стратегии", "myStrategies": "Ваши стратегии", "strategyPlatform": "Стратегия", diff --git a/packages/web/localizations/tr.json b/packages/web/localizations/tr.json index 70c9888030..18b628e3f7 100644 --- a/packages/web/localizations/tr.json +++ b/packages/web/localizations/tr.json @@ -995,7 +995,6 @@ "positions": "Pozisyonlar", "strategiesCount": "{number} stratejiler", "oneStrategy": "1 strateji", - "value": "Değer", "discoverStrategies": "Stratejileri Keşfedin", "myStrategies": "Stratejileriniz", "strategyPlatform": "Strateji", diff --git a/packages/web/localizations/zh-cn.json b/packages/web/localizations/zh-cn.json index f6b07c34a8..a03b59da63 100644 --- a/packages/web/localizations/zh-cn.json +++ b/packages/web/localizations/zh-cn.json @@ -995,7 +995,6 @@ "positions": "职位", "strategiesCount": "{number}策略", "oneStrategy": "1 个策略", - "value": "价值", "discoverStrategies": "发现策略", "myStrategies": "你的策略", "strategyPlatform": "战略", From b700ad29c5faaedb96cfe9a279c6eca893b29c16 Mon Sep 17 00:00:00 2001 From: Matt Upham <30577966+mattupham@users.noreply.github.com> Date: Thu, 6 Jun 2024 10:32:13 -0500 Subject: [PATCH 39/39] Update remove value --- packages/web/localizations/zh-hk.json | 1 - packages/web/localizations/zh-tw.json | 1 - 2 files changed, 2 deletions(-) diff --git a/packages/web/localizations/zh-hk.json b/packages/web/localizations/zh-hk.json index 9cfe26dc7a..91acff5496 100644 --- a/packages/web/localizations/zh-hk.json +++ b/packages/web/localizations/zh-hk.json @@ -995,7 +995,6 @@ "positions": "職位", "strategiesCount": "{number}策略", "oneStrategy": "1 策略", - "value": "價值", "discoverStrategies": "發現策略", "myStrategies": "你的策略", "strategyPlatform": "策略", diff --git a/packages/web/localizations/zh-tw.json b/packages/web/localizations/zh-tw.json index ce95ec3ff9..8a9afb689f 100644 --- a/packages/web/localizations/zh-tw.json +++ b/packages/web/localizations/zh-tw.json @@ -995,7 +995,6 @@ "positions": "職位", "strategiesCount": "{number}策略", "oneStrategy": "1 策略", - "value": "價值", "discoverStrategies": "發現策略", "myStrategies": "你的策略", "strategyPlatform": "策略",