Merge pull request #125 from Beldex-Coin/revamp_user_profiles_and_for…

…got_password_modal revamp done in user profile and forgot wallet password modal.
Beldex-Coin · Nov 28, 2024 · 9943911 · 9943911
2 parents 9725c0b + 06983dd
commit 9943911
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 40 deletions.
diff --git a/stylesheets/_bchat.scss b/stylesheets/_bchat.scss
@@ -829,16 +829,19 @@ label {
   }
 
   &__body {
-    padding: 0px $bchat-margin-lg 0px $bchat-margin-md;
+    padding: 0px $bchat-margin-sm 0px $bchat-margin-xs;
     font-family: $bchat-font-default;
     line-height: $bchat-font-md;
     font-size: $bchat-font-md;
     overflow-y: auto;
     overflow-x: hidden;
-    max-height: 55vh;
-
+    max-height: 65vh;
+    // ::-webkit-scrollbar {
+    //   display: none;
+    // }
     .message {
       text-align: center;
+
     }
 
     .bchat-id-editable {
@@ -918,6 +921,7 @@ label {
     // overflow-y: auto;
     overflow-x: hidden;
     // max-height: 513px;
+    padding: 0px $bchat-margin-md 0px $bchat-margin-md;
   }
 
   &__deleteAccountModal {

diff --git a/stylesheets/_global.scss b/stylesheets/_global.scss
@@ -19,8 +19,8 @@ body {
 
 // scrollbars
 ::-webkit-scrollbar {
-  width: 7px;
-  height:7px
+  width: 5px;
+  height:5px
 
 }
 

diff --git a/stylesheets/_modal.scss b/stylesheets/_modal.scss
@@ -283,7 +283,7 @@
         justify-content: center;
         align-items: center;
         // width: 538px;
-        width: 580px;
+        width: 550px;
 
         // height: 417px;
         // background-color: #2d2d3b;

diff --git a/ts/components/dialog/BchatWalletForgotPasswordModal.tsx b/ts/components/dialog/BchatWalletForgotPasswordModal.tsx
@@ -14,7 +14,6 @@ import { updateDaemon } from '../../state/ducks/daemon';
 import { getConversationById } from '../../data/data';
 import { useConversationWalletDaemonHeight } from '../../hooks/useParamSelector';
 import { useKey } from 'react-use';
-import styled from 'styled-components';
 import { BchatWrapperModal } from '../BchatWrapperModal';
 import {
   updateBchatWalletForgotPasswordModal,
@@ -136,26 +135,17 @@ export const BchatWalletForgotPasswordModal = () => {
   useKey((event: KeyboardEvent) => {
     return event.key === 'Enter';
   }, passValid);
-  const Loader = styled.div`
-    position: absolute;
-    // top: 0;
-    display: flex;
-    // justify-content: center;
-    /* width: 100%; */
-    // width: 100Vw;
-    // height: 100%;
-    align-items: center;
-    z-index: 101;
-  `;
+
   return (
     <div className="wallet-forgotPassword">
       <BchatWrapperModal
-        title={''}
+        title={window.i18n('forgotPassword')}
         onClose={() => {}}
         showExitIcon={false}
-        showHeader={false}
+        showHeader={true}
         headerReverse={false}
         additionalClassName="walletPassword"
+        isloading={loading}
         okButton={{
           text: window.i18n('save'),
           onClickOkHandler: () => {
@@ -184,24 +174,8 @@ export const BchatWalletForgotPasswordModal = () => {
         </div>
       </div> */}
         <div className="wallet-forgotPassword-content-Box">
-          {loading && (
-            <Loader>
-              <div className="wallet-walletPassword-contentBox-forgotpasswordLoader">
-                <img
-                  src={'images/bchat/Load_animation.gif'}
-                  style={{ width: '150px', height: '150px' }}
-                />
-              </div>
-            </Loader>
-          )}
-
           <div>
-            <SpacerLG />
-            <div className="wallet-forgotPassword-content-Box-title">
-              {window.i18n('forgotPassword')}
-            </div>
-            <SpacerLG />
-            <SpacerLG />
+            <SpacerMD />
             <div className="wallet-forgotPassword-content-Box-seed">
               <textarea
                 value={seed}

diff --git a/ts/components/dialog/EditProfileDialog.tsx b/ts/components/dialog/EditProfileDialog.tsx
@@ -20,6 +20,7 @@ import { sanitizeBchatUsername } from '../../bchat/utils/String';
 import { setLastProfileUpdateTimestamp } from '../../util/storage';
 import { BchatToolTip } from '../leftpane/ActionsPanel';
 import { CopyIconButton } from '../icon/CopyIconButton'
+import {  SpacerXS } from '../basic/Text';
 
 interface State {
   profileName: string;
@@ -347,6 +348,7 @@ export class EditProfileDialog extends React.Component<{}, State> {
             </button>
             <div className="hintTxt" style={{ cursor: 'pointer' }} role='button' onClick={() => window.inboxStore?.dispatch(updateAboutBnsModal({}))}>
               <span> {i18n('readMoreAboutBNS')} </span>
+              <SpacerXS />
               <BchatIcon iconType="infoCircle" iconSize={12} iconColor="#A7A7BA" />
             </div>
           </>

diff --git a/ts/components/wallet/BchatWalletAddressBook.tsx b/ts/components/wallet/BchatWalletAddressBook.tsx
@@ -69,9 +69,9 @@ export const AddressBook = (props: { isContact?: boolean }) => {
   };
 
   return (
-    <div className="addressBook">
+    <div className="addressBook"  >
       {isContact && (
-        <>
+        <div className={classNames( BchatWalletPasswordModal && 'blurBg')}>
           {/* <LeftPaneSectionHeader /> */}
           <SpacerLG />
           {/* {conversations?.length !== 0 && */}
@@ -91,7 +91,7 @@ export const AddressBook = (props: { isContact?: boolean }) => {
           </div>
           <SpacerLG />
           <div className="addressBook-header-txt">{window.i18n('contact')}</div>
-        </>
+        </div>
       )}
 
       {!isContact && (