create new wallet fixes

decred · Jun 23, 2020 · 0585366 · 0585366
1 parent 147f7a7
commit 0585366
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 260 deletions.
diff --git a/app/components/shared/CreatePassPhrase/PassPhraseInputs.js b/app/components/shared/CreatePassPhrase/PassPhraseInputs.js
diff --git a/app/components/shared/CreatePassPhrase/index.js b/app/components/shared/CreatePassPhrase/index.js
diff --git a/app/components/shared/index.js b/app/components/shared/index.js
@@ -15,7 +15,7 @@ export { default as PoliteiaLink } from "./PoliteiaLink";
 export { default as WatchOnlyWarnNotification } from "./WatchOnlyWarnNotification";
 export { default as Subtitle } from "./Subtitle";
 export { default as FormattedRelative } from "./FormattedRelative";
-export { default as CreatePassPhrase } from "./CreatePassPhrase";
+export { default as CreatePassPhrase } from "./CreatePassPhrase/CreatePassPhrase";
 export { default as UnsignedTx } from "./UnsignedTx";
 export { default as TxHistory } from "./TxHistory/TxHistory";
 export { default as LoadingError } from "./LoadingError";

diff --git a/app/components/views/GetStartedPage/CreateWalletPage/ConfirmSeed/ConfirmSeed.jsx b/app/components/views/GetStartedPage/CreateWalletPage/ConfirmSeed/ConfirmSeed.jsx
@@ -57,7 +57,7 @@ class ConfirmSeed extends React.Component {
       word: update,
       show: seedWord.show,
       index: seedWord.index,
-      match: splitMnemonic[seedWord.index] == update
+      match: splitMnemonic[seedWord.index] === update
     };
     this.setState({ seedWords: updatedSeedWords }, () => {
       const seedWordStr = seedWords.map((seedWord) => seedWord.word).join(" ");

diff --git a/app/components/views/GetStartedPage/CreateWalletPage/ConfirmSeed/Form.jsx b/app/components/views/GetStartedPage/CreateWalletPage/ConfirmSeed/Form.jsx
@@ -52,14 +52,14 @@ export const ConfirmSeedForm = ({
                 styles.seedWord,
                 seedWord.show && styles.filled,
                 !seedWord.show &&
-                  seedWord.word != "" &&
+                  seedWord.word !== "" &&
                   seedWord.match &&
                   styles.match,
                 !seedWord.show &&
-                  seedWord.word != "" &&
+                  seedWord.word !== "" &&
                   !seedWord.match &&
                   styles.noMatch,
-                !seedWord.show && seedWord.word != "" && styles.empty
+                !seedWord.show && seedWord.word === "" && styles.empty
               )}>
               <span className={styles.number}>{seedWord.index + 1}.</span>
               <span className={styles.word}>
@@ -70,7 +70,7 @@ export const ConfirmSeedForm = ({
                     disabled={seedWord.show}
                     onChange={onChangeSeedWord}
                     seedWord={seedWord}
-                    className={styles.selectMenuWithArrow}
+                    className="Select-menu-with-arrow" // this gonna change when moving to pi-ui's Select
                     value={{ name: seedWord.word }}
                   />
                 )}

diff --git a/app/components/views/GetStartedPage/CreateWalletPage/CreateWallet.module.css b/app/components/views/GetStartedPage/CreateWalletPage/CreateWallet.module.css
@@ -91,12 +91,12 @@
   color: var(--seedword-select-border-default-hover-text-color);
 }
 
-.seedWord.no-match,
+.seedWord.noMatch,
 .seedWord.error {
   border: 1px solid var(--error-red);
 }
 
-.seedWord.no-match .number,
+.seedWord.noMatch .number,
 .seedWord.error .number {
   border-right: 1px solid var(--error-red);
   color: var(--error-red);
@@ -145,10 +145,6 @@
   margin-bottom: 30px;
 }
 
-.passphrase {
-  height: 50px;
-}
-
 .confirmSeedLabel {
   margin-top: 8px;
   margin-right: 10px;
@@ -161,10 +157,6 @@
   text-align: right;
 }
 
-.passphrase .confirmSeedLabel {
-  margin-top: 1px;
-}
-
 .createWalletButtonContainer {
   height: 44px;
   width: 293px;
@@ -207,11 +199,6 @@
   font-weight: 400;
 }
 
-.inputPrivatePassword {
-  width: 288px;
-  padding-bottom: 3px;
-}
-
 .goBackButton {
   color: var(--home-content-link);
 }
@@ -248,41 +235,6 @@
   display: block;
 }
 
