Merge pull request #566 from credebl/merge-dev-to-qa

merge: develop to QA

src/api/Auth.ts

@@ -48,6 +48,36 @@ export const sendVerificationMail = async(payload:UserSignUpData) => {
     }
 }
 
+export const resetPassword = async(payload: { password: string; token: string | null }, email: string | null) => {   
+	const details = {
+			url: `${apiRoutes.auth.resetPassword}/${email}`,
+			payload
+	}
+	try{
+			const response = await axiosPost(details)
+			return response
+	}
+	catch(error){
+			const err = error as Error
+			return err?.message
+	} 
+}
+
+export const forgotPassword = async(payload: {email: string}) => {
+	const details = {
+			url: apiRoutes.auth.forgotPassword,
+			payload
+	}
+	try{
+			const response = await axiosPost(details)
+			return response
+	}
+	catch(error){
+			const err = error as Error
+			return err?.message
+	} 
+}
+
 export const loginUser = async(payload: UserSignInData) => {
     const details = {
         url: apiRoutes.auth.sinIn,

src/common/global.css

@@ -135,6 +135,10 @@ ul.timelinestatic {
 	@apply dark:!text-white !text-primary-700 w-fit;
 }
 
+.email-bulk-issuance .select__single-value{
+	width: calc(100% - 15px) !important;
+}
+
 .select__value-container
 	.select__value-container--has-value
 	.select__single-value {