Merge branch 'dev' into talha/feedback-fixes

Author: talhainvenxion

src/api/session/signUpApi.ts

@@ -12,7 +12,6 @@ interface NewAccount {
   userId: string;
   username: string;
   fullName: any;
-  email: string;
   password: string;
   token: string;
 }
@@ -31,7 +30,6 @@ const signUpApi = ({ account }: Params): Promise<void> =>
     data: JSON.stringify({
       name: account.username,
       full_name: account.fullName,
-      email: account.email,
       password: account.password,
       activation_token: account.token
     }),

src/redux/actions/session/signupAction.ts

@@ -4,7 +4,6 @@ import signUpApi from '../../../api/session/signUpApi';
 export const signUpAction = ({
   userId,
   username,
-  email,
   fullName,
   password,
   token,
@@ -13,7 +12,6 @@ export const signUpAction = ({
 }: {
   userId: string;
   username: string;
-  email: string;
   fullName: string;
   password: string;
   token: any;
@@ -32,7 +30,6 @@ export const signUpAction = ({
       account: {
         userId,
         username,
-        email,
         fullName,
         password,
         token,    

src/services/locales/zu.json

@@ -291,7 +291,7 @@
                 "text": "Stack Components"
               },
               "setting": {
-                "text": "Setting"
+                "text": "Settings"
               }
             }
           },

src/ui/components/Filters/filter.module.scss

@@ -4,7 +4,6 @@
   height: 4rem;
   background-color: $whiteColor;
   border: 1px solid var(--lightGrey);
-  border-radius: 4px;
   box-sizing: border-box;
   display: flex;
   // width: 93%;
@@ -13,6 +12,25 @@
   padding-left: 1.6rem;
   padding-right: 1.6rem;
   outline: 0;
-  margin-top: 26px;
+  margin-top: 23px;
   line-height: 37px;
 }
+
+.tile {
+   height: 28px;
+   background-color: #EDE4FF; 
+   margin-top: -5px !important; 
+   margin-left: 7px !important;
+   border-radius: 4px; 
+   padding: 5px 11px !important
+}
+
+.removeIcon {
+    margin-top: 23px !important;
+    padding-top: 4px !important;
+    width: 34px;
+    height: 40px;
+    border: 1px solid #C9CBD0;
+    border-top-right-radius: 4px; 
+    border-bottom-right-radius: 4px   
+}