Skip to content

Commit 24cee1b

Browse files
authored
Merge branch 'develop' into fix/api-get-user-roles-legacy
2 parents e026221 + 189a6bc commit 24cee1b

3 files changed

Lines changed: 29 additions & 6 deletions

File tree

packages/react/src/hooks/useRCAuth.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ export const useRCAuth = () => {
6666
console.error('An error occurred while setting up user', e);
6767
dispatchToastMessage({
6868
type: 'error',
69-
message: 'Unable to connect to server. Please check your connection and try again.',
69+
message:
70+
'Unable to connect to server. Please check your connection and try again.',
7071
});
7172
}
7273
};
Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,27 @@
11
export const formatter = [
2-
{ name: 'bold', pattern: '*{{text}}*', tooltip: 'Bold', shortcut: 'Ctrl + B' },
3-
{ name: 'italic', pattern: '_{{text}}_', tooltip: 'Italic', shortcut: 'Ctrl + I' },
4-
{ name: 'strike', pattern: '~{{text}}~', tooltip: 'Strikethrough', shortcut: '' },
2+
{
3+
name: 'bold',
4+
pattern: '*{{text}}*',
5+
tooltip: 'Bold',
6+
shortcut: 'Ctrl + B',
7+
},
8+
{
9+
name: 'italic',
10+
pattern: '_{{text}}_',
11+
tooltip: 'Italic',
12+
shortcut: 'Ctrl + I',
13+
},
14+
{
15+
name: 'strike',
16+
pattern: '~{{text}}~',
17+
tooltip: 'Strikethrough',
18+
shortcut: '',
19+
},
520
{ name: 'code', pattern: '`{{text}}`', tooltip: 'Inline code', shortcut: '' },
6-
{ name: 'multiline', pattern: '```\n{{text}}\n```', tooltip: 'Multi-line code', shortcut: ''}
21+
{
22+
name: 'multiline',
23+
pattern: '```\n{{text}}\n```',
24+
tooltip: 'Multi-line code',
25+
shortcut: '',
26+
},
727
];

packages/react/src/views/ChatInput/ChatInputFormattingToolbar.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,9 @@ const ChatInputFormattingToolbar = ({
296296
if (itemInFormatter) {
297297
return (
298298
<Tooltip
299-
text={`${itemInFormatter.name} ${itemInFormatter.shortcut && `(${itemInFormattershortcut})`}`}
299+
text={`${itemInFormatter.name} ${
300+
itemInFormatter.shortcut && `(${itemInFormatter.shortcut})`
301+
}`}
300302
position="top"
301303
key={`formatter-${itemInFormatter.name}`}
302304
>

0 commit comments

Comments
 (0)