(8.5.4) GH-2186: Always open promo modal links in same window as panel

app/shared-components/PromoModal/PromoModal.jsx

@@ -63,7 +63,7 @@ class PromoModal extends React.Component {
 	 * Handle clicks on the download buttons
 	 */
 	_handlePromoTryProductClick = (product, utm_campaign) => {
-		const { actions } = this.props;
+		const { actions, tab_id } = this.props;
 		actions.togglePromoModal();
 
 		let url;
@@ -84,6 +84,7 @@ class PromoModal extends React.Component {
 		sendMessage('openNewTab', {
 			url,
 			become_active: true,
+			tab_id, // Make sure we open the tab in the window with the open extension panel, even if another window is active
 		});
 	}
 
@@ -199,6 +200,7 @@ PromoModal.propTypes = {
 	type: PropTypes.string.isRequired,
 	location: PropTypes.string,
 	isPlus: PropTypes.bool,
+	tab_id: PropTypes.number.isRequired,
 };
 
 PromoModal.defaultProps = {

app/shared-components/PromoModal/index.js

@@ -11,6 +11,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0
  */
 
+import { connect } from 'react-redux';
 import PromoModalContainer from './PromoModalContainer';
 
-export default PromoModalContainer;
+const mapStateToProps = state => ({ tab_id: state.panel.tab_id });
+
+export default connect(mapStateToProps, undefined)(PromoModalContainer);