rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: reviewer's comments

Browse Source 
- cleanup event observers in `useEffect`
- other small changes
This commit is contained in:
VardanHakobyan
2021-06-09 12:09:55 +04:00
parent 1e7dbb9b14
commit 7c35f41f9e
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/assets/javascripts/components/AccountMenu.tsx
View File

@@ -102,12 +102,13 @@ const AccountMenu = observer(({ application, appState }: Props) => {
const [user, setUser] = useState(application.getUser()); const [user, setUser] = useState(application.getUser());
const [canAddPasscode, setCanAddPasscode] = useState(!application.isEphemeralSession()); const [canAddPasscode, setCanAddPasscode] = useState(!application.isEphemeralSession());
const [hasProtections] = useState(application.hasProtectionSources()); const [hasProtections] = useState(application.hasProtectionSources());
const [notesAndTagsCount] = useState(appState.accountMenu.notesAndTagsCount);
const [isEmailFocused, setIsEmailFocused] = useState(false); const [isEmailFocused, setIsEmailFocused] = useState(false);
const [isPasscodeFocused, setIsPasscodeFocused] = useState(false); const [isPasscodeFocused, setIsPasscodeFocused] = useState(false);
const refreshedCredentialState = () => { const { notesAndTagsCount } = appState.accountMenu;
const refreshCredentialState = () => {
setUser(application.getUser()); setUser(application.getUser());
setCanAddPasscode(!application.isEphemeralSession()); setCanAddPasscode(!application.isEphemeralSession());
setHasPasscode(application.hasPasscode()); setHasPasscode(application.hasPasscode());
@@ -497,9 +498,9 @@ const AccountMenu = observer(({ application, appState }: Props) => {
// Add the required event observers // Add the required event observers
useEffect(() => { useEffect(() => {
application.addEventObserver( const removeAppLaunchedObserver = application.addEventObserver(
async () => { async () => {
refreshedCredentialState(); refreshCredentialState();
loadHost(); loadHost();
reloadAutoLockInterval(); reloadAutoLockInterval();
refreshEncryptionStatus(); refreshEncryptionStatus();
@@ -507,19 +508,25 @@ const AccountMenu = observer(({ application, appState }: Props) => {
ApplicationEvent.Launched ApplicationEvent.Launched
); );
application.addEventObserver( const removeKeyStatusChangedObserver = application.addEventObserver(
async () => { async () => {
refreshedCredentialState(); refreshCredentialState();
}, },
ApplicationEvent.KeyStatusChanged ApplicationEvent.KeyStatusChanged
); );
application.addEventObserver( const removeProtectionSessionExpiryDateChangedObserver = application.addEventObserver(
async () => { async () => {
setProtectionsDisabledUntil(getProtectionsDisabledUntil()) setProtectionsDisabledUntil(getProtectionsDisabledUntil());
}, },
ApplicationEvent.ProtectionSessionExpiryDateChanged ApplicationEvent.ProtectionSessionExpiryDateChanged
) );
return () => {
removeAppLaunchedObserver();
removeKeyStatusChangedObserver();
removeProtectionSessionExpiryDateChangedObserver();
}
}, []); }, []);
// `reloadAutoLockInterval` gets interval asynchronously, therefore we call `useEffect` to set initial // `reloadAutoLockInterval` gets interval asynchronously, therefore we call `useEffect` to set initial