Merge branch 'master' into 'dev'
# Conflicts: # src/lib/core/handlers/messageHandler.ts # src/lib/core/services/sheetService.ts
This commit is contained in:
commit
98d9a279d7
14 changed files with 265 additions and 98 deletions
|
|
@ -97,8 +97,8 @@
|
|||
websocketConnectedForUid = currentUser.uid;
|
||||
console.log('connect ws after auth ready');
|
||||
|
||||
void currentUser.getIdToken().then((idToken) => {
|
||||
connectToWebsocket(idToken);
|
||||
void currentUser.getIdToken(true).then(async (idToken) => {
|
||||
await connectToWebsocket(idToken);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -58,9 +58,9 @@
|
|||
}
|
||||
});
|
||||
|
||||
function sendGetRecipeVersions(country: string) {
|
||||
async function sendGetRecipeVersions(country: string) {
|
||||
version_list = [];
|
||||
sendMessage({
|
||||
await sendMessage({
|
||||
type: 'recipe_versions',
|
||||
payload: {
|
||||
auth: '',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue