aboutsummaryrefslogtreecommitdiffstats
path: root/src/components
diff options
context:
space:
mode:
Diffstat (limited to 'src/components')
-rw-r--r--src/components/auth/Locked.tsx6
-rw-r--r--src/components/ui/imageUpload/index.tsx6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/components/auth/Locked.tsx b/src/components/auth/Locked.tsx
index 00ff5a4c5..34d010782 100644
--- a/src/components/auth/Locked.tsx
+++ b/src/components/auth/Locked.tsx
@@ -18,10 +18,6 @@ const messages = defineMessages({
18 id: 'locked.touchId', 18 id: 'locked.touchId',
19 defaultMessage: 'Unlock with Touch ID', 19 defaultMessage: 'Unlock with Touch ID',
20 }, 20 },
21 touchIdPrompt: {
22 id: 'locked.touchIdPrompt',
23 defaultMessage: 'Unlock with Touch ID',
24 },
25 passwordLabel: { 21 passwordLabel: {
26 id: 'locked.password.label', 22 id: 'locked.password.label',
27 defaultMessage: 'Password', 23 defaultMessage: 'Password',
@@ -80,7 +76,7 @@ class Locked extends Component<IProps> {
80 const { intl } = this.props; 76 const { intl } = this.props;
81 77
82 systemPreferences 78 systemPreferences
83 .promptTouchID(intl.formatMessage(messages.touchIdPrompt)) 79 .promptTouchID(intl.formatMessage(messages.touchId))
84 .then(() => { 80 .then(() => {
85 this.props.unlock(); 81 this.props.unlock();
86 }); 82 });
diff --git a/src/components/ui/imageUpload/index.tsx b/src/components/ui/imageUpload/index.tsx
index 4a2a9b60f..89e2c65a2 100644
--- a/src/components/ui/imageUpload/index.tsx
+++ b/src/components/ui/imageUpload/index.tsx
@@ -132,7 +132,11 @@ class ImageUpload extends Component<IProps, IState> {
132 onDropAccepted={this.onDropAccepted.bind(this)} 132 onDropAccepted={this.onDropAccepted.bind(this)}
133 onDropRejected={this.onDropRejected.bind(this)} 133 onDropRejected={this.onDropRejected.bind(this)}
134 multiple={multiple} 134 multiple={multiple}
135 accept="image/jpeg, image/png, image/svg+xml" 135 accept={{
136 'image/jpeg': ['.jpeg', '.jpg'],
137 'image/png': ['.png'],
138 'image/svg+xml': ['.svg'],
139 }}
136 minSize={0} 140 minSize={0}
137 maxSize={maxSize} 141 maxSize={maxSize}
138 maxFiles={maxFiles} 142 maxFiles={maxFiles}