fix: deprecate Salesforce

Automattic · Nov 27, 2024 · c1e5ae7 · c1e5ae7
1 parent 9c9c1c8
commit c1e5ae7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/includes/wizards/audience/class-audience-wizard.php b/includes/wizards/audience/class-audience-wizard.php
@@ -78,10 +78,12 @@ public function enqueue_scripts_and_styles() {
 			return;
 		}
 		parent::enqueue_scripts_and_styles();
+		$salesforce_settings = Salesforce::get_salesforce_settings();
 		$data = [
 			'has_memberships'         => class_exists( 'WC_Memberships' ),
 			'reader_activation_url'   => admin_url( 'admin.php?page=newspack-audience#/' ),
 			'esp_metadata_fields'     => Reader_Activation\Sync\Metadata::get_default_fields(),
+			'can_use_salesforce'      => ! empty( $salesforce_settings['client_id'] ),
 			'salesforce_redirect_url' => Salesforce::get_redirect_url(),
 		];
 

diff --git a/src/components/src/handoff-message/index.js b/src/components/src/handoff-message/index.js
@@ -30,9 +30,6 @@ export default function HandoffMessage() {
 				setHandoffMessage( false );
 			}
 		}, 100 );
-
-		// Clean up the notification when unmounting.
-		return () => window.localStorage.removeItem( HANDOFF_KEY );
 	}, [] );
 	if ( ! handoffMessage ) {
 		return null;

diff --git a/src/wizards/audience/views/setup/setup.js b/src/wizards/audience/views/setup/setup.js
@@ -376,8 +376,12 @@ export default withWizardScreen( ( { config, fetchConfig, updateConfig, saveConf
 							) }
 						</Button>
 					</div>
-					<hr />
-					<Salesforce />
+					{ newspackAudience.can_use_salesforce && (
+						<>
+							<hr />
+							<Salesforce />
+						</>
+					) }
 				</Card>
 			) }
 		</WizardsTab>