Eth-wallet

.npmrc

@@ -1,7 +1,7 @@
 runtime = electron
 target_arch = x64
-brave_electron_version = 5.0.2
-chromedriver_version = 2.33
-target = v5.0.2
+brave_electron_version = 6.0.12
+chromedriver_version = 2.36
+target = v6.0.12
 disturl=https://brave-laptop-binaries.s3.amazonaws.com/atom-shell/dist/
 build_from_source = true

.travis.yml

@@ -21,18 +21,35 @@ notifications:
   slack:
     secure: bDwO2uce5JAZvjrvWj4+/+yEXJAIK4O0RcgUWvZ2IMbi7Q9I89Mw40JmkLWL6x2gWZwxr8+FoLtErJA7RVrsfImjrX+NmMyAB7AydLdrBJtkLozNnuacnhcnBRyp1gGCa1ymxCEXGbgC6onAD3kiJJhggr70T+2lu3IuJYXENhc=
 env:
-  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=lint
-  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=unit
-  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=codecov
-  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=about
-  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=app
-  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=bookmark-components
-  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=bravery-components
-  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=contents
-  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=misc-components
-  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=navbar-components
-  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=tab-components
-  - CXX=g++-4.8 NODE_ENV=test TEST_DIR=performance ARTIFACTS_REGION=us-east-1
+  global:
+    - CXX=g++-4.8
+    - NODE_ENV=test
+  matrix:
+    - TEST_DIR=lint
+    - TEST_DIR=unit
+    - TEST_DIR=codecov
+    - TEST_DIR=security
+    - TEST_DIR=about
+    - TEST_DIR=app
+    - TEST_DIR=bookmark-components
+    - TEST_DIR=bravery-components
+    - TEST_DIR=contents
+    - TEST_DIR=misc-components
+    - TEST_DIR=navbar-components
+    - TEST_DIR=tab-components
+    - TEST_DIR=performance ARTIFACTS_REGION=us-east-1
+matrix:
+  fast_finish: true
+  allow_failures:
+    - env: TEST_DIR=about
+    - env: TEST_DIR=app
+    - env: TEST_DIR=bookmark-components
+    - env: TEST_DIR=bravery-components
+    - env: TEST_DIR=contents
+    - env: TEST_DIR=misc-components
+    - env: TEST_DIR=navbar-components
+    - env: TEST_DIR=tab-components
+    - env: TEST_DIR=performance ARTIFACTS_REGION=us-east-1
 addons:
   apt:
     sources:

README.md

@@ -73,6 +73,13 @@ dnf install rpm-build
 dnf group install "Development Tools" "C Development Tools and Libraries"
 ````
 
+#### On Solus
+
+````
+sudo eopkg it -c system.devel gconf
+````
+
+
 ### Installation
 
 After installing the prerequisites:
@@ -108,12 +115,12 @@ Some platforms are available as pre-configured VMs. See the [readme](https://git
 
 ### Running Brave
 
-To run a development version of the browser requires a few steps. The easiest way is just to use two
-terminals. One terminal can be used just to watch for changes to the code
+Running a development version of the browser requires two steps. The easiest way is just to use two
+terminals (or one terminal with two tabs). First, you'll need to start the watch process (which runs webpack and watches for changes to the code)
 
     npm run watch
 
-Now actually run Brave in another terminal
+Second, you can start the actual Brave process (in another terminal or tab)
 
     npm start
 

app/browser/activeTabHistory.js

@@ -55,6 +55,18 @@ const api = {
    */
   clearTabbedWindow: function (windowId) {
     activeTabsByWindow.delete(windowId)
+  },
+
+  /**
+   * Replace all intances of `oldTabId` with `newTabId` in
+   * active tab history for each window
+   */
+  tabIdChanged: function (oldTabId, newTabId) {
+    for (const [windowId, windowActiveTabs] of activeTabsByWindow) {
+      if (windowActiveTabs && windowActiveTabs.length) {
+        activeTabsByWindow.set(windowId, windowActiveTabs.map(previousTabId => (previousTabId === oldTabId) ? newTabId : previousTabId))
+      }
+    }
   }
 }