-.selectArrow {
-  border: none;
-  display: inherit;
-  height: 0;
-  width: 0;
-  position: relative;
-  transition: inherit;
-}
-
-.selectControl:hover:not(:disabled) {
-  border: inherit;
-}
-
-.selectControl:hover:not(:disabled) .Select-arrow {
-  border-top-color: inherit;
-}
-
-.isOpen .selectArrow,
-.isOpen .selectControl:hover:not(:disabled) .selectArrow,
-.selectArrowZone:hover > .selectArrow {
-  border-top-color: inherit;
-}
-
-.selectControl {
-  padding-left: 2px;
-  border-radius: 3px;
-  color: var(--modal-bottom);
-  border-bottom: none;
-}
-
-.selectControl:hover,
-.selectControl:focus {
-  border: 1px solid var(--disabled-color);
-}
-
 .buttonArea {
   margin-left: 22px;
   margin-top: 189px;

diff --git a/app/components/views/GetStartedPage/CreateWalletPage/ExistingSeed/Form.jsx b/app/components/views/GetStartedPage/CreateWalletPage/ExistingSeed/Form.jsx
@@ -69,7 +69,7 @@ const ExistingSeedForm = ({
                     seedWord={seedWord}
                     value={{ name: seedWord.word }}
                     key={index}
-                    className={styles.selectMenuWithArrow}
+                    className="Select-menu-with-arrow" // this gonna change when moving to pi-ui's Select
                     onPasteFromClipboard={pasteFromClipboard}
                   />
                 </span>

diff --git a/app/components/views/GetStartedPage/GetStarted.module.css b/app/components/views/GetStartedPage/GetStarted.module.css
@@ -511,25 +511,6 @@
   background-image: var(--restore-wallet-icon);
 }
 
-.selectControl {
-  padding-left: 0;
-}
-
-.selectValue {
-  padding-left: 0;
-}
-
-.selectInput {
-  height: 23px;
-  line-height: 23px;
-  vertical-align: initial;
-}
-
-.selectMenuOuter {
-  left: -27px;
-  width: calc(100% + 28px);
-}
-
 .contentTitle {
   font-size: 27px;
   line-height: 34px;

diff --git a/app/components/views/GetStartedPage/Settings/Settings.jsx b/app/components/views/GetStartedPage/Settings/Settings.jsx
@@ -38,10 +38,10 @@ const SetttingsForm = ({ onSendBack }) => {
   }, [onSaveSettings, onSendBack, tempSettings, setThemeName]);
   return (
     <>
-      <div className="logs settings">
-        <div className="go-back-screen-button-area">
+      <div className={classNames(styles.logs, styles.settings)}>
+        <div className={styles.goBackScreenButtonArea}>
           <Tooltip text={<GoBackMsg />}>
-            <div className="go-back-screen-button" onClick={onSendBack} />
+            <div className={styles.goBackScreenButton} onClick={onSendBack} />
           </Tooltip>
         </div>
         <Subtitle title={<T id="settings.subtitle" m="Settings" />} />

diff --git a/app/index.js b/app/index.js
@@ -11,6 +11,9 @@ import locales from "./i18n/locales";
 import "pi-ui/dist/index.css";
 import "./style/main.less";
 import "./style/ReactSelectGlobal.less";
+// SeedWordSelect.css includes custom styling for seed word select which need to be loaded *after*
+// ReactSelectGlobal.less, both imports should be deleted when migrating to pi-ui's Select componentt!
+import "components/views/GetStartedPage/CreateWalletPage/SeedWordSelect.css";
 import pkg from "./package.json";
 import { log } from "./wallet";
 import { ipcRenderer } from "electron";