diff --git a/app/queries/servers/role.ts b/app/queries/servers/role.ts index a9dbae709..fae6d2518 100644 --- a/app/queries/servers/role.ts +++ b/app/queries/servers/role.ts @@ -5,7 +5,6 @@ import {Database, Q} from '@nozbe/watermelondb'; import {of as of$, combineLatest} from 'rxjs'; import {switchMap, distinctUntilChanged} from 'rxjs/operators'; -import {logDebug} from '@app/utils/log'; import {Database as DatabaseConstants, General, Permissions} from '@constants'; import {isDMorGM} from '@utils/channel'; import {hasPermission} from '@utils/role'; @@ -69,9 +68,6 @@ export function observePermissionForTeam(database: Database, team: TeamModel | u return observeMyTeam(database, team.id).pipe( switchMap((myTeam) => { const rolesArray = [...user.roles.split(' ')]; - - logDebug(`user.roles: ${user.roles}`); - if (myTeam) { rolesArray.push(...myTeam.roles.split(' ')); } diff --git a/app/screens/convert_gm_to_channel/convert_gm_to_channel_form/no_common_teams_form.tsx b/app/screens/convert_gm_to_channel/convert_gm_to_channel_form/no_common_teams_form.tsx index 8e37d4e29..868f40785 100644 --- a/app/screens/convert_gm_to_channel/convert_gm_to_channel_form/no_common_teams_form.tsx +++ b/app/screens/convert_gm_to_channel/convert_gm_to_channel_form/no_common_teams_form.tsx @@ -32,15 +32,15 @@ export const NoCommonTeamForm = ({ defaultMessage: 'Group Message cannot be converted to a channel because members are not a part of the same team. Add all members to a single team to convert this group message to a channel.', }); - const handleOnPress = useCallback(preventDoubleTap(() => { - popTopScreen(); - }), []); - const buttonText = formatMessage({ id: 'generic.back', defaultMessage: 'back', }); + const handleOnPress = useCallback(preventDoubleTap(() => { + popTopScreen(); + }), []); + return (