Show loading while getting all accounts on Send page

oasisprotocol · Jan 22, 2022 · d5af6aa · d5af6aa
1 parent 0c2d3be
commit d5af6aa
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/src/popup/pages/Send/index.js b/src/popup/pages/Send/index.js
@@ -315,7 +315,12 @@ class SendPage extends React.Component {
   async componentDidMount() {
     let { isWithdraw } = this.pageConfig
     this.netConfigAction()
-    this.getAllAccounts()
+
+    Loading.show()
+    const allAccounts = await this.getAllAccounts()
+    this.callSetState({ allAccounts: allAccounts })
+    Loading.hide()
+
     if(isWithdraw){
       await this.fetchParatimeData()
     }else{
@@ -368,15 +373,16 @@ class SendPage extends React.Component {
       Loading.hide()
     }
   }
-  getAllAccounts() {
-    sendMsg({
-      action: WALLET_GET_ALL_ACCOUNT,
-    },
-      /** @param {GetAllAccountsResponse} account */
-      (account) => {
-        this.callSetState({
-          allAccounts: account.accounts,
-        })
+  /**
+   * @returns {Promise<GetAllAccountsResponse['accounts']>}
+   */
+  async getAllAccounts() {
+    return new Promise(resolve => {
+      sendMsg(
+        { action: WALLET_GET_ALL_ACCOUNT },
+        /** @param {GetAllAccountsResponse} account */
+        (account) => resolve(account.accounts)
+      )
     })
   }