# Conflicts:
#	android/app/build.gradle
#	app/i18n/locales/en.json
#	app/lib/constants/colors.js
#	app/lib/constants/colors.ts
#	app/lib/constants/links.js
#	app/lib/constants/links.ts
#	app/lib/rocketchat/rocketchat.js
#	app/sagas/state.js
#	app/views/SettingsView/index.tsx
#	ios/Podfile.lock
#	ios/RocketChatRN.xcodeproj/project.pbxproj
#	ios/RocketChatRN/Info.plist
#	ios/ShareRocketChatRN/Info.plist
#	ios/fastlane/Fastfile
#	package.json
#	yarn.lock

* create index file

* remove roomTypeToApiType from rocketchat and fix imports

* move TOKEN_KEY to const file

* move CURRENT_SERVER to const file

* move CERTIFICATE_KEY to const file

* getRoom

* rename getSlashCommands

* getSlashCommands

* readMessages

* getRooms

* loadThreadMessages

* loadNextMessages

* loadSurroundingMessages

* loadMessagesForRoom

* loadMissedMessages

* clearCache

* canOpenRoom

* setUser

* userPreferencesMethods

* getCustomEmojis

* callJtisi

* triggerActions

* getPermissions

* getRoles

* getSettings

* getUsersPresence

* logout

* sendFileMessage

* shareExtension

* sendMessage

* enterpriseModules

* getPermalinks

* search

* change RocketChat.metodo to direct call

* fix types

* Fix login

* Fix createChannel

* migrate service methods to Service.method call

* change call directly to RocketChat because the use of this

* rollback

* rollback

* fix create discussion

* fix import

Co-authored-by: Diego Mello <diegolmello@gmail.com>

* fix: users search on `CreateDiscussionView`

* chore: increased readability for `getUsers` function

* reinstall react native and pods

* anotation of the react native package to the branch fix-ios-connections

* fix makes the correct point to the address of the lib

* chore: evaluate `RoomItem`

* update: `RoomItem.storyshot`

* update: interfaces for RoomItem components

* update: UnreadBadge import and RoomItem interfaces

* remove: `avatarSize` from interfaces

* update: `RoomItem.storyshot`

* [CHORE] Change circleci to cimg

* tweak build experimental

* testing images

* tweak cimg

* fix: avatar's size

* update snapshot

* update: snapshots

Co-authored-by: GleidsonDaniel <gleidson10daniel@hotmail.com>

* [NEW] Implementing On-Hold Livechat for Omnichannel

* added onHold to database

* list header title open livechats

* update rooms list view

* remove placeOnHold after clicked

* fix mesasgebox reactive to on hold

* navigate to roomslistview

* minor tweaks

* for grouping too

* fix chat on-hold when the agent is fully

* show on hold system messages

* [IMPROVE] Accept url to user avatar from external provider

* fix avatar sidebar

* [FIX] Omnichannel chat is broken the first time is taken

* refactor how to get a room from db

* [IMPROVE] Visibility of the “incoming chats” in queue

* fix the custom icon for rtl

* fix thumb colors

* clean queue empty

* added alert to confirm enable omnichannel

* switch to normal

* fix storyshot because was added a new props to list item

* fix height container

* minor tweak

* minor tweak

* fix title

* Chore: Evaluate UserItem to Typescript and moved from presentation to container

* minor tweak

* [IMPROVE] Support Channel Icons for Omnichannel

* Prop drilling sourceType

* create a column for source in WatermelonDB

* Add sms icon

* start of fetching

* removed usefetch

* custom icon to RoomHeader, RoomActions, RoomInfo

* minor tweak in interface

* fix margin

* add connected to sourceType

* make ts happy

* minor tweak

* fix storyshot

* refactor omnichannel source interface

* minor tweak roomActionsview

* Added storyshot

* minor tweak

* fix storyshot

* fix display extended without avatar

* fix connected object

* wip android build

Co-authored-by: Diego Mello <diegolmello@gmail.com>
Co-authored-by: GleidsonDaniel <gleidson10daniel@hotmail.com>

* Chore: Migrate i18n to Typescript and fix the Left and Right actions in RoomItem

* remove fix to roomItem

* update storyshot

* Chore: Migrate i18n to Typescript and fix the Left and Right actions in RoomItem

* remove fix to roomItem

* update storyshot

* fix removed itens

* fix changes requested

* interface for i18n, added resolveJsonModule to tsconfig.json

* tweak at error alert

* fix storyshot

* refactor comments

* create function isTranslated

* fix accessibilityLabel

Co-authored-by: Diego Mello <diegolmello@gmail.com>

Co-authored-by: Diego Mello <diegolmello@gmail.com>

* chore: move `notifications/push` to `lib/notifications/push`

* update: move `lib/notifications/push` to `lib/notifications`

* remove: push.ios.ts

* chore: update `theme` type

* update: components

* update: storyshots

* add: `theme` type to `DirectoryItem`

* chore: update theme type on `message/index.tsx`

* update: `RoomTypeIcon`'s useTheme

Co-authored-by: Diego Mello <diegolmello@gmail.com>

* Chore: Evaluate UserItem - TypeScript

* fix storyshot

* minor tweaks

* tweaks on comments

* fix storyshot

* move useritem from presentation to containers

* remove comments

* [FIX] Create a discussion from NewMessageView

* fix the itemData.value to any

* minor tweak

* Chore: Upgrade @types/react-native to 0.64.2

* minor tweak in comment

* minor tweak

* Chore: Upgrade @types/react-native to 0.64.2

* minor tweak in comment

* minor tweak

* fix accessibility within bordelessbutton

* chore: evaluate DirectoryItem

* chore: move `DirectoryItem` to `containers`

* update: `themes` import

Co-authored-by: Diego Mello <diegolmello@gmail.com>

* chore: evaluate ServerItem

* update: IServerInfo interface

* chore: move `ServerItem` to `containers` folder

* update: `ServerItem` import on Storybook

* update: `themes` import

* move services to lib

* move methods to lib

* fix imports

* update: type for user

* update: LanguageView's user type

* update: UserNotificationPreferencesView's user

* chore: set `enableMessageParserEarlyAdoption` as non-optional

Co-authored-by: Diego Mello <diegolmello@gmail.com>

* create keys file and export all consts

* fix import E2E_MESSAGE_TYPE

* fix constants import

* fix constants import

* fix E2E_BANNER_TYPE import

* fix E2E_ROOM_TYPES import

* fix THEME_PREFERENCES_KEY import

* fix CRASH_REPORT_KEY and ANALYTICS_EVENTS_KEY import

* fix MIN_ROCKETCHAT_VERSION import

* fix constantDisplayMode import

* fix environment imports

* fix links imports

* fix localAuthentication imports

* fix localPath imports

* fix messagesStatus imports

* fix messageTypeLoad imports

* fix defaultSettings imports

* fix tablet imports

* update with todo for colors

* move to lib folder

* change constant/colors to constant