sergiodt
/
vn-verdnaturachat
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FIX] Emoji keyboard not showing custom and frequently used emojis on Share Extension (#2251)

This commit is contained in:
Djorkaeff Alexandre 2020-07-08 13:19:41 -03:00 committed by GitHub
parent 20604c4695
commit 83fbb8c304
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/containers/MessageBox/EmojiKeyboard.js
View File

@ -17,7 +17,7 @@ export default class EmojiKeyboard extends React.PureComponent {
constructor(props) { constructor(props) {
super(props); super(props);
const state = store.getState(); const state = store.getState();
this.baseUrl = state.server.server; this.baseUrl = state.share.server || state.server.server;
} }
onEmojiSelected = (emoji) => { onEmojiSelected = (emoji) => {

4
app/lib/database/index.js
View File

@ -110,7 +110,9 @@ class DB {
Thread, Thread,
ThreadMessage, ThreadMessage,
Upload, Upload,
Permission Permission,
CustomEmoji,
FrequentlyUsedEmoji
], ],
actionsEnabled: true actionsEnabled: true
}); });

2
app/lib/rocketchat.js
View File

@ -288,6 +288,8 @@ const RocketChat = {
const serversDB = database.servers; const serversDB = database.servers;
reduxStore.dispatch(shareSelectServer(server)); reduxStore.dispatch(shareSelectServer(server));
RocketChat.setCustomEmojis();
// set User info // set User info
try { try {
const userId = await RNUserDefaults.get(`${ RocketChat.TOKEN_KEY }-${ server }`); const userId = await RNUserDefaults.get(`${ RocketChat.TOKEN_KEY }-${ server }`);