get MM updates from upstream

.circleci/config.yml

@@ -31,14 +31,6 @@ workflows:
     - test-unit:
         requires:
         - prep-deps-npm
-    # - test-integration-mascara-chrome:
-    #     requires:
-    #     - prep-deps-npm
-    #     - prep-scss
-    # - test-integration-mascara-firefox:
-    #     requires:
-    #     - prep-deps-npm
-    #     - prep-scss
     - test-integration-flat-chrome:
         requires:
         - prep-deps-npm
@@ -53,8 +45,6 @@ workflows:
         - test-unit
         - test-e2e-chrome
         # - test-e2e-firefox
-        # - test-integration-mascara-chrome
-        # - test-integration-mascara-firefox
         - test-integration-flat-chrome
         - test-integration-flat-firefox
     - job-screens:
@@ -292,9 +282,6 @@ jobs:
         key: build-cache-{{ .Revision }}
     - restore_cache:
         key: job-screens-{{ .Revision }}
-    - store_artifacts:
-        path: dist/mascara
-        destination: builds/mascara
     - store_artifacts:
         path: dist/sourcemaps
         destination: builds/sourcemaps
@@ -380,37 +367,6 @@ jobs:
         name: test:integration:flat
         command: npm run test:flat
 
-  test-integration-mascara-firefox:
-    environment:
-      browsers: '["Firefox"]'
-    docker:
-    - image: circleci/node:10.19.0-browsers
-    steps:
-    - checkout
-    - restore_cache:
-        key: dependency-cache-firefox-{{ .Revision }}
-    - run:
-        name: Install firefox
-        command: ./.circleci/scripts/firefox-install
-    - restore_cache:
-        key: dependency-cache-{{ .Revision }}
-    - run:
-        name: test:integration:mascara
-        command: npm run test:mascara
-
-  test-integration-mascara-chrome:
-    environment:
-      browsers: '["Chrome"]'
-    docker:
-    - image: circleci/node:10.19.0-browsers
-    steps:
-    - checkout
-    - restore_cache:
-        key: dependency-cache-{{ .Revision }}
-    - run:
-        name: test:integration:mascara
-        command: npm run test:mascara
-
   all-tests-pass:
     docker:
     - image: circleci/node:10.19.0-browsers

.eslintignore

@@ -15,9 +15,6 @@ app/vendor/**
 
 ui/lib/blockies.js
 
-mascara/src/app/first-time/spinner.js
-mascara/test/jquery-3.1.0.min.js
-
 test/integration/bundle.js
 test/integration/jquery-3.1.0.min.js
 test/integration/helpers.js

.niftywalletrc.dist

@@ -1,2 +1,3 @@
 ; Extra environment variables
 ETH_MAINNET_RPC_ENDPOINT=00000000000
+INFURA_PROJECT_ID=00000000000

.stylelintignore

@@ -4,7 +4,6 @@ dist/
 docs/
 fonts/
 images/
-mascara/
 node_modules/
 notices/
 test/

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Current Master
 
+- [#443](https://github.com/poanetwork/nifty-wallet/pull/443) - Fire 'confirmation', 'receipt' events
+
 ## 5.2.3 Fri Jan 15 2021
 
 - [#441](https://github.com/poanetwork/nifty-wallet/pull/441) - Replace Infura Mainnet endpoint with custom one