Merge branch 'master' of https://github.com/abouolia/Ratteb

client/src/containers/Drawers/PaperTemplate/PaperTemplateTable.js

@@ -16,7 +16,7 @@ export default function DrawerTemplateTable({ tableData, currencyCode }) {
         accessor: 'rate',
         accessor: ({ rate }) => <Money amount={rate} currency={currencyCode} />,
         disableSortBy: true,
-        width: 50,
+        width: 80,
       },
       {
         Header: formatMessage({ id: 'Qty' }),

client/src/containers/Expenses/ExpenseForm/ExpenseForm.js

@@ -63,11 +63,7 @@ function ExpenseForm({
             categories: orderingLinesIndexes(defaultExpense.categories),
           }),
     }),
-    [
-      expense,
-      baseCurrency,
-      preferredPaymentAccount,
-    ],
+    [expense, baseCurrency, preferredPaymentAccount],
   );
 
   //  Handle form submit.
@@ -117,8 +113,12 @@ function ExpenseForm({
       }
     };
 
-    // Handle request error
-    const handleError = ({ response: { data: { errors } } }) => {
+    // Handle the request error.
+    const handleError = ({
+      response: {
+        data: { errors },
+      },
+    }) => {
       transformErrors(errors, { setErrors });
       setSubmitting(false);
     };

client/src/containers/Vendors/VendorForm/VendorForm.js

@@ -94,8 +94,8 @@ function VendorForm({
   const initialValues = useMemo(
     () => ({
       ...defaultInitialValues,
-      currency_code: baseCurrency,
-      ...transformToForm(contactDuplicate || vendor, defaultInitialValues),
+      ...transformToForm(vendor, defaultInitialValues),
+      ...transformToForm(contactDuplicate, defaultInitialValues),
     }),
     [vendor, contactDuplicate, baseCurrency],
   );

client/src/hooks/query/expenses.js

@@ -38,7 +38,7 @@ export function useExpenses(query, props) {
     {
       method: 'get',
       url: `expenses`,
-      params: { ...query }
+      params: { ...query },
     },
     {
       select: transformExpenses,
@@ -61,7 +61,7 @@ export function useExpense(id, props) {
     [t.EXPENSE, id],
     {
       method: 'get',
-      url: `expenses/${id}`
+      url: `expenses/${id}`,
     },
     {
       select: (res) => res.data.expense,
@@ -120,7 +120,7 @@ export function useCreateExpense(props) {
   const apiRequest = useApiRequest();
 
   return useMutation((values) => apiRequest.post('expenses', values), {
-    onSuccess: (res, [values]) => {
+    onSuccess: () => {
       // Common invalidate queries.
       commonInvalidateQueries(queryClient);
     },