Merge pull request #80 from Chat-Your-Way/CHAT-184-fix-regist-compone…

…nt-form-button CHAT-184-fix-regist-component-form-button
Chat-Your-Way · Feb 4, 2024 · 6a70a4b · 6a70a4b
2 parents 6aeef63 + eea18c0
commit 6a70a4b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 19 deletions.
diff --git a/src/components/RegistrationPageComponent/RegistrationPageComponent.jsx b/src/components/RegistrationPageComponent/RegistrationPageComponent.jsx
@@ -17,7 +17,7 @@ const defaultValues = {
   nickname: '',
   email: '',
   password: '',
-  avatar: '1',
+  avatar: '3',
   confirm: '',
   agreement: false,
 };
@@ -109,7 +109,7 @@ function RegistrationPageComponent() {
         <RegistrationButton
           type="submit"
           label="Створити акаунт"
-          isDisabled={!isValid}
+          disabled={!isValid}
         />
       </RegistrationForm>
     </RegistrationWrapper>

diff --git a/src/components/RegistrationPageComponent/RegistrationPageComponent.styled.js b/src/components/RegistrationPageComponent/RegistrationPageComponent.styled.js
@@ -85,25 +85,10 @@ export const RegistrationButton = styled(DefaultButton)`
   padding: 8px 12px;
   justify-content: center;
   align-items: center;
-  cursor: pointer;
   gap: 8px;
-  opacity: 1;
-
   ${(p) => p.theme.typography.h5}
 
   &:hover {
     box-shadow: 0px 1px 8px 4px rgba(134, 134, 220, 0.2);
   }
-
-  ${(p) => {
-    return (
-      p.isDisabled &&
-      `
-      opacity: 0.8;
-      color: ${p.theme.palette.primary.dark};
-      background-color: ${p.theme.palette.primary.disabled};
-      border: 1px solid ${p.theme.palette.primary.light};
-      `
-    );
-  }}
 `;
diff --git a/src/components/RegistrationPageComponent/index.js b/src/components/RegistrationPageComponent/index.js
@@ -1 +1 @@
-export { default } from './RegistrationPageComponent';
+export { default } from './RegistrationPageComponent.jsx';
diff --git a/src/pages/RegistrationPage/RegistrationPage.jsx b/src/pages/RegistrationPage/RegistrationPage.jsx
@@ -1,4 +1,3 @@
-// eslint-disable-next-line max-len
 import RegistrationPageComponent from '../../components/RegistrationPageComponent';
 
 function RegistrationPage() {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export { default } from './RegistrationPageComponent';
		export { default } from './RegistrationPageComponent.jsx';