fix: resolve conflicts pt.1

binary-com · Nov 15, 2023 · 5399bd9 · 5399bd9
1 parent d65976f
commit 5399bd9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/packages/wallets/src/features/cfd/screens/ChangePassword/ChangePassword.scss b/packages/wallets/src/features/cfd/screens/ChangePassword/ChangePassword.scss
@@ -31,20 +31,20 @@
         margin-bottom: 3.2rem;
         justify-self: center;
         width: 100%;
-        &--btn {
+        &__btn {
             width: 50%;
             border: none;
             border-bottom: 2px solid var(--light-7-secondary-background, #f2f3f4);
             background: none;
             padding: 1rem 0;
             cursor: pointer;
-        }
-        &--btn-active {
-            width: 50%;
-            border: none;
-            border-bottom: 2px solid var(--brand-coral, #ff444f);
-            background: none;
-            padding: 1rem 0;
+            &--active {
+                width: 50%;
+                border: none;
+                border-bottom: 2px solid var(--brand-coral, #ff444f);
+                background: none;
+                padding: 1rem 0;
+            }
         }
     }
 
@@ -53,16 +53,16 @@
         flex-direction: column;
         align-items: center;
         gap: 2.4rem;
-        &--icon {
+        &__icon {
             text-align: center;
         }
-        &--text {
+        &__text {
             display: flex;
             flex-direction: column;
             align-items: center;
             gap: 0.8rem;
         }
-        &--btn {
+        &__btn {
             width: 45.2rem;
             text-align: center;
             @include mobile {

diff --git a/packages/wallets/src/features/cfd/screens/ChangePassword/ChangePassword.tsx b/packages/wallets/src/features/cfd/screens/ChangePassword/ChangePassword.tsx
@@ -1,17 +1,17 @@
-import React from 'react';
+import React, { useState } from 'react';
 import { ModalStepWrapper, WalletText } from '../../../../components/Base';
 import MT5Password from './MT5Password';
 import './ChangePassword.scss';
 
 const ChangePassword = () => {
     const tabs = [
         {
-            label: 'Deriv MT5 password',
             content: <MT5Password />,
+            label: 'Deriv MT5 password',
         },
         {
-            label: 'Investor password',
             content: <></>, // TODO: Add InvestorPassword component
+            label: 'Investor password',
         },
     ];
     const [activeTab, setActiveTab] = useState(0);
@@ -29,8 +29,8 @@ const ChangePassword = () => {
                             <button
                                 className={
                                     activeTab === index
-                                        ? 'wallets-change-password__tab--btn-active'
-                                        : 'wallets-change-password__tab--btn'
+                                        ? 'wallets-change-password__tab__btn--active'
+                                        : 'wallets-change-password__tab__btn'
                                 }
                                 key={index}
                                 onClick={() => handleTabClick(index)}

diff --git a/packages/wallets/src/features/cfd/screens/ChangePassword/MT5Password.tsx b/packages/wallets/src/features/cfd/screens/ChangePassword/MT5Password.tsx
@@ -8,15 +8,15 @@ const MT5Password = () => {
             <div className='change-password__content--icon'>
                 <MT5PasswordIcon />
             </div>
-            <div className='wallets-change-password__content--text'>
+            <div className='wallets-change-password__content__text'>
                 <WalletText align='center' weight='bold'>
                     Deriv MT5 password
                 </WalletText>
                 <WalletText align='center' size='sm'>
                     Use this password to log in to your Deriv MT5 accounts on the desktop, web, and mobile apps.
                 </WalletText>
             </div>
-            <div className='wallets-change-password__content--btn'>
+            <div className='wallets-change-password__content__btn'>
                 <WalletButton size='lg' text='Change password' />
             </div>
         </>