u

src/components/CompanySetupDialog.jsx

@@ -34,8 +34,9 @@ import TuneIcon from '@mui/icons-material/Tune';
 import AutoAwesomeIcon from '@mui/icons-material/AutoAwesome';
 import BackendError from './BackendError';
 import { company, number as numberApi } from '../api';
-import { StorageManagerContext } from '../api/storageManagerContext';
-import authAutomat from '../automats/authAutomat';
+import authAutomat, { bootstrapAuthMe } from '../automats/authAutomat';
+import companyAutomat from '../automats/companyAutomat';
+import numberAutomat from '../automats/numberAutomat';
 import {
   defaultIso639,
   ISO639_OPTIONS,
@@ -105,8 +106,6 @@ function formatNumberPreview(prefix, padding, next, offset = 0) {
 }
 
 class CompanySetupDialog extends Component {
-  static contextType = StorageManagerContext;
-
   constructor(props) {
     super(props);
     this.state = {
@@ -149,7 +148,7 @@ class CompanySetupDialog extends Component {
     this.setState({ busy: true, error: null });
     try {
       await authAutomat.actions.selectCompany(companyId);
-      await this.context.updateAuthMe();
+      await bootstrapAuthMe();
     } catch (err) {
       this.setState({ error: backendErrorFrom(err) });
     } finally {
@@ -223,9 +222,9 @@ class CompanySetupDialog extends Component {
         }
       }
 
-      await this.context.updateAuthMe();
-      await this.context.updateCompany();
-      await this.context.updateNumber?.();
+      await bootstrapAuthMe();
+      await companyAutomat.actions.load();
+      await numberAutomat.actions.reload().catch(() => {});
     } catch (err) {
       this.setState({ error: backendErrorFrom(err) });
     } finally {
@@ -236,7 +235,7 @@ class CompanySetupDialog extends Component {
   async handleLogout() {
     try {
       await authAutomat.actions.logout();
-      await this.context.updateAuthMe();
+      await bootstrapAuthMe();
     } catch (err) {
       this.setState({ error: backendErrorFrom(err) });
     }