verdnatura-mirror
/
verdnatura-chat
forked from verdnatura-mirror/Rocket.Chat.ReactNative
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into improvement.typescript-migration

This commit is contained in:
AlexAlexandre 2021-07-15 11:54:30 -03:00
parent b6577de7c2 d1f35bb799
commit 584a16b20e
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/containers/markdown/Link.js
View File

@ -7,15 +7,19 @@ import { themes } from '../../constants/colors';
import { LISTENER } from '../Toast'; import { LISTENER } from '../Toast';
import EventEmitter from '../../utils/events'; import EventEmitter from '../../utils/events';
import I18n from '../../i18n'; import I18n from '../../i18n';
import openLink from '../../utils/openLink';
const Link = React.memo(({ const Link = React.memo(({
children, link, theme, onLinkPress children, link, theme, onLinkPress
}) => { }) => {
const handlePress = () => { const handlePress = () => {
if (!link || !onLinkPress) { if (!link) {
return; return;
} }
onLinkPress(link); if (onLinkPress) {
return onLinkPress(link);
}
openLink(link, theme);
}; };
const childLength = React.Children.toArray(children).filter(o => o).length; const childLength = React.Children.toArray(children).filter(o => o).length;

5
app/lib/methods/getSettings.js
View File

@ -138,9 +138,10 @@ export function subscribeSettings() {
export default async function() { export default async function() {
try { try {
const db = database.active; const db = database.active;
const settingsParams = JSON.stringify(Object.keys(settings).filter(key => !loginSettings.includes(key))); const settingsParams = Object.keys(settings).filter(key => !loginSettings.includes(key));
// RC 0.60.0 // RC 0.60.0
const result = await fetch(`${ this.sdk.client.host }/api/v1/settings.public?query={"_id":{"$in":${ settingsParams }}}`).then(response => response.json()); const result = await fetch(`${ this.sdk.client.host }/api/v1/settings.public?query={"_id":{"$in":${ JSON.stringify(settingsParams) }}}&count=${ settingsParams.length }`)
.then(response => response.json());
if (!result.success) { if (!result.success) {
return; return;