Merge branch 'main' of github.com:standardnotes/app

This commit is contained in:
Aman Harwara
2023-01-05 01:23:24 +05:30
45 changed files with 214 additions and 73 deletions

View File

@@ -14,7 +14,6 @@ import { ApplicationGroup } from '@/Application/ApplicationGroup'
import { formatLastSyncDate } from '@/Utils/DateUtils'
import Spinner from '@/Components/Spinner/Spinner'
import { MenuItemIconSize } from '@/Constants/TailwindClassNames'
import { MutuallyExclusiveMediaQueryBreakpoints, useMediaQuery } from '@/Hooks/useMediaQuery'
type Props = {
viewControllerManager: ViewControllerManager
@@ -85,22 +84,9 @@ const GeneralAccountMenu: FunctionComponent<Props> = ({
setMenuPane(AccountMenuPane.SignIn)
}, [setMenuPane])
const openFileSend = useCallback(() => {
const link = 'https://filesend.standardnotes.com/'
if (application.isNativeMobileWeb()) {
application.mobileDevice().openUrl(link)
return
}
window.open(link, '_blank')
}, [application])
const CREATE_ACCOUNT_INDEX = 1
const SWITCHER_INDEX = 0
const isMobileScreen = useMediaQuery(MutuallyExclusiveMediaQueryBreakpoints.sm)
return (
<>
<div className="mt-1 mb-1 flex items-center justify-between px-3">
@@ -186,12 +172,6 @@ const GeneralAccountMenu: FunctionComponent<Props> = ({
</div>
<span className="text-neutral">v{application.version}</span>
</MenuItem>
{isMobileScreen && (
<MenuItem onClick={openFileSend}>
<Icon type="open-in" className={iconClassName} />
Open FileSend
</MenuItem>
)}
<MenuItem onClick={() => viewControllerManager.isImportModalVisible.set(true)}>
<Icon type="archive" className={iconClassName} />
Import

View File

@@ -89,7 +89,7 @@ const ApplicationView: FunctionComponent<Props> = ({ application, mainApplicatio
return
}
void application.sessions.populateSessionFromDemoShareToken(token)
void application.user.populateSessionFromDemoShareToken(token)
}, [application])
const onAppLaunch = useCallback(() => {