Merge branch 'develop' into backmerge-master

lerna.json

@@ -31,4 +31,4 @@
       "loadEnvFiles": false
     }
   }
-}
+}

packages/bbui/src/Modal/Modal.svelte

@@ -8,6 +8,7 @@
 
   export let fixed = false
   export let inline = false
+  export let disableCancel = false
 
   const dispatch = createEventDispatcher()
   let visible = fixed || inline
@@ -38,7 +39,7 @@
   }
 
   export function cancel() {
-    if (!visible) {
+    if (!visible || disableCancel) {
       return
     }
     dispatch("cancel")

packages/builder/src/pages/builder/portal/users/users/index.svelte

@@ -373,7 +373,7 @@
   <OnboardingTypeModal {chooseCreationType} />
 </Modal>
 
-<Modal bind:this={passwordModal}>
+<Modal bind:this={passwordModal} disableCancel={true}>
   <PasswordModal
     createUsersResponse={bulkSaveResponse}
     userData={userData.users}

packages/pro

@@ -1 +1 @@
-Subproject commit 46f06fdfeb3b8f0cfdc45e09a000bd84aeacee0c
+Subproject commit f4b8449aac9bd265214396afbdce7ff984a2ae34