Merge branch 'release' into development

# Conflicts:
#	src/pages/shop/product/variant/[slug].jsx

1 files changed, 6 insertions, 22 deletions

diff --git a/src-migrate/services/auth.ts b/src-migrate/services/auth.ts
index a5d02754..35ba290a 100644
--- a/src-migrate/services/auth.ts
+++ b/src-migrate/services/auth.ts
@@ -1,4 +1,4 @@
-import odooApi from '~/common/libs/odooApi';
+import odooApi from '~/libs/odooApi';
 import {
   RegisterResApiProps,
   RegisterProps,
@@ -8,46 +8,30 @@ import {
   ActivationOtpResApiProps,
   ActivationReqProps,
   ActivationReqResApiProps,
-} from '~/common/types/auth';
+} from '~/types/auth';
 
 const BASE_PATH = '/api/v1/user';
 
 export const registerUser = async (
   data: RegisterProps
 ): Promise<RegisterResApiProps> => {
-  const response = await odooApi('POST', `${BASE_PATH}/register`, data);
-
-  return response;
+  return await odooApi('POST', `${BASE_PATH}/register`, data);
 };
 
 export const activationUserToken = async (
   params: ActivationTokenProps
 ): Promise<ActivationTokenResApiProps> => {
-  const response = await odooApi(
-    'POST',
-    `${BASE_PATH}/activation-token`,
-    params
-  );
-
-  return response;
+  return await odooApi('POST', `${BASE_PATH}/activation-token`, params);
 };
 
 export const activationUserOTP = async (
   params: ActivationOtpProps
 ): Promise<ActivationOtpResApiProps> => {
-  const response = await odooApi('POST', `${BASE_PATH}/activation-otp`, params);
-
-  return response;
+  return await odooApi('POST', `${BASE_PATH}/activation-otp`, params);
 };
 
 export const activationReq = async (
   params: ActivationReqProps
 ): Promise<ActivationReqResApiProps> => {
-  const response = await odooApi(
-    'POST',
-    `${BASE_PATH}/activation-request`,
-    params
-  );
-
-  return response;
+  return await odooApi('POST', `${BASE_PATH}/activation-request`, params);
 };