Merge branch 'main' into feature/add-password-credential-manager-prov…

…ider

# Conflicts:
#	app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt

app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt

@@ -20,6 +20,7 @@ import com.x8bit.bitwarden.data.autofill.util.isActiveWithFido2Credentials
 import com.x8bit.bitwarden.data.autofill.util.isActiveWithPasswordCredentials
 import com.x8bit.bitwarden.data.autofill.util.isActiveWithUsernameAndPasswordCredentials
 import com.x8bit.bitwarden.data.autofill.util.isActiveWithUsernameCredentials
+import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager
 import com.x8bit.bitwarden.data.platform.manager.PolicyManager
 import com.x8bit.bitwarden.data.platform.manager.SpecialCircumstanceManager
 import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardManager
@@ -135,8 +136,7 @@ class VaultAddEditViewModel @Inject constructor(
             // Exit on save if handling an autofill, Fido2 Attestation, Password creation, or TOTP link
             val shouldExitOnSave = autofillSaveItem != null ||
                 fido2AttestationOptions != null ||
-                passwordCreationRequest != null ||
-                totpData != null
+                passwordCreationRequest != null
 
             val dialogState = if (!settingsRepository.initialAutofillDialogShown &&
                 vaultAddEditType is VaultAddEditType.AddItem &&
@@ -1530,6 +1530,10 @@ class VaultAddEditViewModel @Inject constructor(
                 handleValidateFido2PinResultReceive(action)
             }
 
+            is VaultAddEditAction.Internal.SshKeyCipherItemsFeatureFlagReceive -> {
+                handleSshKeyCipherItemsFeatureFlagReceive(action)
+            }
+
             is VaultAddEditAction.Internal.PasswordRegisterCredentialResultReceive -> {
                 handlePasswordRegisterCredentialResultReceive(action)
             }