Fix conflicts

.eslintrc.js

@@ -3,7 +3,8 @@ module.exports = {
     VERSION: 'readonly',
     ROUTER_MODE: 'readonly',
     BUILD_TYPE: 'readonly',
-    NODE_ENV: 'readonly'
+    NODE_ENV: 'readonly',
+    FULL_SOURCEMAPS: 'readonly'
   },
   root: true,
   env: {

.github/workflows/build-cx-generate-zip.yml

@@ -33,7 +33,7 @@ jobs:
         run: docker run --rm -v `pwd`:/home:rw --user "$(id -u):$(id -g)" mew-build-container /bin/bash -c "npm install"
 
       - name: build
-        run: docker run --rm -v `pwd`:/home:rw mew-build-container /bin/bash -c "NODE_OPTIONS=--max-old-space-size=8192 npm run build:mewcx"
+        run: docker run --rm -v `pwd`:/home:rw mew-build-container /bin/bash -c "npm run build:mewcx"
 
       - name: generate zip for cx
         if: contains(github.ref, 'cx')

.github/workflows/deploy-live.yml

@@ -39,7 +39,23 @@ jobs:
         run: docker run --rm -v `pwd`:/home:rw --user "$(id -u):$(id -g)" mew-build-container /bin/bash -c "npm install"
 
       - name: build
-        run: docker run --rm -v `pwd`:/home:rw mew-build-container /bin/bash -c "npm run build:history"
+        run: docker run --rm -v `pwd`:/home:rw mew-build-container /bin/bash -c "npm run build:history:sourcemaps"
+
+      - name: Get release tag
+        id: get_release_tag
+        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+
+      - name: deploy to sentry
+        env:
+          SENTRY_AUTH_TOKEN: ${{secrets.SENTRY_TOKEN}}
+          SENTRY_ORG: myetherwallet-inc
+        run: |
+          curl -sL https://sentry.io/get-cli/ | bash
+          VERSION=${{ steps.get_release_tag.outputs.VERSION }}
+          sentry-cli releases new -p myetherwallet $VERSION
+          sentry-cli releases files $VERSION upload-sourcemaps ./dist/sourcemaps
+          sentry-cli releases set-commits $VERSION --auto
+          sentry-cli releases finalize $VERSION
 
       - name: deploy to production
         env:

CHANGELOG.md

@@ -1,7 +1,12 @@
 ### Bug
 
 - Fix perkle network connection [#2389](https://github.com/MyEtherWallet/MyEtherWallet/pull/2389)
+- Fix errors from sentry [#2388](https://github.com/MyEtherWallet/MyEtherWallet/pull/2388)
 
+### Devop
+
+- Update terms of service [#2394](https://github.com/MyEtherWallet/MyEtherWallet/pull/2394)
+- Fix sentry releases [#2395](https://github.com/MyEtherWallet/MyEtherWallet/pull/2395)
 
 ### Release v5.6.2
 

Dockerfile

@@ -1,7 +1,7 @@
 FROM node:10.17.0-stretch
 
 ENV HOME /home
-ENV NODE_OPTIONS --max-old-space-size=8192
+ENV NODE_OPTIONS --max-old-space-size=6144
 RUN npm install [email protected] -g
 RUN node -v && npm -v
 COPY package*.json ./

ENV_VARS.js

@@ -4,5 +4,6 @@ module.exports = {
   VERSION: JSON.stringify(version),
   ROUTER_MODE: JSON.stringify(process.env.ROUTER_MODE || 'hash'),
   BUILD_TYPE: JSON.stringify(process.env.BUILD_TYPE || 'web'),
+  FULL_SOURCEMAPS: JSON.stringify(process.env.FULL_SOURCEMAPS || 'false'),
   NODE_ENV: JSON.stringify(process.env.NODE_ENV)
 };

jest.config.js

@@ -5,7 +5,8 @@ module.exports = {
     VERSION: 'test',
     NODE_ENV: 'test',
     ROUTER_MODE: 'hash',
-    BUILD_TYPE: 'web'
+    BUILD_TYPE: 'web',
+    FULL_SOURCEMAPS: 'false'
   },
   collectCoverageFrom: ['src/**/*.{js,vue}'],
   coveragePathIgnorePatterns: [