QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-16 04:40:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(webapp): should not show the form before loading account

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2023-06-22 20:13:29 +02:00
parent ca4d543482
commit c98fe00f88
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/webapp/src/containers/CashFlow/MoneyInDialog/MoneyInDialogProvider.tsx
View File

@@ -27,7 +27,7 @@ function MoneyInDialogProvider({
const isBranchFeatureCan = featureCan(Features.Branches);
// Fetches accounts list.
const { isFetching: isAccountsLoading, data: accounts } = useAccounts();
const { isLoading: isAccountsLoading, data: accounts } = useAccounts();
// Fetches the specific account details.
const { data: account, isLoading: isAccountLoading } = useAccount(accountId, {
@@ -54,7 +54,7 @@ function MoneyInDialogProvider({
// Submit payload.
const [submitPayload, setSubmitPayload] = React.useState({});
// provider.
// Provider data.
const provider = {
accounts,
account,
@@ -73,15 +73,15 @@ function MoneyInDialogProvider({
setSubmitPayload,
};
const isLoading =
isAccountsLoading ||
isCashFlowAccountsLoading ||
isBranchesLoading ||
isSettingsLoading ||
isAccountLoading;
return (
<DialogContent
isLoading={
isAccountsLoading ||
isCashFlowAccountsLoading ||
isBranchesLoading ||
isSettingsLoading
}
>
<DialogContent isLoading={isLoading}>
<MoneyInDialogContent.Provider value={provider} {...props} />
</DialogContent>
);

18
packages/webapp/src/containers/CashFlow/MoneyOutDialog/MoneyOutDialogProvider.tsx
View File

@@ -50,7 +50,7 @@ function MoneyOutProvider({ accountId, accountType, dialogName, ...props }) {
// Submit payload.
const [submitPayload, setSubmitPayload] = React.useState({});
// provider.
// Provider data.
const provider = {
accounts,
account,
@@ -69,15 +69,15 @@ function MoneyOutProvider({ accountId, accountType, dialogName, ...props }) {
setSubmitPayload,
};
const isLoading =
isAccountsLoading ||
isCashFlowAccountsLoading ||
isBranchesLoading ||
isSettingsLoading ||
isAccountLoading;
return (
<DialogContent
isLoading={
isAccountsLoading ||
isCashFlowAccountsLoading ||
isBranchesLoading ||
isSettingsLoading
}
>
<DialogContent isLoading={isLoading}>
<MoneyInDialogContent.Provider value={provider} {...props} />
</DialogContent>
);