From dbe849c37de8da4d5b6ad61eefe1af0a68deed3c Mon Sep 17 00:00:00 2001 From: "l1.media" <31551045+traumschule@users.noreply.github.com> Date: Mon, 19 Jun 2023 11:21:53 +0100 Subject: [PATCH] Rename MoveFoundsModal to MoveFundsModal (#4408) * Rename MoveFoundsModal to MoveFundsModal * fixup * tests --------- Co-authored-by: Oleksandr Korniienko Co-authored-by: Joystream Stats --- packages/ui/src/accounts/hooks/useHasRequiredStake.ts | 4 ++-- .../{MoveFoundsModal => MoveFundsModal}/MoveFundsModal.tsx | 0 .../MoveFundsModalButtons.tsx | 0 .../MoveFundsModalInfo.tsx | 0 .../modals/{MoveFoundsModal => MoveFundsModal}/index.ts | 0 .../modals/{MoveFoundsModal => MoveFundsModal}/styles.ts | 0 .../modals/{MoveFoundsModal => MoveFundsModal}/types.ts | 0 packages/ui/src/app/GlobalModals.tsx | 2 +- .../modals/AnnounceWorkEntryModal/AnnounceWorkEntryModal.tsx | 2 +- .../modals/AnnounceCandidacy/AnnounceCandidacyModal.tsx | 2 +- .../src/council/modals/VoteForCouncil/VoteForCouncilModal.tsx | 2 +- .../proposals/modals/AddNewProposal/AddNewProposalModal.tsx | 2 +- .../modals/ApplyForRoleModal/ApplyForRoleModal.tsx | 2 +- .../ui/test/council/modals/AnnounceCandidacyModal.test.tsx | 2 +- packages/ui/test/council/modals/VoteForCouncilModal.test.tsx | 2 +- .../ui/test/proposals/modals/AddNewProposalModal.test.tsx | 2 +- .../ui/test/working-groups/modals/ApplyForRoleModal.test.tsx | 2 +- 17 files changed, 12 insertions(+), 12 deletions(-) rename packages/ui/src/accounts/modals/{MoveFoundsModal => MoveFundsModal}/MoveFundsModal.tsx (100%) rename packages/ui/src/accounts/modals/{MoveFoundsModal => MoveFundsModal}/MoveFundsModalButtons.tsx (100%) rename packages/ui/src/accounts/modals/{MoveFoundsModal => MoveFundsModal}/MoveFundsModalInfo.tsx (100%) rename packages/ui/src/accounts/modals/{MoveFoundsModal => MoveFundsModal}/index.ts (100%) rename packages/ui/src/accounts/modals/{MoveFoundsModal => MoveFundsModal}/styles.ts (100%) rename packages/ui/src/accounts/modals/{MoveFoundsModal => MoveFundsModal}/types.ts (100%) diff --git a/packages/ui/src/accounts/hooks/useHasRequiredStake.ts b/packages/ui/src/accounts/hooks/useHasRequiredStake.ts index a73e223c47..b8756711ae 100644 --- a/packages/ui/src/accounts/hooks/useHasRequiredStake.ts +++ b/packages/ui/src/accounts/hooks/useHasRequiredStake.ts @@ -59,7 +59,7 @@ export const useHasRequiredStake = (stake: BN, lock: LockType) => { } } - const accountsWithLockedFounds = compatibleAccounts.reduce((acc, [compatibleAccountAddress, balances]) => { + const accountsWithLockedFunds = compatibleAccounts.reduce((acc, [compatibleAccountAddress, balances]) => { const total = balances.total let otherAccountsSum = BN_ZERO @@ -85,7 +85,7 @@ export const useHasRequiredStake = (stake: BN, lock: LockType) => { return { hasRequiredStake, accountsWithCompatibleLocks: - accountsWithLockedFounds && isEmptyObject(accountsWithLockedFounds) ? null : accountsWithLockedFounds, + accountsWithLockedFunds && isEmptyObject(accountsWithLockedFunds) ? null : accountsWithLockedFunds, accountsWithTransferableBalance: null, } } diff --git a/packages/ui/src/accounts/modals/MoveFoundsModal/MoveFundsModal.tsx b/packages/ui/src/accounts/modals/MoveFundsModal/MoveFundsModal.tsx similarity index 100% rename from packages/ui/src/accounts/modals/MoveFoundsModal/MoveFundsModal.tsx rename to packages/ui/src/accounts/modals/MoveFundsModal/MoveFundsModal.tsx diff --git a/packages/ui/src/accounts/modals/MoveFoundsModal/MoveFundsModalButtons.tsx b/packages/ui/src/accounts/modals/MoveFundsModal/MoveFundsModalButtons.tsx similarity index 100% rename from packages/ui/src/accounts/modals/MoveFoundsModal/MoveFundsModalButtons.tsx rename to packages/ui/src/accounts/modals/MoveFundsModal/MoveFundsModalButtons.tsx diff --git a/packages/ui/src/accounts/modals/MoveFoundsModal/MoveFundsModalInfo.tsx b/packages/ui/src/accounts/modals/MoveFundsModal/MoveFundsModalInfo.tsx similarity index 100% rename from packages/ui/src/accounts/modals/MoveFoundsModal/MoveFundsModalInfo.tsx rename to packages/ui/src/accounts/modals/MoveFundsModal/MoveFundsModalInfo.tsx diff --git a/packages/ui/src/accounts/modals/MoveFoundsModal/index.ts b/packages/ui/src/accounts/modals/MoveFundsModal/index.ts similarity index 100% rename from packages/ui/src/accounts/modals/MoveFoundsModal/index.ts rename to packages/ui/src/accounts/modals/MoveFundsModal/index.ts diff --git a/packages/ui/src/accounts/modals/MoveFoundsModal/styles.ts b/packages/ui/src/accounts/modals/MoveFundsModal/styles.ts similarity index 100% rename from packages/ui/src/accounts/modals/MoveFoundsModal/styles.ts rename to packages/ui/src/accounts/modals/MoveFundsModal/styles.ts diff --git a/packages/ui/src/accounts/modals/MoveFoundsModal/types.ts b/packages/ui/src/accounts/modals/MoveFundsModal/types.ts similarity index 100% rename from packages/ui/src/accounts/modals/MoveFoundsModal/types.ts rename to packages/ui/src/accounts/modals/MoveFundsModal/types.ts diff --git a/packages/ui/src/app/GlobalModals.tsx b/packages/ui/src/app/GlobalModals.tsx index 0896b1ccde..e504f407ae 100644 --- a/packages/ui/src/app/GlobalModals.tsx +++ b/packages/ui/src/app/GlobalModals.tsx @@ -5,7 +5,7 @@ import styled from 'styled-components' import { ClaimVestingModalCall } from '@/accounts/modals/ClaimVestingModal' import { ClaimVestingModal } from '@/accounts/modals/ClaimVestingModal/ClaimVestingModal' -import { MoveFundsModal, MoveFundsModalCall } from '@/accounts/modals/MoveFoundsModal' +import { MoveFundsModal, MoveFundsModalCall } from '@/accounts/modals/MoveFundsModal' import { RecoverBalanceModal, RecoverBalanceModalCall } from '@/accounts/modals/RecoverBalance' import { TransferModal, TransferModalCall } from '@/accounts/modals/TransferModal' // import { AddBountyModal, AddBountyModalCall } from '@/bounty/modals/AddBountyModal' diff --git a/packages/ui/src/bounty/modals/AnnounceWorkEntryModal/AnnounceWorkEntryModal.tsx b/packages/ui/src/bounty/modals/AnnounceWorkEntryModal/AnnounceWorkEntryModal.tsx index 949c4b97f3..fbb99e36f7 100644 --- a/packages/ui/src/bounty/modals/AnnounceWorkEntryModal/AnnounceWorkEntryModal.tsx +++ b/packages/ui/src/bounty/modals/AnnounceWorkEntryModal/AnnounceWorkEntryModal.tsx @@ -9,7 +9,7 @@ import { useHasRequiredStake } from '@/accounts/hooks/useHasRequiredStake' import { useMyAccounts } from '@/accounts/hooks/useMyAccounts' import { useStakingAccountStatus } from '@/accounts/hooks/useStakingAccountStatus' import { useTransactionFee } from '@/accounts/hooks/useTransactionFee' -import { MoveFundsModalCall } from '@/accounts/modals/MoveFoundsModal' +import { MoveFundsModalCall } from '@/accounts/modals/MoveFundsModal' import { accountOrNamed } from '@/accounts/model/accountOrNamed' import { useApi } from '@/api/hooks/useApi' import { CurrencyName } from '@/app/constants/currency' diff --git a/packages/ui/src/council/modals/AnnounceCandidacy/AnnounceCandidacyModal.tsx b/packages/ui/src/council/modals/AnnounceCandidacy/AnnounceCandidacyModal.tsx index 2ae7322991..7a1014e473 100644 --- a/packages/ui/src/council/modals/AnnounceCandidacy/AnnounceCandidacyModal.tsx +++ b/packages/ui/src/council/modals/AnnounceCandidacy/AnnounceCandidacyModal.tsx @@ -7,7 +7,7 @@ import { useBalance } from '@/accounts/hooks/useBalance' import { useHasRequiredStake } from '@/accounts/hooks/useHasRequiredStake' import { useStakingAccountStatus } from '@/accounts/hooks/useStakingAccountStatus' import { useTransactionFee } from '@/accounts/hooks/useTransactionFee' -import { MoveFundsModalCall } from '@/accounts/modals/MoveFoundsModal' +import { MoveFundsModalCall } from '@/accounts/modals/MoveFundsModal' import { Account } from '@/accounts/types' import { useApi } from '@/api/hooks/useApi' import { Modal, ModalHeader, ModalTransactionFooter } from '@/common/components/Modal' diff --git a/packages/ui/src/council/modals/VoteForCouncil/VoteForCouncilModal.tsx b/packages/ui/src/council/modals/VoteForCouncil/VoteForCouncilModal.tsx index e11c3ab6c3..20cd9b93c4 100644 --- a/packages/ui/src/council/modals/VoteForCouncil/VoteForCouncilModal.tsx +++ b/packages/ui/src/council/modals/VoteForCouncil/VoteForCouncilModal.tsx @@ -2,7 +2,7 @@ import React, { useEffect } from 'react' import { useHasRequiredStake } from '@/accounts/hooks/useHasRequiredStake' import { useTransactionFee } from '@/accounts/hooks/useTransactionFee' -import { MoveFundsModalCall } from '@/accounts/modals/MoveFoundsModal' +import { MoveFundsModalCall } from '@/accounts/modals/MoveFundsModal' import { useApi } from '@/api/hooks/useApi' import { TextMedium, TokenValue } from '@/common/components/typography' import { BN_ZERO } from '@/common/constants' diff --git a/packages/ui/src/proposals/modals/AddNewProposal/AddNewProposalModal.tsx b/packages/ui/src/proposals/modals/AddNewProposal/AddNewProposalModal.tsx index 8f4a0002df..e083d9fbc1 100644 --- a/packages/ui/src/proposals/modals/AddNewProposal/AddNewProposalModal.tsx +++ b/packages/ui/src/proposals/modals/AddNewProposal/AddNewProposalModal.tsx @@ -7,7 +7,7 @@ import { useBalance } from '@/accounts/hooks/useBalance' import { useHasRequiredStake } from '@/accounts/hooks/useHasRequiredStake' import { useStakingAccountStatus } from '@/accounts/hooks/useStakingAccountStatus' import { useTransactionFee } from '@/accounts/hooks/useTransactionFee' -import { MoveFundsModalCall } from '@/accounts/modals/MoveFoundsModal' +import { MoveFundsModalCall } from '@/accounts/modals/MoveFundsModal' import { Account } from '@/accounts/types' import { Api } from '@/api' import { useApi } from '@/api/hooks/useApi' diff --git a/packages/ui/src/working-groups/modals/ApplyForRoleModal/ApplyForRoleModal.tsx b/packages/ui/src/working-groups/modals/ApplyForRoleModal/ApplyForRoleModal.tsx index d5d6895211..d7f47bafaa 100644 --- a/packages/ui/src/working-groups/modals/ApplyForRoleModal/ApplyForRoleModal.tsx +++ b/packages/ui/src/working-groups/modals/ApplyForRoleModal/ApplyForRoleModal.tsx @@ -9,7 +9,7 @@ import { useBalance } from '@/accounts/hooks/useBalance' import { useHasRequiredStake } from '@/accounts/hooks/useHasRequiredStake' import { useStakingAccountStatus } from '@/accounts/hooks/useStakingAccountStatus' import { useTransactionFee } from '@/accounts/hooks/useTransactionFee' -import { MoveFundsModalCall } from '@/accounts/modals/MoveFoundsModal' +import { MoveFundsModalCall } from '@/accounts/modals/MoveFundsModal' import { Account } from '@/accounts/types' import { Api } from '@/api' import { useApi } from '@/api/hooks/useApi' diff --git a/packages/ui/test/council/modals/AnnounceCandidacyModal.test.tsx b/packages/ui/test/council/modals/AnnounceCandidacyModal.test.tsx index 1b4122501a..cfe2c2a1ed 100644 --- a/packages/ui/test/council/modals/AnnounceCandidacyModal.test.tsx +++ b/packages/ui/test/council/modals/AnnounceCandidacyModal.test.tsx @@ -7,7 +7,7 @@ import React from 'react' import { Router } from 'react-router' import { interpret } from 'xstate' -import { MoveFundsModalCall } from '@/accounts/modals/MoveFoundsModal' +import { MoveFundsModalCall } from '@/accounts/modals/MoveFundsModal' import { ApiContext } from '@/api/providers/context' import { CurrencyName } from '@/app/constants/currency' import { GlobalModals } from '@/app/GlobalModals' diff --git a/packages/ui/test/council/modals/VoteForCouncilModal.test.tsx b/packages/ui/test/council/modals/VoteForCouncilModal.test.tsx index aff98dd3f0..b69b896508 100644 --- a/packages/ui/test/council/modals/VoteForCouncilModal.test.tsx +++ b/packages/ui/test/council/modals/VoteForCouncilModal.test.tsx @@ -5,7 +5,7 @@ import React from 'react' import { act } from 'react-dom/test-utils' import { MemoryRouter } from 'react-router' -import { MoveFundsModalCall } from '@/accounts/modals/MoveFoundsModal' +import { MoveFundsModalCall } from '@/accounts/modals/MoveFundsModal' import { ApiContext } from '@/api/providers/context' import { GlobalModals } from '@/app/GlobalModals' import { CKEditorProps } from '@/common/components/CKEditor' diff --git a/packages/ui/test/proposals/modals/AddNewProposalModal.test.tsx b/packages/ui/test/proposals/modals/AddNewProposalModal.test.tsx index 69b623c1ee..4a277df82b 100644 --- a/packages/ui/test/proposals/modals/AddNewProposalModal.test.tsx +++ b/packages/ui/test/proposals/modals/AddNewProposalModal.test.tsx @@ -7,7 +7,7 @@ import React from 'react' import { MemoryRouter } from 'react-router' import { interpret } from 'xstate' -import { MoveFundsModalCall } from '@/accounts/modals/MoveFoundsModal' +import { MoveFundsModalCall } from '@/accounts/modals/MoveFundsModal' import { ApiContext } from '@/api/providers/context' import { CurrencyName } from '@/app/constants/currency' import { GlobalModals } from '@/app/GlobalModals' diff --git a/packages/ui/test/working-groups/modals/ApplyForRoleModal.test.tsx b/packages/ui/test/working-groups/modals/ApplyForRoleModal.test.tsx index 1857699fcb..181a42621d 100644 --- a/packages/ui/test/working-groups/modals/ApplyForRoleModal.test.tsx +++ b/packages/ui/test/working-groups/modals/ApplyForRoleModal.test.tsx @@ -7,7 +7,7 @@ import React from 'react' import { MemoryRouter } from 'react-router' import { interpret } from 'xstate' -import { MoveFundsModalCall } from '@/accounts/modals/MoveFoundsModal' +import { MoveFundsModalCall } from '@/accounts/modals/MoveFundsModal' import { ApiContext } from '@/api/providers/context' import { GlobalModals } from '@/app/GlobalModals' import { createType } from '@/common/model/createType'