Merge remote-tracking branch 'upstream/develop' into account-menu-splitted

# Conflicts: # app/assets/stylesheets/_sn.scss
2021-06-15 17:17:24 +04:00
parent c1e88a8ac0 ea090cc227
commit b1920bbd3c
19 changed files with 59 additions and 498 deletions
--- a/app/assets/javascripts/views/abstract/pure_view_ctrl.ts
+++ b/app/assets/javascripts/views/abstract/pure_view_ctrl.ts
@@ -40,8 +40,8 @@ export class PureViewCtrl<P = CtrlProps, S = CtrlState> {
  }

  deinit(): void {
-    this.unsubApp();
-    this.unsubState();
+    this.unsubApp?.();
+    this.unsubState?.();
    for (const disposer of this.reactionDisposers) {
      disposer();
    }