Merge branch 'master' into dev

This commit is contained in:
Mike Cao
2020-09-09 12:06:17 -07:00
5 changed files with 733 additions and 2 deletions

View File

@@ -80,7 +80,9 @@ export default function AccountSettings() {
return (
<>
<PageHeader>
<div>Accounts</div>
<div>
<FormattedMessage id="settings.accounts" defaultMessage="Accounts" />
</div>
<Button icon={<Plus />} size="small" onClick={() => setAddAccount(true)}>
<div>
<FormattedMessage id="button.add-account" defaultMessage="Add account" />