Merge pull request #529 from aeternity/release/0.3.3

Release 0.3.3

CONTRIBUTING.md

@@ -1,3 +1,21 @@
-# Contributing Guidelines
+# Contributing & Guidelines
 
-Contributions are more than welcome.
+In 🦸 Superhero Wallet we use [git-flow](https://danielkummer.github.io/git-flow-cheatsheet/) (you can check [this git-flow breakdown](https://gist.github.com/JamesMGreene/cdd0ac49f90c987e45ac) as well to familiarize yourself with the workflow). To contribute, please follow these rules:
+
+* A `develop` branch is created from `master`
+* A `release` branch is created from `develop`
+* Feature branches are created from `develop` and are prefixed with `feature/` (ex. `feature/show-token-balance`)
+* If there are conflicts and the newly created feature branch needs to be synced with `develop` - rebase your branch with `develop`, resolve any conflicts that may arise and push your changes to the remote branch.
+* When development is finished a pull request to `develop` is created. At least one person has to review the PR and when everything is fine the PR gets merged.
+* When a feature is complete it is merged into the `develop` branch
+* The `develop` branch and all the feature branches are deployed to the stage environment or feature preview environment by travis-ci automatically.
+* To make a new release create a release branch called release/vX.X.X, also bump the version number in package.json in this branch.
+* Create a PR to `master` which then also has to be accepted.
+* Create a `tag` for this version and push the `tag`.
+* Also merge back the changes (like the version bump) into `develop`.
+* The `master` branch has to be deployed to the production environment manually or via the automated deployment in travis-ci.
+* If an issue in master is detected a hotfix branch is created from `master`
+* Once the hotfix is complete it is merged to both `develop` and `master`
+
+
+All contributions are welcome :pray:

README.md

@@ -2,7 +2,7 @@
 
 **Superhero is a browser extension that allows you to send and recieve value to URLs and content accross Internet.**
 
-[![Build Status](https://travis-ci.com/aeternity/superhero-wallet.svg?branch=develop)](https://travis-ci.com/aeternity/superhero-wallet)
+[![Build Status](https://travis-ci.com/aeternity/superhero-wallet.svg?branch=develop)](https://travis-ci.com/aeternity/superhero-wallet) [![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/aeternity/superhero-wallet.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/aeternity/superhero-wallet/context:javascript)
 
 ## Build
 

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.superhero.cordova" version="0.3.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.superhero.cordova" version="0.3.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Superhero</name>
     <description>Superhero wallet</description>
     <author email="dev@cordova.apache.org" href="http://cordova.io">

package.json

@@ -1,6 +1,6 @@
 {
   "name": "superhero-wallet",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Superhero wallet",
   "author": "Superhero",
   "license": "MIT",
@@ -22,23 +22,22 @@
     "start:tests": "cypress run",
     "gen:cordova-resources": "cordova-res",
     "build:Testnet": "cross-env NETWORK=Testnet npm run build",
-    "build:Mainnet": "cross-env NETWORK=Mainnet npm run build",
     "watch:dev:Testnet": "cross-env NETWORK=Testnet npm run watch:dev",
-    "watch:dev:Mainnet": "cross-env NETWORK=Mainnet npm run watch:dev",
     "watch:dev:tests": "cross-env NETWORK=Testnet RUNNING_IN_TESTS=true npm run watch:dev",
     "build:tests": "cross-env NETWORK=Testnet RUNNING_IN_TESTS=true npm run build:dev"
   },
   "dependencies": {
     "@aeternity/aepp-components": "git+https://github.com/aeternity/aepp-components.git#develop",
     "@aeternity/aepp-components-3": "3.0.0-alpha.9",
-    "@aeternity/aepp-sdk": "7.4.1",
+    "@aeternity/aepp-sdk": "^7.7.0",
     "@aeternity/bip39": "^0.1.0",
     "@aeternity/hd-wallet": "^0.2.0",
-    "@dicebear/avatars": "^4.2.1",
-    "@dicebear/avatars-avataaars-sprites": "^4.2.1",
+    "@dicebear/avatars": "^4.2.5",
+    "@dicebear/avatars-avataaars-sprites": "^4.2.5",
     "@stamp/it": "^1.1.0",
     "@vue/cli-plugin-e2e-cypress": "^3.12.1",
     "@vue/cli-service": "^3.12.0",
+    "@zxing/library": "^0.17.1",
     "aepp-raendom": "github:aeternity/aepp-raendom#feature/layout-superhero",
     "aeternity-tokens": "^1.0.2",
     "axios": "^0.19.0",
@@ -48,6 +47,7 @@
     "cordova-ios": "^5.1.1",
     "cordova-plugin-headercolor": "^1.0.0",
     "cordova-plugin-inappbrowser": "^3.2.0",
+    "cordova-plugin-qrscanner": "^3.0.1",
     "cordova-plugin-splashscreen": "^5.0.4",
     "cordova-plugin-statusbar": "^2.4.3",
     "cordova-plugin-wkwebview-engine": "github:mwchambers/cordova-plugin-wkwebview-engine#da67d6bb6ce8597c38fc69e66b84566e34efea8d",
@@ -61,19 +61,18 @@
     "validator": "^13.1.1",
     "vue": "^2.6.10",
     "vue-clipboard2": "^0.3.1",
-    "vue-i18n": "^8.18.2",
-    "vue-qrcode-reader": "^2.3.0",
-    "vue-router": "^3.3.4",
-    "vue-tour": "^1.4.0",
-    "vuex": "^3.4.0",
+    "vue-i18n": "^8.21.0",
+    "vue-router": "^3.4.3",
+    "vue-tour": "^1.5.0",
+    "vuex": "^3.5.1",
     "vuex-router-sync": "^5.0.0",
     "webextension-polyfill": "^0.3.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.10.3",
-    "@babel/plugin-proposal-class-properties": "^7.10.1",
-    "@babel/plugin-proposal-optional-chaining": "^7.10.3",
-    "@babel/preset-env": "^7.10.3",
+    "@babel/core": "^7.11.1",
+    "@babel/plugin-proposal-class-properties": "^7.10.4",
+    "@babel/plugin-proposal-optional-chaining": "^7.11.0",
+    "@babel/preset-env": "^7.11.0",
     "@cypress/webpack-preprocessor": "^4.1.5",
     "archiver": "^3.1.1",
     "babel-eslint": "^10.1.0",
@@ -87,15 +86,15 @@
     "core-js": "^3.6.5",
     "cross-env": "^5.2.1",
     "css-loader": "^0.28.11",
-    "cypress": "^4.8.0",
+    "cypress": "^4.12.1",
     "ejs": "^2.7.1",
     "eslint": "^5.16.0",
     "eslint-config-airbnb-base": "^13.2.0",
     "eslint-config-prettier": "^3.1.0",
     "eslint-friendly-formatter": "^4.0.1",
     "eslint-import-resolver-webpack": "^0.10.1",
     "eslint-loader": "^2.2.1",
-    "eslint-plugin-import": "^2.21.2",
+    "eslint-plugin-import": "^2.22.0",
     "eslint-plugin-prettier": "^3.1.4",
     "eslint-plugin-vue": "^5.2.3",
     "eslint-plugin-vue-i18n": "^0.3.0",
@@ -109,14 +108,14 @@
     "prettier": "^1.18.2",
     "sass-loader": "^7.3.1",
     "serve": "^11.3.2",
-    "start-server-and-test": "^1.11.0",
+    "start-server-and-test": "^1.11.3",
     "stylelint": "^13.6.1",
     "stylelint-config-standard": "^20.0.0",
-    "vue-loader": "^15.9.2",
+    "vue-loader": "^15.9.3",
     "vue-svg-loader": "^0.15.0",
     "vue-template-compiler": "^2.6.10",
     "web-ext-types": "^2.1.0",
-    "webpack": "^4.43.0",
+    "webpack": "^4.44.1",
     "webpack-bundle-analyzer": "^3.8.0",
     "webpack-chrome-extension-reloader": "^0.8.3",
     "webpack-cli": "^3.3.12"
@@ -132,7 +131,8 @@
       "ionic-plugin-deeplinks": {
         "URL_SCHEME": "superhero",
         "DEEPLINK_HOST": "wallet.superhero.com"
-      }
+      },
+      "cordova-plugin-qrscanner": {}
     },
     "platforms": [
       "android",

src/background.js

@@ -7,12 +7,7 @@ import rpcWallet from './lib/rpcWallet';
 import TipClaimRelay from './lib/tip-claim-relay';
 import { buildTx } from './popup/utils';
 import { popupProps } from './popup/utils/config';
-import {
-  AEX2_METHODS,
-  CONNECTION_TYPES,
-  DEFAULT_NETWORK,
-  HDWALLET_METHODS,
-} from './popup/utils/constants';
+import { AEX2_METHODS, CONNECTION_TYPES, HDWALLET_METHODS } from './popup/utils/constants';
 import { detectConnectionType } from './popup/utils/helper';
 import { getPhishingUrls, phishingCheckUrl, setPhishingUrl } from './popup/utils/phishing-detect';
 import walletController from './wallet-controller';
@@ -79,7 +74,7 @@ if (process.env.IS_EXTENSION && require.main.i === module.id && inBackground) {
         const {
           current: { network },
         } = await getState();
-        if (sender.url === url && (DEFAULT_NETWORK && network) === 'Mainnet')
+        if (sender.url === url && network === 'Mainnet')
           TipClaimRelay.checkUrlHasBalance(url, data);
       }
       if (type === 'openTipPopup') openTipPopup(tipUrl || url);
@@ -121,6 +116,15 @@ if (process.env.IS_EXTENSION && require.main.i === module.id && inBackground) {
     title: 'Tip',
   };
 
+  browser.webNavigation.onHistoryStateUpdated.addListener(async ({ tabId, url }) => {
+    if (
+      (({ origin, pathname }) => origin + pathname)(new URL(url)) !==
+      'https://www.youtube.com/watch'
+    )
+      return;
+    browser.tabs.executeScript(tabId, { file: 'other/youtube.js' });
+  });
+
   browser.contextMenus.removeAll();
   browser.contextMenus.create(contextMenuItem);
   browser.contextMenus.onClicked.addListener(({ menuItemId, pageUrl }) => {