diff --git a/flow-typed/user.js b/flow-typed/user.js
index 8c1c8aa309..253670102d 100644
--- a/flow-typed/user.js
+++ b/flow-typed/user.js
@@ -69,6 +69,7 @@ declare type UserState = {
   odyseeMembershipsPerClaimIds: ?{ [string]: string },
   locale: ?LocaleInfo,
   localeFailed: ?boolean,
+  userDeletionSuccess: ?boolean
 };
 
 declare type LocaleInfo = {
diff --git a/ui/modal/modalRemoveAccount/view.jsx b/ui/modal/modalRemoveAccount/view.jsx
index cc40ddf1a4..a6a73a322c 100644
--- a/ui/modal/modalRemoveAccount/view.jsx
+++ b/ui/modal/modalRemoveAccount/view.jsx
@@ -8,14 +8,14 @@ import BusyIndicator from 'component/common/busy-indicator';
 import { FormField } from 'component/common/form';
 
 type Props = {
-  user: ?User,
-  totalBalance: float,
+  user: User,
+  totalBalance: number,
   // --- perform ---
   doHideModal: () => void,
   doUserFetch: () => void,
-  doSpentEverything: () => void,
+  doSpentEverything: () => Promise<any>,
   doUserDeleteAccount: () => void,
-  doSendCreditsToOdysee: (string, float) => void,
+  doSendCreditsToOdysee: () => void,
 };
 
 export default function ModalRemoveAccount(props: Props) {
diff --git a/ui/redux/reducers/user.js b/ui/redux/reducers/user.js
index 438a88251c..f30b9e997d 100644
--- a/ui/redux/reducers/user.js
+++ b/ui/redux/reducers/user.js
@@ -36,7 +36,7 @@ const defaultState: UserState = {
   locale: undefined,
   localeFailed: undefined,
   homepageFetched: false,
-  userDeletionSuccess: false,
+  userDeletionSuccess: undefined,
 };
 
 reducers[ACTIONS.AUTHENTICATION_STARTED] = (state) =>
diff --git a/ui/redux/reducers/wallet.js b/ui/redux/reducers/wallet.js
index 1222b719da..e6739757c0 100644
--- a/ui/redux/reducers/wallet.js
+++ b/ui/redux/reducers/wallet.js
@@ -57,6 +57,7 @@ export type WalletState = {
   pendingSupportTransactions: {}, // { claimId: {txid: 123, amount 12.3}, }
   pendingTxos: Array<string>,
   abandonClaimSupportError?: string,
+  pendingSpendingEverythingTxid?: string,
 };
 
 const defaultState = {
@@ -105,6 +106,7 @@ const defaultState = {
   fetchingTxosError: undefined,
   pendingSupportTransactions: {},
   pendingTxos: [],
+  pendingSpendingEverythingTxid: null,
 
   abandonClaimSupportError: undefined,
 };