Skip to content

Commit

Permalink
Switch UI to new pkg
Browse files Browse the repository at this point in the history
  • Loading branch information
ryangoree committed Nov 8, 2024
1 parent 47f4107 commit a26ede8
Show file tree
Hide file tree
Showing 46 changed files with 46 additions and 52 deletions.
2 changes: 1 addition & 1 deletion apps/hyperdrive-trading/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@delvtech/drift-viem": "^0.0.1-beta.13",
"@delvtech/fixed-point-wasm": "^0.0.6",
"@delvtech/hyperdrive-appconfig": "^0.0.1",
"@delvtech/hyperdrive-js-core": "^3.0.6",
"@delvtech/hyperdrive-js": "^0.0.0",
"@headlessui/react": "^2.1.5",
"@heroicons/react": "^2.0.16",
"@radix-ui/react-tooltip": "^1.1.2",
Expand Down
2 changes: 1 addition & 1 deletion apps/hyperdrive-trading/src/hyperdrive/getLpApy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
HyperdriveConfig,
rewardFunctions,
} from "@delvtech/hyperdrive-appconfig";
import { ReadHyperdrive } from "@delvtech/hyperdrive-js-core";
import { ReadHyperdrive } from "@delvtech/hyperdrive-js";
import { getPublicClient } from "@wagmi/core";
import { convertMillisecondsToDays } from "src/base/convertMillisecondsToDays";
import { isForkChain } from "src/chains/isForkChain";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
HyperdriveConfig,
rewardFunctions,
} from "@delvtech/hyperdrive-appconfig";
import { ReadHyperdrive } from "@delvtech/hyperdrive-js-core";
import { ReadHyperdrive } from "@delvtech/hyperdrive-js";
import { getPublicClient } from "@wagmi/core";
import { convertMillisecondsToDays } from "src/base/convertMillisecondsToDays";
import { isForkChain } from "src/chains/isForkChain";
Expand Down
2 changes: 1 addition & 1 deletion apps/hyperdrive-trading/src/ui/chainlog/FactoriesTable.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ReadRegistry } from "@delvtech/hyperdrive-js-core";
import { ReadRegistry } from "@delvtech/hyperdrive-js";
import { ChevronDownIcon, ChevronUpIcon } from "@heroicons/react/24/outline";
import { UseQueryResult, useQuery } from "@tanstack/react-query";
import {
Expand Down
2 changes: 1 addition & 1 deletion apps/hyperdrive-trading/src/ui/chainlog/PoolsTable.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ReadRegistry } from "@delvtech/hyperdrive-js-core";
import { ReadRegistry } from "@delvtech/hyperdrive-js";
import { ChevronDownIcon, ChevronUpIcon } from "@heroicons/react/24/outline";
import { UseQueryResult, useQuery } from "@tanstack/react-query";
import { Link } from "@tanstack/react-router";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ReadHyperdrive } from "@delvtech/hyperdrive-js-core";
import { ReadHyperdrive } from "@delvtech/hyperdrive-js";
import { QueryStatus, useQuery } from "@tanstack/react-query";
import { makeQueryKey } from "src/base/makeQueryKey";
import { useReadHyperdrive } from "src/ui/hyperdrive/hooks/useReadHyperdrive";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { PoolInfo } from "@delvtech/hyperdrive-js-core";
import { PoolInfo } from "@delvtech/hyperdrive-js";
import { useQuery } from "@tanstack/react-query";
import { makeQueryKey } from "src/base/makeQueryKey";
import { useReadHyperdrive } from "src/ui/hyperdrive/hooks/useReadHyperdrive";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
appConfig,
findHyperdriveConfig,
} from "@delvtech/hyperdrive-appconfig";
import { ReadHyperdrive } from "@delvtech/hyperdrive-js-core";
import { ReadHyperdrive } from "@delvtech/hyperdrive-js";
import { useQuery } from "@tanstack/react-query";
import { makeQueryKey } from "src/base/makeQueryKey";
import { QueryStatusWithIdle, getStatus } from "src/base/queryStatus";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
appConfig,
findHyperdriveConfig,
} from "@delvtech/hyperdrive-appconfig";
import { ReadHyperdrive } from "@delvtech/hyperdrive-js-core";
import { ReadHyperdrive } from "@delvtech/hyperdrive-js";
import { useQuery } from "@tanstack/react-query";
import { makeQueryKey } from "src/base/makeQueryKey";
import { QueryStatusWithIdle, getStatus } from "src/base/queryStatus";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
appConfig,
findHyperdriveConfig,
} from "@delvtech/hyperdrive-appconfig";
import { getHyperdrive, ReadHyperdrive } from "@delvtech/hyperdrive-js-core";
import { getHyperdrive, ReadHyperdrive } from "@delvtech/hyperdrive-js";
import { useQuery } from "@tanstack/react-query";
import { makeQueryKey } from "src/base/makeQueryKey";
import { useDrift } from "src/ui/drift/useDrift";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@ import {
appConfig,
findHyperdriveConfig,
} from "@delvtech/hyperdrive-appconfig";
import {
getHyperdrive,
ReadWriteHyperdrive,
} from "@delvtech/hyperdrive-js-core";
import { getHyperdrive, ReadWriteHyperdrive } from "@delvtech/hyperdrive-js";
import { useQuery } from "@tanstack/react-query";
import { makeQueryKey } from "src/base/makeQueryKey";
import { useReadWriteDrift } from "src/ui/drift/useDrift";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
HyperdriveConfig,
TokenConfig,
} from "@delvtech/hyperdrive-appconfig";
import { adjustAmountByPercentage, Long } from "@delvtech/hyperdrive-js-core";
import { adjustAmountByPercentage, Long } from "@delvtech/hyperdrive-js";
import { MouseEvent, ReactElement } from "react";
import { isTestnetChain } from "src/chains/isTestnetChain";
import { LoadingButton } from "src/ui/base/components/LoadingButton";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
findBaseToken,
findToken,
} from "@delvtech/hyperdrive-appconfig";
import { Long } from "@delvtech/hyperdrive-js-core";
import { Long } from "@delvtech/hyperdrive-js";
import { ReactElement } from "react";
import { Modal } from "src/ui/base/components/Modal/Modal";
import { ModalHeader } from "src/ui/base/components/Modal/ModalHeader";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
findToken,
HyperdriveConfig,
} from "@delvtech/hyperdrive-appconfig";
import { adjustAmountByPercentage } from "@delvtech/hyperdrive-js-core";
import { adjustAmountByPercentage } from "@delvtech/hyperdrive-js";
import { MouseEvent, ReactElement } from "react";
import { isTestnetChain } from "src/chains/isTestnetChain";
import { getIsValidTradeSize } from "src/hyperdrive/getIsValidTradeSize";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
findBaseToken,
HyperdriveConfig,
} from "@delvtech/hyperdrive-appconfig";
import { calculateAprFromPrice } from "@delvtech/hyperdrive-js-core";
import { calculateAprFromPrice } from "@delvtech/hyperdrive-js";
import classNames from "classnames";
import Skeleton from "react-loading-skeleton";
import { convertMillisecondsToDays } from "src/base/convertMillisecondsToDays";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
appConfig,
findBaseToken,
} from "@delvtech/hyperdrive-appconfig";
import { OpenLongPositionReceived } from "@delvtech/hyperdrive-js-core";
import { OpenLongPositionReceived } from "@delvtech/hyperdrive-js";
import { ExclamationTriangleIcon } from "@heroicons/react/20/solid";
import classNames from "classnames";
import { ReactElement } from "react";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
import {
calculateAprFromPrice,
OpenLongPositionReceived,
} from "@delvtech/hyperdrive-js-core";
} from "@delvtech/hyperdrive-js";
import { ChevronDownIcon, ChevronUpIcon } from "@heroicons/react/24/outline";
import { Link } from "@tanstack/react-router";
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
appConfig,
findHyperdriveConfig,
} from "@delvtech/hyperdrive-appconfig";
import { getHprFromApr } from "@delvtech/hyperdrive-js-core";
import { getHprFromApr } from "@delvtech/hyperdrive-js";
import { useQuery } from "@tanstack/react-query";

