devop: merge with v6/develop

.husky/.gitignore

@@ -1 +1 @@
-_
+_

.husky/_/husky.sh

@@ -0,0 +1,30 @@
+#!/bin/sh
+if [ -z "$husky_skip_init" ]; then
+  debug () {
+    [ "$HUSKY_DEBUG" = "1" ] && echo "husky (debug) - $1"
+  }
+
+  readonly hook_name="$(basename "$0")"
+  debug "starting $hook_name..."
+
+  if [ "$HUSKY" = "0" ]; then
+    debug "HUSKY env variable is set to 0, skipping hook"
+    exit 0
+  fi
+
+  if [ -f ~/.huskyrc ]; then
+    debug "sourcing ~/.huskyrc"
+    . ~/.huskyrc
+  fi
+
+  export readonly husky_skip_init=1
+  sh -e "$0" "$@"
+  exitCode="$?"
+
+  if [ $exitCode != 0 ]; then
+    echo "husky - $hook_name hook exited with code $exitCode (error)"
+    exit $exitCode
+  fi
+
+  exit 0
+fi

CHANGELOG.md

@@ -3,6 +3,15 @@
 ### Devop
 
 * Fix footer CoinGecko link and verify message link [#2957](https://github.com/MyEtherWallet/MyEtherWallet/pull/2957)
+* Fix hardware access - network and address select  [#2937](https://github.com/MyEtherWallet/MyEtherWallet/pull/2937)
+* Fix partners link [#2953](https://github.com/MyEtherWallet/MyEtherWallet/pull/2953)
+* Fix print paper wallet [#2956](https://github.com/MyEtherWallet/MyEtherWallet/pull/2956)
+* Fix decision-tree support contact link [#2959](https://github.com/MyEtherWallet/MyEtherWallet/pull/2959)
+* Fix hardware wallet links [#2963](https://github.com/MyEtherWallet/MyEtherWallet/pull/2963)
+* Fix interact with contract dropdown [#2964](https://github.com/MyEtherWallet/MyEtherWallet/pull/2964)
+* Fix no balance missing balance card [#2965](https://github.com/MyEtherWallet/MyEtherWallet/pull/2965)
+* Fix buy eth button overflow issue on old Chrome browsers [#2966](https://github.com/MyEtherWallet/MyEtherWallet/pull/2966)
+* Fix access hardware wallet layout [#2926](https://github.com/MyEtherWallet/MyEtherWallet/pull/2926)
 * Update tools page [#2944](https://github.com/MyEtherWallet/MyEtherWallet/pull/2944)
 * Update how it works layout [#2925](https://github.com/MyEtherWallet/MyEtherWallet/pull/2925)
 * Fix logout [#2950](https://github.com/MyEtherWallet/MyEtherWallet/pull/2950)

apollo.config.js

@@ -3,8 +3,7 @@ module.exports = {
       service: {
           name: 'api',
           url: 'https://hbfzqg7jia.execute-api.us-west-2.amazonaws.com/dev',
-          includes: ['**/*.graphql'],
-          excludes: ['node_modules/**/*']
-      }
+        },
+      includes: ['src/apollo/**/*.graphql'],
   }
 }

apolloAave.config.js

@@ -0,0 +1,9 @@
+module.exports = {
+  client: {
+      service: {
+          name: 'aave',
+          url: 'https://api.thegraph.com/subgraphs/name/aave/protocol-multy-raw',
+        },
+      includes: ['src/dapps/aave-dapp/**/*.graphql']
+  }
+}