A4A Client: Only show disconnect dialog during plugin deactivation wh…

…en connected (#37337) * Conditionally add the disconnect on deactivation handler * changelog
Automattic · May 10, 2024 · 2d24fc4 · 2d24fc4
1 parent ede8fd8
commit 2d24fc4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/...tomattic-for-agencies-client/changelog/fix-a4a-remove-disconnect-prompt-when-disconnected b/...tomattic-for-agencies-client/changelog/fix-a4a-remove-disconnect-prompt-when-disconnected
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Prevent disconnect dialog from displaying when site is already disconnected.
+
+
diff --git a/projects/plugins/automattic-for-agencies-client/src/class-automattic-for-agencies-client.php b/projects/plugins/automattic-for-agencies-client/src/class-automattic-for-agencies-client.php
@@ -37,7 +37,10 @@ public static function init() {
 		add_action( 'load-settings_page_' . AUTOMATTIC_FOR_AGENCIES_CLIENT_SLUG, array( static::class, 'load_scripts_styles' ) );
 
 		// Display a modal when trying to deactivate the plugin.
-		Deactivation_Handler::init( AUTOMATTIC_FOR_AGENCIES_CLIENT_SLUG, __DIR__ . '/admin/deactivation-dialog.php' );
+		$manager = new Connection_Manager( 'automattic-for-agencies-client' );
+		if ( $manager->is_connected() ) {
+			Deactivation_Handler::init( AUTOMATTIC_FOR_AGENCIES_CLIENT_SLUG, __DIR__ . '/admin/deactivation-dialog.php' );
+		}
 	}
 
 	/**