fix loadConfig

t3chguy · t3chguy · commit 6a5268f09ba6 · 2020-04-08T19:36:06.000+01:00
Signed-off-by: Michael Telatynski &lt;7t3chguy@gmail.com&gt;
diff --git a/src/vector/init.tsx b/src/vector/init.tsx
@@ -46,12 +46,12 @@ export function preparePlatform() {
     }
 }
 
-export async function loadConfig(): Promise<Error | void> {
+export async function loadConfig() {
     // XXX: We call this twice, once here and once in MatrixChat as a prop. We call it here to ensure
     // granular settings are loaded correctly and to avoid duplicating the override logic for the theme.
     //
     // Note: this isn't called twice for some wrappers, like the Jitsi wrapper.
-    SdkConfig.put(PlatformPeg.get().getConfig() || {});
+    SdkConfig.put(await PlatformPeg.get().getConfig() || {});
 }
 
 export function loadOlm(): Promise<void> {

Original file line number	Diff line number	Diff line change
`@@ -46,12 +46,12 @@ export function preparePlatform() {`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`49`		`-export async function loadConfig(): Promise<Error \| void> {`
	`49`	`+export async function loadConfig() {`
`50`	`50`	`// XXX: We call this twice, once here and once in MatrixChat as a prop. We call it here to ensure`
`51`	`51`	`// granular settings are loaded correctly and to avoid duplicating the override logic for the theme.`
`52`	`52`	`//`
`53`	`53`	`// Note: this isn't called twice for some wrappers, like the Jitsi wrapper.`
`54`		`- SdkConfig.put(PlatformPeg.get().getConfig() \|\| {});`
	`54`	`+ SdkConfig.put(await PlatformPeg.get().getConfig() \|\| {});`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`export function loadOlm(): Promise<void> {`