Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions components/collective-page/graphql/preload.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const preloadCollectivePageGraphqlQueries = async (client, collective) =>
queries.push(
client.query({
query: getBudgetSectionQuery(Boolean(collective.host), isIndividual),
variables: getBudgetSectionQueryVariables(slug, isIndividual, collective.host),
variables: getBudgetSectionQueryVariables(slug, isIndividual, collective.host, collective.isHost),
}),
);
}
Expand All @@ -50,7 +50,7 @@ export const preloadCollectivePageGraphqlQueries = async (client, collective) =>
queries.push(
client.query({
query: transactionsSectionQuery,
variables: getTransactionsSectionQueryVariables(slug),
variables: getTransactionsSectionQueryVariables(slug, collective.isHost),
}),
);
}
Expand Down
6 changes: 3 additions & 3 deletions components/collective-page/sections/Budget.js
Original file line number Diff line number Diff line change
Expand Up @@ -227,15 +227,15 @@ export const getBudgetSectionQuery = (hasHost, isIndividual) => {
}
};

export const getBudgetSectionQueryVariables = (collectiveSlug, isIndividual, host) => {
export const getBudgetSectionQueryVariables = (collectiveSlug, isIndividual, host, isHost) => {
if (isIndividual) {
return { slug: collectiveSlug, limit: 3, kind: getDefaultKinds().filter(kind => kind !== TransactionKind.EXPENSE) };
} else {
return {
slug: collectiveSlug,
host: host ? { slug: host.slug } : null,
limit: 3,
kind: getDefaultKinds(),
kind: getDefaultKinds({ isHost: Boolean(isHost) }),
heavyAccount: isHeavyAccount(collectiveSlug),
};
}
Expand Down Expand Up @@ -333,7 +333,7 @@ const SectionBudget = ({ collective, LoggedInUser }) => {
const [filter, setFilter] = React.useState('all');
const isIndividual = isIndividualAccount(collective) && !collective.isHost;
const budgetQueryResult = useQuery(getBudgetSectionQuery(Boolean(collective.host), isIndividual), {
variables: getBudgetSectionQueryVariables(collective.slug, isIndividual, collective.host),
variables: getBudgetSectionQueryVariables(collective.slug, isIndividual, collective.host, collective.isHost),
});
const { data, refetch } = budgetQueryResult;

Expand Down
11 changes: 8 additions & 3 deletions components/collective-page/sections/Transactions.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,18 @@ export const transactionsSectionQuery = gql`
${transactionsQueryCollectionFragment}
`;

export const getTransactionsSectionQueryVariables = slug => {
return { slug, limit: NB_DISPLAYED, kind: getDefaultKinds(), includeGiftCardTransactions: !isHeavyAccount(slug) };
export const getTransactionsSectionQueryVariables = (slug, isHost) => {
return {
slug,
limit: NB_DISPLAYED,
kind: getDefaultKinds({ isHost: Boolean(isHost) }),
includeGiftCardTransactions: !isHeavyAccount(slug),
};
};

const SectionTransactions = props => {
const transactionsQueryResult = useQuery(transactionsSectionQuery, {
variables: getTransactionsSectionQueryVariables(props.collective.slug),
variables: getTransactionsSectionQueryVariables(props.collective.slug, props.collective.isHost),

// We keep notifyOnNetworkStatusChange to remove the flash of collectiveHasNoTransactions bug
// See https://github.com/apollographql/apollo-client/blob/9c80adf65ccbbb88ea5b9313c002f85976c225e3/src/core/ObservableQuery.ts#L274-L304
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ const AddFundsModalContentWithCollective = ({
refetchQueries: [
{
query: getBudgetSectionQuery(true, false),
variables: getBudgetSectionQueryVariables(collective.slug, false, host),
variables: getBudgetSectionQueryVariables(collective.slug, false, host, account?.isHost),
},
{
query: collectivePageQuery,
Comment thread
znarf marked this conversation as resolved.
Expand Down
16 changes: 11 additions & 5 deletions components/transactions/filters/TransactionsKindFilter.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
import { TransactionKind } from '../../../lib/constants/transactions';

// (!) Remember that any changes made here should be applied to the cache in API > `getCacheKeyForBudgetOrTransactionsSections`
export const getDefaultKinds = () => {
return [
export const getDefaultKinds = ({ isHost = false } = {}) => {
const kinds = [
TransactionKind.ADDED_FUNDS,
TransactionKind.BALANCE_TRANSFER,
TransactionKind.CONTRIBUTION,
TransactionKind.EXPENSE,
TransactionKind.PLATFORM_TIP,
TransactionKind.APPLICATION_FEE,
];

// On a Fiscal Host profile, PLATFORM_TIP transactions are the tips collected on the internal
// "Platform Tips" child account (money owed to the platform, not host activity). For other
// accounts they are tips the account gave, which are part of its own financial activity.
if (!isHost) {
kinds.push(TransactionKind.PLATFORM_TIP);
}

return kinds;
};
Loading