fix: Fix for PR comments.

tabetalt · May 27, 2021 · 967d443 · 967d443
1 parent 25ff5c8
commit 967d443
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 13 deletions.
diff --git a/src/components/common/FormCheckbox.tsx b/src/components/common/FormCheckbox.tsx
@@ -1,7 +1,7 @@
 import { useField } from 'formik';
 import React from 'react';
 import Error from './Error';
-import { Box, Checkbox, Flex, Label } from '@theme-ui/components';
+import { Box, Flex, Label } from '@theme-ui/components';
 import { Switch } from '@tabetalt/kit';
 
 export const FormCheckbox: React.FC<any> = ({ label, ...props }: any) => {

diff --git a/src/context/TenantContext.tsx b/src/context/TenantContext.tsx
@@ -7,15 +7,12 @@ export type TenantItem = GetTenantsQuery['tenants']['items'][0];
 interface TenantContextValue {
   tenants: TenantItem[];
   currentTenant: TenantItem | null;
-  updateRequired: () => void;
+  updateRequired?: () => void;
 }
 
 export const TenantContext = React.createContext<TenantContextValue>({
   tenants: [],
   currentTenant: null,
-  updateRequired: () => {
-    // Dummy function
-  },
 } as TenantContextValue);
 
 export function useTenant(): TenantContextValue {

diff --git a/src/helpers/index.ts b/src/helpers/index.ts
@@ -14,11 +14,8 @@ export const formatPrice = (
   return amount;
 };
 
-export const formatMoney = (value?: Money | null): string => {
-  if (!value) return '0';
-
-  const amount = value as DineroObject ? Dinero(priceValue).toFormat('0.00') : '0';
-  return amount;
+export const formatMoney = (value?: Money): string => {
+  return value ? Dinero(value as DineroObject).toFormat('0.00') : '0';
 };
 
 export const valueFromString = (

diff --git a/src/modules/settings/GeneralSettings.tsx b/src/modules/settings/GeneralSettings.tsx
@@ -57,7 +57,7 @@ export const GeneralSettings: React.FC<GeneralSettingsProps> = ({ tenant }) => {
   const onSubmitGeneral = useCallback(
     async (input) => {
       await updateTenant({ variables: { id: tenant?.id || 1, input } });
-      updateRequired();
+      if (updateRequired) updateRequired();
     },
     [updateTenant]
   );
@@ -105,7 +105,7 @@ export const GeneralSettings: React.FC<GeneralSettingsProps> = ({ tenant }) => {
         linkedin: findSocialMediaByName(SocialMediaType.Linkedin) || '',
       }}
       validationSchema={TenantSchema}
-      onSubmit={async (values, { setSubmitting }) => {
+      onSubmit={async (values) => {
         const input: TenantUpdateInput = {
           priceDisplay: values.priceDisplay,
           title: values.title,

diff --git a/src/modules/settings/ShippingSettings.tsx b/src/modules/settings/ShippingSettings.tsx
@@ -46,7 +46,7 @@ const Shipping: React.FC<ShippingSettingsProps> = ({ tenant }) => {
   const [openModal, setOpenModal] = useState(false);
   const [currentDeliveryMethod, setCurrentDeliveryMethod] =
     useState<DeliveryMethodItem | null>(null);
-  const { data, loading, error } = useGetDeliveryMethodsQuery();
+  const { data } = useGetDeliveryMethodsQuery();
   const [deleteDeliveryMethod, { loading: deleteLoading }] =
     useDeleteDeliveryMethodMutation({
       refetchQueries: [{ query: GetDeliveryMethodsDocument }],