From 5b969b39c3c015e495cdca247679e6a9a73ac44b Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Sat, 28 Nov 2020 23:19:18 +0900
Subject: [PATCH] refactor: Use invoke for ipc to backward account

---
 src/main/index.ts                         | 11 ++---------
 src/renderer/store/Preferences/Account.ts | 14 ++------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/src/main/index.ts b/src/main/index.ts
index 0424d609..288ab077 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -452,15 +452,8 @@ ipcMain.handle('forward-account', async (_: IpcMainInvokeEvent, acct: LocalAccou
   await accountManager.forwardAccount(acct)
 })
 
-ipcMain.on('backward-account', (event: IpcMainEvent, acct: LocalAccount) => {
-  accountManager
-    .backwardAccount(acct)
-    .then(() => {
-      event.sender.send('response-backward-account')
-    })
-    .catch(err => {
-      event.sender.send('error-backward-account', err)
-    })
+ipcMain.handle('backward-account', async (_: IpcMainInvokeEvent, acct: LocalAccount) => {
+  await accountManager.backwardAccount(acct)
 })
 
 ipcMain.on('refresh-accounts', async (event: IpcMainEvent) => {
diff --git a/src/renderer/store/Preferences/Account.ts b/src/renderer/store/Preferences/Account.ts
index 02a250b1..04d01133 100644
--- a/src/renderer/store/Preferences/Account.ts
+++ b/src/renderer/store/Preferences/Account.ts
@@ -41,18 +41,8 @@ const actions: ActionTree<AccountState, RootState> = {
   forwardAccount: async (_, account: LocalAccount) => {
     await win.ipcRenderer.invoke('forward-account', account)
   },
-  backwardAccount: (_, account: LocalAccount) => {
-    return new Promise((resolve, reject) => {
-      win.ipcRenderer.send('backward-account', account)
-      win.ipcRenderer.once('error-backward-account', (_, err: Error) => {
-        win.ipcRenderer.removeAllListeners('response-forward-account')
-        reject(err)
-      })
-      win.ipcRenderer.once('response-backward-account', () => {
-        win.ipcRenderer.removeAllListeners('error-backward-account')
-        resolve()
-      })
-    })
+  backwardAccount: async (_, account: LocalAccount) => {
+    await win.ipcRenderer.invoke('backward-account', account)
   },
   removeAllAccounts: () => {
     return new Promise((resolve, reject) => {