Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fire 'confirmation', 'receipt' events #443

Merged
merged 1 commit into from
Feb 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 0 additions & 44 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .niftywalletrc.dist
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
; Extra environment variables
ETH_MAINNET_RPC_ENDPOINT=00000000000
INFURA_PROJECT_ID=00000000000
1 change: 0 additions & 1 deletion .stylelintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ dist/
docs/
fonts/
images/
mascara/
node_modules/
notices/
test/
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
161 changes: 67 additions & 94 deletions app/scripts/background.js

Large diffs are not rendered by default.

Loading