From 5b9537ca076f09d691547693d45d90bbe1178954 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Mon, 16 May 2022 15:12:26 -0500
Subject: [PATCH] actions/soapbox: ensure we wait til the bitter end

---
 app/soapbox/actions/soapbox.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/actions/soapbox.js b/app/soapbox/actions/soapbox.js
index 318050219..869012527 100644
--- a/app/soapbox/actions/soapbox.js
+++ b/app/soapbox/actions/soapbox.js
@@ -64,8 +64,9 @@ export function fetchSoapboxConfig(host) {
       return dispatch(fetchFrontendConfigurations()).then(data => {
         if (data.soapbox_fe) {
           dispatch(importSoapboxConfig(data.soapbox_fe, host));
+          return data.soapbox_fe;
         } else {
-          dispatch(fetchSoapboxJson(host));
+          return dispatch(fetchSoapboxJson(host));
         }
       });
     } else {
@@ -79,7 +80,7 @@ export function loadSoapboxConfig() {
   return (dispatch, getState) => {
     const host = getHost(getState());
 
-    return dispatch(rememberSoapboxConfig(host)).finally(() => {
+    return dispatch(rememberSoapboxConfig(host)).then(() => {
       return dispatch(fetchSoapboxConfig(host));
     });
   };
@@ -87,9 +88,10 @@ export function loadSoapboxConfig() {
 
 export function fetchSoapboxJson(host) {
   return (dispatch, getState) => {
-    staticClient.get('/instance/soapbox.json').then(({ data }) => {
+    return staticClient.get('/instance/soapbox.json').then(({ data }) => {
       if (!isObject(data)) throw 'soapbox.json failed';
       dispatch(importSoapboxConfig(data, host));
+      return data;
     }).catch(error => {
       dispatch(soapboxConfigFail(error, host));
     });