2 files changed, 5 insertions, 9 deletions
diff --git a/src/view/screens/Settings/DisableEmail2FADialog.tsx b/src/view/screens/Settings/DisableEmail2FADialog.tsx
index 83b133f65..b52dcc7a3 100644
--- a/src/view/screens/Settings/DisableEmail2FADialog.tsx
+++ b/src/view/screens/Settings/DisableEmail2FADialog.tsx
@@ -5,7 +5,7 @@ import {useLingui} from '@lingui/react'
 
 import {cleanError} from '#/lib/strings/errors'
 import {isNative} from '#/platform/detection'
-import {useAgent, useSession, useSessionApi} from '#/state/session'
+import {useAgent, useSession} from '#/state/session'
 import {ErrorMessage} from '#/view/com/util/error/ErrorMessage'
 import * as Toast from '#/view/com/util/Toast'
 import {atoms as a, useBreakpoints, useTheme} from '#/alf'
@@ -30,7 +30,6 @@ export function DisableEmail2FADialog({
   const t = useTheme()
   const {gtMobile} = useBreakpoints()
   const {currentAccount} = useSession()
-  const {updateCurrentAccount} = useSessionApi()
   const {getAgent} = useAgent()
 
   const [stage, setStage] = useState<Stages>(Stages.Email)
@@ -61,7 +60,7 @@ export function DisableEmail2FADialog({
           token: confirmationCode.trim(),
           emailAuthFactor: false,
         })
-        updateCurrentAccount({emailAuthFactor: false})
+        await getAgent().resumeSession(getAgent().session!)
         Toast.show(_(msg`Email 2FA disabled`))
       }
       control.close()
diff --git a/src/view/screens/Settings/Email2FAToggle.tsx b/src/view/screens/Settings/Email2FAToggle.tsx
index 87a56ba5e..efeb7e4d7 100644
--- a/src/view/screens/Settings/Email2FAToggle.tsx
+++ b/src/view/screens/Settings/Email2FAToggle.tsx
@@ -3,7 +3,7 @@ import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
 import {useModalControls} from '#/state/modals'
-import {useAgent, useSession, useSessionApi} from '#/state/session'
+import {useAgent, useSession} from '#/state/session'
 import {ToggleButton} from 'view/com/util/forms/ToggleButton'
 import {useDialogControl} from '#/components/Dialog'
 import {DisableEmail2FADialog} from './DisableEmail2FADialog'
@@ -11,7 +11,6 @@ import {DisableEmail2FADialog} from './DisableEmail2FADialog'
 export function Email2FAToggle() {
   const {_} = useLingui()
   const {currentAccount} = useSession()
-  const {updateCurrentAccount} = useSessionApi()
   const {openModal} = useModalControls()
   const disableDialogCtrl = useDialogControl()
   const {getAgent} = useAgent()
@@ -22,11 +21,9 @@ export function Email2FAToggle() {
         email: currentAccount.email,
         emailAuthFactor: true,
       })
-      updateCurrentAccount({
-        emailAuthFactor: true,
-      })
+      await getAgent().resumeSession(getAgent().session!)
     }
-  }, [currentAccount, updateCurrentAccount, getAgent])
+  }, [currentAccount, getAgent])
 
   const onToggle = React.useCallback(() => {
     if (!currentAccount) {