Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,22 @@ const ConfirmPassword: FunctionComponent<Props> = ({ setMenuPane, email, passwor
const confirmPasswordForm = (
<>
<div className="mb-3 px-3 text-sm">
{c('Info').jt`Because your notes are encrypted using your password, ${(
<span className="text-danger">Standard Notes does not have a password reset option</span>
)}. If you forget your password, you will permanently lose access to your data.`}
{
// translator: Full sentence: "Because your notes are encrypted using your password, Standard Notes does not have a password reset option. If you forget your password, you will permanently lose access to your data."
c('Info').t`Because your notes are encrypted using your password,`
}{' '}
{
<span className="text-danger">
{
// translator: Full sentence: "Because your notes are encrypted using your password, Standard Notes does not have a password reset option. If you forget your password, you will permanently lose access to your data."
c('Info').t`Standard Notes does not have a password reset option`
}
</span>
}
{
// translator: Full sentence: "Because your notes are encrypted using your password, Standard Notes does not have a password reset option. If you forget your password, you will permanently lose access to your data."
c('Info').t`. If you forget your password, you will permanently lose access to your data.`
}
</div>
<form onSubmit={handleConfirmFormSubmit} className="mb-1 px-3">
{!isRegistering && (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import { FunctionComponent, useEffect, useState } from 'react'
import PreferencesGroup from '@/Components/Preferences/PreferencesComponents/PreferencesGroup'
import PreferencesSegment from '@/Components/Preferences/PreferencesComponents/PreferencesSegment'
import { useApplication } from '@/Components/ApplicationProvider'
import { SubscriptionManagerEvent, Subscription } from '@standardnotes/snjs'
import { SubscriptionManagerEvent, Subscription as SubscriptionType } from '@standardnotes/snjs'

const Subscription: FunctionComponent = () => {
const application = useApplication()

const [onlineSubscription, setOnlineSubscription] = useState<Subscription | undefined>(
const [onlineSubscription, setOnlineSubscription] = useState<SubscriptionType | undefined>(
application.subscriptionController.onlineSubscription,
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,14 @@ const CreateAccount: FunctionComponent<Props> = ({ application }) => {
<DiamondIcon className="absolute -right-2 top-0 -z-[1] h-18 w-18 translate-x-1/2" />

<div className="mr-0 lg:mr-12">
// translator: Full sentence: "Create your free account"
<h1 className="mb-2 mt-0 text-2xl font-bold">{c('Title').t`Create your free account`}</h1>
// translator: Full sentence: "Create your free account to continue to Standard Notes."
<div className="mb-4 text-sm font-medium">{c('Info').t`to continue to Standard Notes.`}</div>
{
// translator: Full sentence: "Create your free account"
<h1 className="mb-2 mt-0 text-2xl font-bold">{c('Title').t`Create your free account`}</h1>
}
{
// translator: Full sentence: "Create your free account to continue to Standard Notes."
<div className="mb-4 text-sm font-medium">{c('Info').t`to continue to Standard Notes.`}</div>
}
{captchaURL ? captchaIframe : CreateAccountForm}
<div className="flex flex-col-reverse items-start justify-between md:flex-row md:items-center">
<div className="flex flex-col">
Expand All @@ -210,8 +214,10 @@ const CreateAccount: FunctionComponent<Props> = ({ application }) => {
disabled={isCreatingAccount}
className="mb-2 flex cursor-pointer items-start border-0 bg-default p-0 font-medium text-info hover:underline"
>
// translator: "Instead" here refers to "instead of creating an account"
{c('Action').t`Sign in instead`}
{
// translator: "Instead" here refers to "instead of creating an account"
c('Action').t`Sign in instead`
}
</button>
{!application.isNativeIOS() && (
<button
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,14 +168,13 @@ const SignIn: FunctionComponent<Props> = ({ application }) => {
<div className="mb-4 text-sm font-medium">{c('Info').t`to continue to Standard Notes.`}</div>
{showCaptcha ? captchaIframe : signInForm}
<div className="text-sm font-medium text-passive-1">
{c('Info').jt`Don’t have an account yet? ${(
<a
className={`text-info ${isSigningIn ? 'cursor-not-allowed' : 'cursor-pointer '}`}
onClick={handleCreateAccountInstead}
>
{c('Action').t`Create account`}
</a>
)}`}
{c('Info').t`Don’t have an account yet?`}{' '}
<a
className={`text-info ${isSigningIn ? 'cursor-not-allowed' : 'cursor-pointer '}`}
onClick={handleCreateAccountInstead}
>
{c('Action').t`Create account`}
</a>
</div>
</div>
</div>
Expand Down
12 changes: 6 additions & 6 deletions packages/web/src/javascripts/Components/Table/Table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { KeyboardKey } from '@standardnotes/ui-services'
import { useCallback, useState, useRef } from 'react'
import { useApplication } from '../ApplicationProvider'
import Icon from '../Icon/Icon'
import { Table, TableRow } from './CommonTypes'
import { Table as TableType, TableRow as TableRowType } from './CommonTypes'

function TableRow<Data>({
row,
Expand All @@ -13,12 +13,12 @@ function TableRow<Data>({
handleRowContextMenu,
handleActivateRow,
}: {
row: TableRow<Data>
row: TableRowType<Data>
index: number
canSelectRows: Table<Data>['canSelectRows']
canSelectRows: TableType<Data>['canSelectRows']
handleRowClick: (event: React.MouseEvent<HTMLDivElement, MouseEvent>, id: string) => void
handleRowContextMenu: Table<Data>['handleRowContextMenu']
handleActivateRow: Table<Data>['handleActivateRow']
handleRowContextMenu: TableType<Data>['handleRowContextMenu']
handleActivateRow: TableType<Data>['handleActivateRow']
}) {
const [isHovered, setIsHovered] = useState(false)
const [isFocused, setIsFocused] = useState(false)
Expand Down Expand Up @@ -96,7 +96,7 @@ const MinRowsToDisplay = 20
const PageSize = Math.ceil(document.documentElement.clientHeight / MinTableRowHeight) || MinRowsToDisplay
const PageScrollThreshold = 200

function Table<Data>({ table }: { table: Table<Data> }) {
function Table<Data>({ table }: { table: TableType<Data> }) {
const application = useApplication()

const [rowsToDisplay, setRowsToDisplay] = useState<number>(PageSize)
Expand Down
Loading