From f82a848a08780ff0b2f4ded95b2000514f937323 Mon Sep 17 00:00:00 2001
From: Anthony Tseng <darkdh@gmail.com>
Date: Sat, 20 Aug 2016 16:08:10 +0800
Subject: [PATCH 1/2] Fix default engine display problem for fresh profile

Fix #3254

auditor: @bbondy
---
 js/about/preferences.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/js/about/preferences.js b/js/about/preferences.js
index fcf01c766e8..a2808ec055e 100644
--- a/js/about/preferences.js
+++ b/js/about/preferences.js
@@ -365,11 +365,12 @@ class GeneralTab extends ImmutableComponent {
 
 class SearchSelectEntry extends ImmutableComponent {
   shouldComponentUpdate (nextProps, nextState) {
-    return this.props.settings.get(settings.DEFAULT_SEARCH_ENGINE) !== nextProps.settings.get(settings.DEFAULT_SEARCH_ENGINE)
+    return getSetting(settings.DEFAULT_SEARCH_ENGINE, this.props.settings) !==
+      getSetting(settings.DEFAULT_SEARCH_ENGINE, nextProps.settings)
   }
   render () {
     return <div>
-    {this.props.settings.get(settings.DEFAULT_SEARCH_ENGINE) === this.props.name
+    {getSetting(settings.DEFAULT_SEARCH_ENGINE, this.props.settings) === this.props.name
       ? <span className='fa fa-check-square' id='searchSelectIcon' /> : null}
     </div>
   }

From 147739978fb1a0d83567c8430facdf862e6b83d9 Mon Sep 17 00:00:00 2001
From: Anthony Tseng <darkdh@gmail.com>
Date: Sat, 20 Aug 2016 20:42:21 +0800
Subject: [PATCH 2/2] Remove shouldComponentUpdate for Immutable
 SearchSelectEntry

---
 js/about/preferences.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/js/about/preferences.js b/js/about/preferences.js
index a2808ec055e..6f9efcfbfde 100644
--- a/js/about/preferences.js
+++ b/js/about/preferences.js
@@ -364,10 +364,6 @@ class GeneralTab extends ImmutableComponent {
 }
 
 class SearchSelectEntry extends ImmutableComponent {
-  shouldComponentUpdate (nextProps, nextState) {
-    return getSetting(settings.DEFAULT_SEARCH_ENGINE, this.props.settings) !==
-      getSetting(settings.DEFAULT_SEARCH_ENGINE, nextProps.settings)
-  }
   render () {
     return <div>
     {getSetting(settings.DEFAULT_SEARCH_ENGINE, this.props.settings) === this.props.name