import { formatRate } from "src/base/formatRate";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Long, OpenLongPositionReceived } from "@delvtech/hyperdrive-js-core";
import { Long, OpenLongPositionReceived } from "@delvtech/hyperdrive-js";
import { useQuery } from "@tanstack/react-query";
import { makeQueryKey } from "src/base/makeQueryKey";
import { useReadHyperdrive } from "src/ui/hyperdrive/hooks/useReadHyperdrive";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { HyperdriveConfig } from "@delvtech/hyperdrive-appconfig";
import { ClosedLong } from "@delvtech/hyperdrive-js-core";
import { ClosedLong } from "@delvtech/hyperdrive-js";
import { useQuery } from "@tanstack/react-query";
import { makeQueryKey } from "src/base/makeQueryKey";
import { useReadHyperdrive } from "src/ui/hyperdrive/hooks/useReadHyperdrive";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { HyperdriveConfig } from "@delvtech/hyperdrive-appconfig";
import { Long } from "@delvtech/hyperdrive-js-core";
import { Long } from "@delvtech/hyperdrive-js";
import { useQuery } from "@tanstack/react-query";
import { makeQueryKey } from "src/base/makeQueryKey";
import { usePoolInfo } from "src/ui/hyperdrive/hooks/usePoolInfo";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
findBaseToken,
findToken,
} from "@delvtech/hyperdrive-appconfig";
import { adjustAmountByPercentage } from "@delvtech/hyperdrive-js-core";
import { adjustAmountByPercentage } from "@delvtech/hyperdrive-js";
import classNames from "classnames";
import { MouseEvent, ReactElement } from "react";
import Skeleton from "react-loading-skeleton";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
findBaseToken,
findToken,
} from "@delvtech/hyperdrive-appconfig";
import { adjustAmountByPercentage } from "@delvtech/hyperdrive-js-core";
import { adjustAmountByPercentage } from "@delvtech/hyperdrive-js";
import classNames from "classnames";
import { MouseEvent, ReactElement } from "react";
import Skeleton from "react-loading-skeleton";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
findToken,
HyperdriveConfig,
} from "@delvtech/hyperdrive-appconfig";
import { adjustAmountByPercentage } from "@delvtech/hyperdrive-js-core";
import { adjustAmountByPercentage } from "@delvtech/hyperdrive-js";
import { MouseEvent, ReactElement } from "react";
import Skeleton from "react-loading-skeleton";
import { calculateRatio } from "src/base/calculateRatio";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { RedeemedWithdrawalShares } from "@delvtech/hyperdrive-js-core";
import { RedeemedWithdrawalShares } from "@delvtech/hyperdrive-js";
import { QueryStatus, useQuery } from "@tanstack/react-query";
import { makeQueryKey } from "src/base/makeQueryKey";
import { useReadHyperdrive } from "src/ui/hyperdrive/hooks/useReadHyperdrive";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@ import {
findToken,
HyperdriveConfig,
} from "@delvtech/hyperdrive-appconfig";
import {
adjustAmountByPercentage,
OpenShort,
} from "@delvtech/hyperdrive-js-core";
import { adjustAmountByPercentage, OpenShort } from "@delvtech/hyperdrive-js";
import { MouseEvent, ReactElement } from "react";
import { isTestnetChain } from "src/chains/isTestnetChain";
import { LoadingButton } from "src/ui/base/components/LoadingButton";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
findBaseToken,
findToken,
} from "@delvtech/hyperdrive-appconfig";
import { OpenShort } from "@delvtech/hyperdrive-js-core";
import { OpenShort } from "@delvtech/hyperdrive-js";
import { ReactElement } from "react";
import { Modal } from "src/ui/base/components/Modal/Modal";
import { ModalHeader } from "src/ui/base/components/Modal/ModalHeader";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
appConfig,
findBaseToken,
} from "@delvtech/hyperdrive-appconfig";
import { ClosedShort } from "@delvtech/hyperdrive-js-core";
import { ClosedShort } from "@delvtech/hyperdrive-js";
import { ChevronDownIcon, ChevronUpIcon } from "@heroicons/react/16/solid";
import {
createColumnHelper,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { fixed } from "@delvtech/fixed-point-wasm";
import { adjustAmountByPercentage } from "@delvtech/hyperdrive-js-core";
import { adjustAmountByPercentage } from "@delvtech/hyperdrive-js";

import {
appConfig,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
appConfig,
findBaseToken,
} from "@delvtech/hyperdrive-appconfig";
import { OpenShort } from "@delvtech/hyperdrive-js-core";
import { OpenShort } from "@delvtech/hyperdrive-js";
import classNames from "classnames";
import { ReactElement } from "react";
import { formatBalance } from "src/ui/base/formatting/formatBalance";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
findBaseToken,
HyperdriveConfig,
} from "@delvtech/hyperdrive-appconfig";
import { OpenShort } from "@delvtech/hyperdrive-js-core";
import { OpenShort } from "@delvtech/hyperdrive-js";
import { ExclamationTriangleIcon } from "@heroicons/react/16/solid";
import classNames from "classnames";
import { ReactElement } from "react";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
appConfig,
findBaseToken,
} from "@delvtech/hyperdrive-appconfig";
import { OpenShort } from "@delvtech/hyperdrive-js-core";
import { OpenShort } from "@delvtech/hyperdrive-js";
import { ExclamationTriangleIcon } from "@heroicons/react/20/solid";
import classNames from "classnames";
import { ReactElement } from "react";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
findToken,
HyperdriveConfig,
} from "@delvtech/hyperdrive-appconfig";
import { OpenShort } from "@delvtech/hyperdrive-js-core";
import { OpenShort } from "@delvtech/hyperdrive-js";
import { ChevronDownIcon, ChevronUpIcon } from "@heroicons/react/24/outline";
import { Link } from "@tanstack/react-router";
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
findBaseToken,
HyperdriveConfig,
} from "@delvtech/hyperdrive-appconfig";
import { OpenShort } from "@delvtech/hyperdrive-js-core";
import { OpenShort } from "@delvtech/hyperdrive-js";
import classNames from "classnames";
import { ReactElement } from "react";
import { formatRate } from "src/base/formatRate";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ClosedShort } from "@delvtech/hyperdrive-js-core";
import { ClosedShort } from "@delvtech/hyperdrive-js";
import { QueryStatus, useQuery } from "@tanstack/react-query";
import { makeQueryKey } from "src/base/makeQueryKey";
import { useReadHyperdrive } from "src/ui/hyperdrive/hooks/useReadHyperdrive";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { appConfig } from "@delvtech/hyperdrive-appconfig";
import { adjustAmountByPercentage } from "@delvtech/hyperdrive-js-core";
import { adjustAmountByPercentage } from "@delvtech/hyperdrive-js";
import { useAddRecentTransaction } from "@rainbow-me/rainbowkit";
import {
MutationStatus,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { OpenShort } from "@delvtech/hyperdrive-js-core";
import { OpenShort } from "@delvtech/hyperdrive-js";
import { useQuery } from "@tanstack/react-query";
import { makeQueryKey } from "src/base/makeQueryKey";
import { useReadHyperdrive } from "src/ui/hyperdrive/hooks/useReadHyperdrive";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
appConfig,
findHyperdriveConfig,
} from "@delvtech/hyperdrive-appconfig";
import { getHprFromApr } from "@delvtech/hyperdrive-js-core";
import { getHprFromApr } from "@delvtech/hyperdrive-js";
import { useQuery } from "@tanstack/react-query";
import { formatRate } from "src/base/formatRate";
import { makeQueryKey } from "src/base/makeQueryKey";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { HyperdriveConfig } from "@delvtech/hyperdrive-appconfig";
import { ClosedShort } from "@delvtech/hyperdrive-js-core";
import { ClosedShort } from "@delvtech/hyperdrive-js";
import { useQuery } from "@tanstack/react-query";
import { makeQueryKey } from "src/base/makeQueryKey";
import { useReadHyperdrive } from "src/ui/hyperdrive/hooks/useReadHyperdrive";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { HyperdriveConfig } from "@delvtech/hyperdrive-appconfig";
import { Short } from "@delvtech/hyperdrive-js-core";
import { Short } from "@delvtech/hyperdrive-js";
import { useQuery } from "@tanstack/react-query";
import { makeQueryKey } from "src/base/makeQueryKey";
import { usePoolInfo } from "src/ui/hyperdrive/hooks/usePoolInfo";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
HyperdriveConfig,
TokenConfig,
} from "@delvtech/hyperdrive-appconfig";
import { adjustAmountByPercentage } from "@delvtech/hyperdrive-js-core";
import { adjustAmountByPercentage } from "@delvtech/hyperdrive-js";
import { ReactElement } from "react";
import { convertSharesToBase } from "src/hyperdrive/convertSharesToBase";
import { LabelValue } from "src/ui/base/components/LabelValue";
Expand Down
2 changes: 1 addition & 1 deletion apps/hyperdrive-trading/src/ui/markets/PoolsList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
HyperdriveConfig,
TokenConfig,
} from "@delvtech/hyperdrive-appconfig";
import { getHyperdrive } from "@delvtech/hyperdrive-js-core";
import { getHyperdrive } from "@delvtech/hyperdrive-js";
import { AdjustmentsHorizontalIcon } from "@heroicons/react/20/solid";
import { QueryStatus, useQuery } from "@tanstack/react-query";
import { useNavigate, useSearch } from "@tanstack/react-router";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { HyperdriveConfig } from "@delvtech/hyperdrive-appconfig";
import {
getHyperdrive,
OpenLongPositionReceived,
} from "@delvtech/hyperdrive-js-core";
} from "@delvtech/hyperdrive-js";
import { useQuery } from "@tanstack/react-query";
import { makeQueryKey } from "src/base/makeQueryKey";
import { getDrift } from "src/drift/getDrift";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { HyperdriveConfig } from "@delvtech/hyperdrive-appconfig";
import { getHyperdrive } from "@delvtech/hyperdrive-js-core";
import { getHyperdrive } from "@delvtech/hyperdrive-js";
import { useQuery } from "@tanstack/react-query";
import { makeQueryKey } from "src/base/makeQueryKey";
import { getDrift } from "src/drift/getDrift";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { HyperdriveConfig } from "@delvtech/hyperdrive-appconfig";
import { getHyperdrive, OpenShort } from "@delvtech/hyperdrive-js-core";
import { getHyperdrive, OpenShort } from "@delvtech/hyperdrive-js";
import { useQuery } from "@tanstack/react-query";
import { makeQueryKey } from "src/base/makeQueryKey";
import { getDrift } from "src/drift/getDrift";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ReadRegistry } from "@delvtech/hyperdrive-js-core";
import { ReadRegistry } from "@delvtech/hyperdrive-js";
import { useMemo } from "react";
import { useAppConfigForConnectedChain } from "src/ui/appconfig/useAppConfigForConnectedChain";
import { useDrift } from "src/ui/drift/useDrift";
Expand Down

0 comments on commit a26ede8

Please sign in to comment.