Explorar o código

fix replacqme

jusrhee %!s(int64=2) %!d(string=hai) anos
pai
achega
06ba507407

+ 0 - 7
dashboard/src/lib/hooks/useStripe.tsx

@@ -313,12 +313,6 @@ export const useCustomerPlan = (): TGetPlan => {
   };
 };
 
-<<<<<<< HEAD
-export const useCustomerUsage = (windowSize: string, currentPeriod: boolean): TGetUsage => {
-  const { currentProject } = useContext(Context);
-
-  // Fetch current plan
-=======
 export const useCustomerUsage = (
   windowSize: string,
   currentPeriod: boolean
@@ -326,7 +320,6 @@ export const useCustomerUsage = (
   const { currentProject } = useContext(Context);
 
   // Fetch customer usage
->>>>>>> 26d90f2aa267905d083cc670797d5d99d7f39d88
   const usageReq = useQuery(
     ["listCustomerUsage", currentProject?.id],
     async () => {

+ 1 - 1
dashboard/src/main/home/project-settings/BillingPage.tsx

@@ -51,7 +51,7 @@ function BillingPage(): JSX.Element {
     const resultMap = new Map();
 
     before?.forEach((metric) => {
-      const metricName = metric.metric_name.toLowerCase().replacqme(" ", "_");
+      const metricName = metric.metric_name.toLowerCase().replace(" ", "_");
       metric.usage_metrics.forEach(({ starting_on, value }) => {
         if (resultMap.has(starting_on)) {
           resultMap.get(starting_on)[metricName] = value;