Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the directory structure in the dApp #915

Merged
merged 4 commits into from
Dec 6, 2024
Merged

Update the directory structure in the dApp #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e4c0aa
Pull the existing components one level up
kkosiorowska Dec 4, 2024
ef61f7d
Update component file names
kkosiorowska Dec 4, 2024
a6b5c04
Merge branch 'main' of github.com:thesis/acre into update-directory-s…
kkosiorowska Dec 6, 2024
86dc681
Fix eslint issue
kkosiorowska Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 dapp/src/components/DocsDrawer/index.tsx → dapp/src/components/DocsDrawer.tsx
View file
Open in desktop
File renamed without changes.
0 dapp/src/components/GlobalStyles/index.tsx → dapp/src/components/GlobalStyles.tsx
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions dapp/src/components/TransactionModal/ActiveStakingStep/StakeFormModal/StakeDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react"
import { List } from "@chakra-ui/react"
import TransactionDetailsAmountItem from "#/components/shared/TransactionDetails/AmountItem"
import FeesDetailsAmountItem from "#/components/shared/FeesDetails/FeesItem"
import TransactionDetailsAmountItem from "#/components/shared/TransactionDetails/TransactionDetailsAmountItem"
import FeesDetailsAmountItem from "#/components/shared/FeesDetails/FeesDetailsAmountItem"
nkuba marked this conversation as resolved.
Show resolved Hide resolved
import { TOKEN_AMOUNT_FIELD_NAME } from "#/components/shared/TokenAmountForm/TokenAmountFormBase"
import { FeesTooltip } from "#/components/TransactionModal/FeesTooltip"
import {
Expand Down
4 changes: 2 additions & 2 deletions dapp/src/components/TransactionModal/ActiveUnstakingStep/UnstakeFormModal/UnstakeDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from "react"
import { List } from "@chakra-ui/react"
import TransactionDetailsAmountItem from "#/components/shared/TransactionDetails/AmountItem"
import { TOKEN_AMOUNT_FIELD_NAME } from "#/components/shared/TokenAmountForm/TokenAmountFormBase"
import {
useFormField,
Expand All @@ -9,7 +8,8 @@ import {
} from "#/hooks"
import { ACTION_FLOW_TYPES, CurrencyType } from "#/types"
import { DESIRED_DECIMALS_FOR_FEE } from "#/constants"
import FeesDetailsAmountItem from "#/components/shared/FeesDetails/FeesItem"
import FeesDetailsAmountItem from "#/components/shared/FeesDetails/FeesDetailsAmountItem"
import TransactionDetailsAmountItem from "#/components/shared/TransactionDetails/TransactionDetailsAmountItem"
import { FeesTooltip } from "../../FeesTooltip"

function UnstakeDetails({ currency }: { currency: CurrencyType }) {
Expand Down
0 ...onents/shared/BlockExplorerLink/index.tsx → ...c/components/shared/BlockExplorerLink.tsx
View file
Open in desktop
File renamed without changes.
0 ...rc/components/shared/ButtonLink/index.tsx → dapp/src/components/shared/ButtonLink.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...mponents/shared/CurrencyBalance/index.tsx → ...src/components/shared/CurrencyBalance.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
numberToLocaleString,
} from "#/utils"
import { CurrencyType, AmountType } from "#/types"
import Tooltip from "../Tooltip"
import Tooltip from "./Tooltip"

export type CurrencyBalanceProps = {
currency: CurrencyType
Expand Down
2 changes: 1 addition & 1 deletion ...d/CurrencyBalanceWithConversion/index.tsx → .../shared/CurrencyBalanceWithConversion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react"
import { useCurrencyConversion } from "#/hooks"
import { CurrencyBalance, CurrencyBalanceProps } from "../CurrencyBalance"
import { CurrencyBalance, CurrencyBalanceProps } from "./CurrencyBalance"

export function CurrencyBalanceWithConversion({
from,
Expand Down
0 ...omponents/shared/FeesDetails/FeesItem.tsx → ...red/FeesDetails/FeesDetailsAmountItem.tsx
View file
Open in desktop
File renamed without changes.
0 ...onents/shared/NumberFormatInput/index.tsx → ...c/components/shared/NumberFormatInput.tsx
View file
Open in desktop
File renamed without changes.
0 .../src/components/shared/Skeleton/index.tsx → dapp/src/components/shared/Skeleton.tsx
View file
Open in desktop
File renamed without changes.
0 dapp/src/components/shared/Spinner/index.tsx → dapp/src/components/shared/Spinner.tsx
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...onents/shared/TokenBalanceInput/index.tsx → ...c/components/shared/TokenBalanceInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import { useCurrencyConversion } from "#/hooks"
import NumberFormatInput, {
NumberFormatInputValues,
NumberFormatInputProps,
} from "../NumberFormatInput"
import { CurrencyBalance } from "../CurrencyBalance"
import HelperErrorText, { HelperErrorTextProps } from "../Form/HelperErrorText"
} from "./NumberFormatInput"
import { CurrencyBalance } from "./CurrencyBalance"
import HelperErrorText, { HelperErrorTextProps } from "./Form/HelperErrorText"

type FiatCurrencyBalanceProps = {
amount: bigint
Expand Down
0 .../shared/TransactionDetails/AmountItem.tsx → ...nDetails/TransactionDetailsAmountItem.tsx
View file
Open in desktop
File renamed without changes.
Loading