Merge branch 'dev' into talha/feedback-fixes

Author: talhainvenxion

global.d.ts

@@ -52,6 +52,7 @@ interface TInvite {
   organizationName: string;
   code: string;
   email: string;
+  name: string;
   createdAt: Date;
 }
 
@@ -60,7 +61,8 @@ interface TMember {
   organizationId: string;
   fullName: string;
   email: string;
-  created_at: Date;
+  name: string;
+  created: Date;
   active: boolean;
   activation_token: string;
 }

src/api/organizations/inviteApi.ts

@@ -7,22 +7,19 @@ import mockApi from '../mockApiData';
 const inviteApi = ({
   authenticationToken,
   name,
-  email,
 }: {
   authenticationToken: string;
   name: string;
-  email: string;
-}): Promise<void> =>
-  fetchApiWithAuthRequest({
+}): Promise<void> =>  
+fetchApiWithAuthRequest({
     url: apiUrl(endpoints.organizations.invite),
     method: httpMethods.post,
     authenticationToken,
     headers: {
       'Content-Type': 'application/json',
     },
     data: JSON.stringify({
-      name,
-      email,
+      name
     }),
   }).catch((res) => {
     if (process.env.REACT_APP_MOCKAPI_RESPONSE) {

src/api/session/emailUpdate.ts

@@ -5,12 +5,12 @@ import { apiUrl } from '../apiUrl';
 
 const emailUpdate = ({
   userId,
-  email,
+  fullName,
   name,
   authenticationToken,
 }: {
   userId: string,
-  email: string
+  fullName: string
   name: string;
   authenticationToken: string;
 }): Promise<TUser> =>
@@ -21,7 +21,7 @@ const emailUpdate = ({
     headers: {
       'Content-Type': 'application/json',
     },
-    data: { email, name },
+    data: { full_name: fullName, name },
   });
 
 export default emailUpdate;

src/api/session/loginApi.ts

@@ -30,11 +30,11 @@ interface Params {
 //       password: account.password,
 //     }),
 //   }).catch((res) => {
-//     // if (process.env.REACT_APP_MOCKAPI_RESPONSE) {
+//     if (process.env.REACT_APP_MOCKAPI_RESPONSE) {
 //       res = {
 //         data: mockApi.loginMockResponse,
 //       };
-//     // }
+//     }
 //     return res;
 //   });
 
@@ -50,4 +50,5 @@ const loginApi = ({ account }: Params): Promise<Response> =>
       password: account.password,
     }),
   });
+
 export default loginApi;

src/api/session/signUpApi.ts

@@ -9,8 +9,9 @@ export interface Response {
 }
 
 interface NewAccount {
+  userId: string;
   username: string;
-  fullname: any;
+  fullName: any;
   email: string;
   password: string;
   token: string;
@@ -22,14 +23,14 @@ interface Params {
 
 const signUpApi = ({ account }: Params): Promise<void> =>
   fetchApi({
-    url: apiUrl(endpoints.signup(account.username)),
+    url: apiUrl(endpoints.signup(account.userId)),
     method: httpMethods.put,
     headers: {
       'Content-Type': 'application/json',
     },
     data: JSON.stringify({
       name: account.username,
-      full_name: account.fullname,
+      full_name: account.fullName,
       email: account.email,
       password: account.password,
       activation_token: account.token

src/api/users/getMyUserApi.ts

@@ -1,5 +1,5 @@
 import { fetchApiWithAuthRequest } from '../fetchApi';
-import { endpoints } from '../endpoints';
+import { endpoints } from '../endpoints'; 
 import { httpMethods } from '../constants';
 import { apiUrl } from '../apiUrl';
 import mockApi from '../mockApiData';

src/redux/actions/organizations/inviteAction.ts

@@ -3,12 +3,10 @@ import inviteApi from '../../../api/organizations/inviteApi';
 
 export const inviteAction = ({
   name,
-  email,
   onFailure,
   onSuccess,
 }: {
   name: string;
-  email: string;
   onFailure?: (err: any) => void;
   onSuccess?: () => void;
 }): TRequestAction => ({
@@ -18,7 +16,7 @@ export const inviteAction = ({
     isAuthenticated: true,
     failureActionType: organizationActionTypes.invite.failure,
     successActionType: organizationActionTypes.invite.success,
-    params: { name, email },
+    params: { name },
     onFailure,
     onSuccess,
   },

src/redux/actions/session/emailUpdate.ts

@@ -3,13 +3,13 @@ import emailUpdateApi from '../../../api/session/emailUpdate';
 
 export const emailUpdateAction = ({
   userId,
-  email,
+  fullName,
   name,
   onSuccess,
   onFailure,
 }: {
   userId: string;
-  email: string;
+  fullName: string;
   name: string;
   onSuccess?: () => void;
   onFailure?: () => void;
@@ -22,6 +22,6 @@ export const emailUpdateAction = ({
     successActionType: updateEmailTypes.success,
     onSuccess,
     onFailure,
-    params: { userId, email, name },
+    params: { userId, fullName, name },
   },
 });

src/redux/actions/session/signupAction.ts

@@ -2,6 +2,7 @@ import { signupActionTypes } from '../../actionTypes';
 import signUpApi from '../../../api/session/signUpApi';
 
 export const signUpAction = ({
+  userId,
   username,
   email,
   fullName,
@@ -10,6 +11,7 @@ export const signUpAction = ({
   onSuccess,
   onFailure,
 }: {
+  userId: string;
   username: string;
   email: string;
   fullName: string;
@@ -28,6 +30,7 @@ export const signUpAction = ({
     onFailure,
     params: {
       account: {
+        userId,
         username,
         email,
         fullName,

src/services/locales/zu.json

@@ -63,9 +63,9 @@
               "label": "Change Password",
               "button": "Change Password"
             },
-            "emailNameReset": {
-              "label": "Change Email and Username",
-              "button": "Change Email and Username"
+            "nameReset": {
+              "label": "Save Changes",
+              "button": "Save Changes"
             },
             "toasts": {
               "successful": {
@@ -76,8 +76,8 @@
               }
             },
             "popup": {
-                "title": "Change Email and Username",
-                "text": "Are you sure to change your email and username",
+                "title": "Change full name and Username",
+                "text": "Are you sure to change your full name and username",
                 "successButton": {
                   "text": "Yes"
                 },
@@ -165,11 +165,10 @@
             },
             "popup": {
               "title": "Add a new Member",
-              "email": {
-                "label": "Email",
-                "placeholder": "Email",
-                "required": "Email is required",
-                "invalidEmail": "Email is not valid"
+              "username": {
+                "label": "Username",
+                "placeholder": "Username",
+                "required": "Username is required"
               },
               "role": {
                 "label": "Role",
@@ -180,8 +179,8 @@
                 "text": "Invite"
               },
               "generateInviteModal": {
-                "title": "Invitation Token",
-                "text": "Click generate token to re-generate invitation for",
+                "title": "New Invitation Token",
+                "text": " Generate a new invite token for",
                 "button": {
                   "text": "Generate Token"
                 }