Remove demo wallet login option from production UI

vacuumlabs · Jun 10, 2021 · e3c87a5 · e3c87a5
1 parent aab09a2
commit e3c87a5
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 83 deletions.
diff --git a/app/frontend/actions/general.ts b/app/frontend/actions/general.ts
@@ -98,12 +98,6 @@ export default (store: Store) => {
     setState({authMethod})
   }
 
-  const closeDemoWalletWarningDialog = (state) => {
-    setState({
-      shouldShowDemoWalletWarningDialog: false,
-    })
-  }
-
   const closeNonShelleyCompatibleDialog = (state) => {
     setState({
       shouldShowNonShelleyCompatibleDialog: false,
@@ -142,7 +136,6 @@ export default (store: Store) => {
     closeInfoModal,
     closePremiumBanner,
     setAuthMethod,
-    closeDemoWalletWarningDialog,
     closeNonShelleyCompatibleDialog,
     openNonShelleyCompatibleDialog,
     closeWalletLoadingErrorModal,

diff --git a/app/frontend/actions/wallet.ts b/app/frontend/actions/wallet.ts
@@ -108,7 +108,6 @@ export default (store: Store) => {
         await mnemonicToWalletSecretDef(ADALITE_CONFIG.ADALITE_DEMO_WALLET_MNEMONIC)
       ).rootSecret
       const isDemoWallet = walletSecretDef && walletSecretDef.rootSecret.equals(demoRootSecret)
-      const autoLogin = state.autoLogin
       setState({
         validStakepoolDataProvider,
         accountsInfo,
@@ -123,7 +122,6 @@ export default (store: Store) => {
         },
         hwWalletName,
         isDemoWallet,
-        shouldShowDemoWalletWarningDialog: isDemoWallet && !autoLogin,
         shouldShowNonShelleyCompatibleDialog: !isShelleyCompatible,
         shouldShowWantedAddressesModal,
         shouldShowGenerateMnemonicDialog: false,

diff --git a/app/frontend/components/pages/login/demoWalletWarningDialog.tsx b/app/frontend/components/pages/login/demoWalletWarningDialog.tsx
diff --git a/app/frontend/components/pages/login/loginPage.tsx b/app/frontend/components/pages/login/loginPage.tsx
@@ -2,11 +2,9 @@ import {h} from 'preact'
 import {useState, useEffect} from 'preact/hooks'
 import {useSelector, useActions} from '../../../helpers/connect'
 import actions from '../../../actions'
-import isLeftClick from '../../../helpers/isLeftClick'
 import KeyFileAuth from './keyFileAuth'
 import MnemonicAuth from './mnemonicAuth'
 import HardwareAuth from './hardwareAuth'
-import DemoWalletWarningDialog from './demoWalletWarningDialog'
 import GenerateMnemonicDialog from './generateMnemonicDialog'
 import LogoutNotification from './logoutNotification'
 import LoginPageSidebar from './loginPageSidebar'
@@ -205,7 +203,6 @@ const LoginPage = () => {
   const toggleDropdown = () => setIsDropdownOpen(!isDropdownOpen)
   const {
     authMethod,
-    shouldShowDemoWalletWarningDialog,
     logoutNotificationOpen,
     walletLoadingError,
     shouldShowGenerateMnemonicDialog,
@@ -215,7 +212,6 @@ const LoginPage = () => {
     errorBannerContent,
   } = useSelector((state: State) => ({
     authMethod: state.authMethod,
-    shouldShowDemoWalletWarningDialog: state.shouldShowDemoWalletWarningDialog,
     logoutNotificationOpen: state.logoutNotificationOpen,
     walletLoadingError: state.walletLoadingError,
     shouldShowGenerateMnemonicDialog: state.shouldShowGenerateMnemonicDialog,
@@ -226,7 +222,6 @@ const LoginPage = () => {
   }))
   const {
     closeStakingBanner,
-    loadDemoWallet,
     setAuthMethod,
     closeWalletLoadingErrorModal,
     loadErrorBannerContent,
@@ -255,15 +250,8 @@ const LoginPage = () => {
               toggleDropdown={toggleDropdown}
             />
           )}
-          <div className="page-demo">
-            Try the{' '}
-            <a href="#" onMouseDown={(e) => isLeftClick(e, loadDemoWallet)}>
-              demo wallet
-            </a>
-          </div>
         </main>
         <LoginPageSidebar />
-        {shouldShowDemoWalletWarningDialog && <DemoWalletWarningDialog />}
         {shouldShowGenerateMnemonicDialog && <GenerateMnemonicDialog />}
         {logoutNotificationOpen && <LogoutNotification />}
         {shouldShowWalletLoadingErrorModal && (

diff --git a/app/frontend/components/pages/login/mnemonicAuth.tsx b/app/frontend/components/pages/login/mnemonicAuth.tsx
@@ -13,19 +13,14 @@ import {useEffect, useRef} from 'preact/hooks'
 const {ADALITE_DEMO_WALLET_MNEMONIC} = ADALITE_CONFIG
 
 const MnemonicAuth = (): h.JSX.Element => {
-  const {
-    formData,
-    shouldShowMnemonicInfoAlert,
-    autoLogin,
-    displayWelcome,
-    shouldShowDemoWalletWarningDialog,
-  } = useSelector((state) => ({
-    formData: state.mnemonicAuthForm,
-    displayWelcome: state.displayWelcome,
-    shouldShowDemoWalletWarningDialog: state.shouldShowDemoWalletWarningDialog,
-    shouldShowMnemonicInfoAlert: state.shouldShowMnemonicInfoAlert,
-    autoLogin: state.autoLogin,
-  }))
+  const {formData, shouldShowMnemonicInfoAlert, autoLogin, displayWelcome} = useSelector(
+    (state) => ({
+      formData: state.mnemonicAuthForm,
+      displayWelcome: state.displayWelcome,
+      shouldShowMnemonicInfoAlert: state.shouldShowMnemonicInfoAlert,
+      autoLogin: state.autoLogin,
+    })
+  )
   const {
     updateMnemonic,
     updateMnemonicValidationError,
@@ -37,10 +32,10 @@ const MnemonicAuth = (): h.JSX.Element => {
   const goBtn = useRef<HTMLButtonElement>(null)
 
   useEffect(() => {
-    if (!formData.mnemonicInputValue && !displayWelcome && !shouldShowDemoWalletWarningDialog) {
+    if (!formData.mnemonicInputValue && !displayWelcome) {
       mnemonicField.current.focus()
     }
-  }, [formData.mnemonicInputValue, displayWelcome, shouldShowDemoWalletWarningDialog])
+  }, [formData.mnemonicInputValue, displayWelcome])
 
   useEffect(() => {
     // meant only for development in order to speed up the process of unlocking wallet

diff --git a/app/frontend/components/router.tsx b/app/frontend/components/router.tsx
@@ -11,11 +11,10 @@ import StakingPage from './pages/staking/stakingPage'
 const TopLevelRouter = connect((state) => ({
   pathname: state.router.pathname,
   walletIsLoaded: state.walletIsLoaded,
-  shouldShowDemoWalletWarningDialog: state.shouldShowDemoWalletWarningDialog,
-}))(({pathname, walletIsLoaded, shouldShowDemoWalletWarningDialog}) => {
+}))(({pathname, walletIsLoaded}) => {
   // unlock not wrapped in main
   const currentTab = pathname.split('/')[1]
-  if ((!walletIsLoaded || shouldShowDemoWalletWarningDialog) && currentTab !== 'staking') {
+  if (!walletIsLoaded && currentTab !== 'staking') {
     window.history.pushState({}, '/', '/')
     return <LoginPage />
   }

diff --git a/app/frontend/state.ts b/app/frontend/state.ts
@@ -42,7 +42,6 @@ export interface State {
   // login / logout
   autoLogin: boolean
   authMethod: AuthMethodType | null
-  shouldShowDemoWalletWarningDialog: boolean
   logoutNotificationOpen: boolean
   walletIsLoaded: boolean
   isShelleyCompatible: any
@@ -155,7 +154,6 @@ const initialState: State = {
   authMethod: ['#trezor', '#hw-wallet'].includes(window.location.hash)
     ? AuthMethodType.HW_WALLET
     : null,
-  shouldShowDemoWalletWarningDialog: false,
   logoutNotificationOpen: false,
   walletIsLoaded: false,
   isShelleyCompatible: true,

diff --git a/app/tests/src/actions/wallet-actions.js b/app/tests/src/actions/wallet-actions.js
@@ -23,7 +23,6 @@ const expectedStateChanges = {
   },
   hwWalletName: null,
   isDemoWallet: false,
-  shouldShowDemoWalletWarningDialog: false,
   shouldShowGenerateMnemonicDialog: false,
   // send form
   sendAmount: {assetFamily: AssetFamily.ADA, fieldValue: '', coins: 0},