groot/automatisch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1805 from automatisch/AUT-919

Browse Source 
fix: pass current user id to usePlanAndUsage hook
This commit is contained in:
Ali BARIN
2024-04-12 13:06:57 +02:00
committed by GitHub
parent 7d2fb8d9d7 009754c18b
commit 61dc431f92
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/web/src/components/UsageDataInformation/index.ee.jsx
View File

@@ -83,10 +83,10 @@ function Action(props) {
export default function UsageDataInformation() { export default function UsageDataInformation() {
const formatMessage = useFormatMessage(); const formatMessage = useFormatMessage();
const queryClient = useQueryClient(); const queryClient = useQueryClient();
const { data } = usePlanAndUsage();
const planAndUsage = data?.data;
const { data: currentUser } = useCurrentUser(); const { data: currentUser } = useCurrentUser();
const currentUserId = currentUser?.data?.id; const currentUserId = currentUser?.data?.id;
const { data } = usePlanAndUsage(currentUserId);
const planAndUsage = data?.data;
const trial = useUserTrial(); const trial = useUserTrial();
const subscriptionData = useSubscription(); const subscriptionData = useSubscription();
const subscription = subscriptionData?.data; const subscription = subscriptionData?.data;

1
packages/web/src/hooks/usePlanAndUsage.js
View File

@@ -12,6 +12,7 @@ export default function usePlanAndUsage(userId) {
return data; return data;
}, },
enabled: !!userId,
}); });
return query; return query;