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

feat: enable verify owner functionality #3009

Open
wants to merge 178 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
178 commits
Select commit Hold shift + click to select a range
345939e
Merge pull request #1477 from near/master
vgrichina Mar 4, 2021
49d923f
Merge pull request #1528 from near/master
vgrichina Mar 8, 2021
bf85cb6
Merge pull request #1551 from near/master
vgrichina Mar 18, 2021
295d090
Merge pull request #1572 from near/master
vgrichina Mar 30, 2021
aeac737
Pass flowLimitation to getAccountBalance (#1580)
marcinbodnar Mar 26, 2021
e9abcea
Use flowLimitation to load basic balance data only (#1580)
marcinbodnar Mar 26, 2021
21c8a2d
Cleanup (#1580)
marcinbodnar Mar 26, 2021
d766bc3
Merge pull request #1602 from near/hotfix-sign-page-load
vgrichina Apr 1, 2021
2d92c58
Merge pull request #1592 from near/master
vgrichina Apr 6, 2021
66a4837
Merge pull request #1633 from near/master
vgrichina Apr 14, 2021
0beddef
Merge pull request #1660 from near/master
vgrichina Apr 23, 2021
aa9db05
Merge pull request #1690 from near/master
vgrichina Apr 30, 2021
606e6b2
Merge pull request #1715 from near/master
vgrichina May 8, 2021
8b67d5f
Merge pull request #1749 from near/master
vgrichina May 14, 2021
47dc732
Merge pull request #1763 from near/master
vgrichina May 21, 2021
694e65b
Merge pull request #1776 from near/master
vgrichina May 29, 2021
577dff6
Merge pull request #1817 from near/master
MaximusHaximus Jun 19, 2021
dbee8f2
Merge pull request #1839 from near/master
MaximusHaximus Jun 22, 2021
0797abc
Merge pull request #1855 from near/master
MaximusHaximus Jun 24, 2021
bc45ce9
Merge pull request #1891 from near/master
MaximusHaximus Jul 8, 2021
81d8db4
Merge pull request #1908 from near/master
MaximusHaximus Jul 14, 2021
d34220d
Merge pull request #1923 from near/master
MaximusHaximus Jul 15, 2021
0e91814
Merge pull request #1942 from near/master
MaximusHaximus Jul 23, 2021
718369e
Merge pull request #1945 from near/master
MaximusHaximus Jul 23, 2021
14d1381
Merge pull request #1948 from near/master
MaximusHaximus Jul 23, 2021
3aa8524
Merge pull request #1953 from near/master
MaximusHaximus Jul 23, 2021
cf6059e
Merge pull request #1991 from near/master
MaximusHaximus Aug 6, 2021
66ce1d2
Merge pull request #2016 from near/master
MaximusHaximus Aug 6, 2021
d44891f
Merge pull request #2026 from near/master
MaximusHaximus Aug 10, 2021
0d246dc
Merge pull request #2036 from near/master
MaximusHaximus Aug 16, 2021
1a8f351
Merge pull request #2059 from near/master
MaximusHaximus Aug 27, 2021
06e34f7
Merge pull request #2065 from near/master
MaximusHaximus Aug 28, 2021
7c884e9
Merge pull request #2068 from near/master
MaximusHaximus Aug 31, 2021
37ae6c0
Merge pull request #2123 from near/master
MaximusHaximus Sep 16, 2021
b230b1a
Merge pull request #2126 from near/master
MaximusHaximus Sep 17, 2021
083ef84
Merge pull request #2128 from near/master
MaximusHaximus Sep 17, 2021
2cd6735
Merge pull request #2130 from near/master
MaximusHaximus Sep 17, 2021
78ad3e9
Merge pull request #2132 from near/master
MaximusHaximus Sep 17, 2021
8d26bf6
Merge pull request #2134 from near/master
MaximusHaximus Sep 18, 2021
51dad69
Merge pull request #2139 from near/master
MaximusHaximus Sep 20, 2021
f8dc803
Merge pull request #2145 from near/master
MaximusHaximus Sep 22, 2021
c865ac6
Merge pull request #2151 from near/master
MaximusHaximus Sep 22, 2021
28eb816
Merge pull request #2153 from near/master
MaximusHaximus Sep 22, 2021
b3dd21b
Merge pull request #2163 from near/master
MaximusHaximus Sep 25, 2021
953e619
Merge pull request #2189 from near/master
MaximusHaximus Oct 20, 2021
600f648
Merge pull request #2246 from near/master
MaximusHaximus Nov 25, 2021
c18b0df
Merge pull request #2288 from near/master
MaximusHaximus Dec 2, 2021
1320e2f
Merge pull request #2321 from near/master
MaximusHaximus Dec 21, 2021
99f7f45
Merge pull request #2329 from near/master
MaximusHaximus Dec 22, 2021
5aecfab
Merge pull request #2389 from near/master
MaximusHaximus Jan 21, 2022
b6790a2
Merge pull request #2393 from near/master
MaximusHaximus Jan 24, 2022
22b43b8
Merge pull request #2411 from near/master
MaximusHaximus Jan 26, 2022
e029b42
Merge pull request #2474 from near/master
MaximusHaximus Feb 12, 2022
2094a88
Merge pull request #2476 from near/master
MaximusHaximus Feb 12, 2022
c8be5f0
Merge pull request #2477 from near/master
MaximusHaximus Feb 12, 2022
8fab174
Merge pull request #2485 from near/master
MaximusHaximus Feb 15, 2022
4330736
fix: remove link rendering for callbackUrl translations
Feb 25, 2022
b017629
fix: display error for transactions with invalid callbackUrl
Feb 25, 2022
119d0c1
Merge pull request from GHSA-rm9q-cxxh-hj52
MaximusHaximus Feb 26, 2022
3622c50
Merge pull request #2500 from near/master
MaximusHaximus Mar 7, 2022
f72fd51
Merge pull request #2518 from near/master
MaximusHaximus Mar 22, 2022
0a71cf3
Merge pull request #2545 from near/master
MaximusHaximus Mar 25, 2022
906ce48
Merge pull request #2550 from near/master
MaximusHaximus Mar 25, 2022
fb16919
Merge pull request #2570 from near/master
MaximusHaximus Apr 7, 2022
1e236b9
Merge pull request #2584 from near/master
andy-haynes Apr 19, 2022
227af6a
Merge pull request #2606 from near/master
andy-haynes Apr 25, 2022
12966a0
Merge pull request #2613 from near/master
agileurbanite Apr 26, 2022
da0a39c
Merge pull request #2615 from near/master
agileurbanite Apr 26, 2022
501d57a
Merge pull request #2629 from near/master
MaximusHaximus Apr 29, 2022
80ea411
Merge pull request #2648 from near/master
esaminu May 10, 2022
e637811
Merge pull request #2654 from near/master
andy-haynes May 12, 2022
436e8e8
Merge pull request #2667 from near/master
andy-haynes May 12, 2022
620018b
Merge pull request #2716 from near/master
andy-haynes Jun 2, 2022
33aa48e
Merge pull request #2725 from near/master
andy-haynes Jun 6, 2022
bfd25bc
Merge pull request #2734 from near/master
andy-haynes Jun 7, 2022
e63b84f
Merge pull request #2741 from near/master
andy-haynes Jun 9, 2022
b3eb602
Merge pull request #2753 from near/master
andy-haynes Jun 15, 2022
64c0870
Merge pull request #2768 from near/master
andy-haynes Jun 20, 2022
e00db32
Merge pull request #2789 from near/master
andy-haynes Jun 29, 2022
51c8523
Merge pull request #2810 from near/master
andy-haynes Jul 14, 2022
9e1ba36
Merge pull request #2816 from near/master
andy-haynes Jul 15, 2022
488fe2c
Merge pull request #2826 from near/master
esaminu Jul 19, 2022
a3c327b
Merge pull request #2835 from near/master
andy-haynes Jul 21, 2022
5a3fdd5
Merge pull request #2837 from near/master
andy-haynes Jul 21, 2022
4303472
Merge pull request #2841 from near/master
andy-haynes Jul 22, 2022
a127efa
feat: added privateShardSign route
followdarko Jul 29, 2022
2d0af9f
feat: [draft] Initial support for sign private shards
followdarko Jul 29, 2022
007d773
fix: reduced info about shard meta due to less complexity
followdarko Aug 1, 2022
27fcdc8
refactor: refactored code more closely to prod ready
followdarko Aug 3, 2022
ff7d411
Merge pull request #2869 from near/master
andy-haynes Aug 5, 2022
2a4f630
Merge pull request #2872 from near/master
agileurbanite Aug 6, 2022
a68efd1
Merge pull request #2873 from near/master
andy-haynes Aug 8, 2022
5a6a6e4
fix: add x-api-key to private shard custom RPC provider
xilosada Sep 1, 2022
66e16b4
fix: remove token symbols for private shard transactions
xilosada Sep 1, 2022
fcaa259
fix: handle user cancel and action creators
medicz Sep 6, 2022
d69c57e
fix: add missing action creators to handle private shard transactions
xilosada Sep 7, 2022
6dc8c92
Merge pull request #2 from calimero-is-near/fix/private_shard_tx
xilosada Sep 7, 2022
6c045d6
fix: updated Calimero connection
followdarko Sep 7, 2022
435ef69
Merge pull request #2894 from near/master
Patrick1904 Sep 7, 2022
913f32e
fix: merge branch 'fix/private_shard_tx' of https://github.com/calime…
followdarko Sep 8, 2022
7b4aa5f
fix: merge branch 'calimero-is-near-fix/private_shard_tx' into feat/M…
followdarko Sep 8, 2022
b9eb032
Merge branch 'master' into feat/MYNW-111-private-shard-support
followdarko Sep 8, 2022
41a97b7
fix: bug fixes
followdarko Sep 8, 2022
762c75d
feat: added isWhitelabel flag
followdarko Sep 8, 2022
5e96e6f
fix: cleanup
followdarko Sep 8, 2022
66fbcfb
fix: deploy to copy testnet bucket
Fron10d Sep 9, 2022
57ebca4
fix: delete copy code
Fron10d Sep 9, 2022
e90f467
fix: test deploy
Sep 9, 2022
204f937
test deploy
Sep 9, 2022
6431378
Merge pull request #16 from mynearwallet/deploytestnet
Fron10d Sep 9, 2022
f182c31
Merge pull request #18 from mynearwallet/master
Sep 9, 2022
92ee0ee
Merge branch 'near:master' into feat/MYNW-111-private-shard-support
Sep 9, 2022
8b90516
Merge branch 'near:master' into testnet
Sep 9, 2022
58cd02a
Merge pull request #17 from mynearwallet/feat/MYNW-111-private-shard-…
Sep 9, 2022
7139bf2
fix: add new file for deploy to testnet
Sep 10, 2022
93d9b69
fix: remove netlify toml variables
PinkiNice Sep 10, 2022
da9b63c
Merge pull request #2915 from near/master
Patrick1904 Sep 15, 2022
24a2a52
Merge branch 'near:stable' into stable
Sep 22, 2022
ecb01f7
fix: hide usn from swaps
PinkiNice Sep 22, 2022
582365c
Merge pull request #22 from mynearwallet/MYNW-213-hide-usn-swaps
Sep 22, 2022
764b761
Merge pull request #23 from mynearwallet/master
Sep 22, 2022
5f129ba
add deploy for mainnet
Oct 3, 2022
58f1da0
add deploy for testnet
Oct 3, 2022
c734b6c
add deploy for mainnet
Oct 3, 2022
fed02f7
add deploy from mainnet and testnet branches (#28)
Fron10d Oct 3, 2022
db4bc34
test deploy into 2 env (#31)
Fron10d Oct 4, 2022
612ac8f
fix(nft): increase gas for transfer (#32)
Disti4ct Oct 5, 2022
2ab2b69
feat: add simple FT block-list implementation (#34)
Oct 9, 2022
6cc2660
chore: Merge branch 'testnet' of https://github.com/mynearwallet/near…
PinkiNice Oct 9, 2022
e9ed2c7
Merge pull request #36 from mynearwallet/sync-testnet-master
Oct 9, 2022
fea9cf5
Merge pull request #35 from mynearwallet/master
Oct 9, 2022
691ed8c
Merge branch 'mainnet' into testnet
Oct 9, 2022
708f156
chore: Merge branch 'master' of https://github.com/near/near-wallet
PinkiNice Oct 9, 2022
79ff6cf
fix: remove duplicate line from actions
Oct 9, 2022
d60bfba
Merge pull request #38 from mynearwallet/master
Oct 9, 2022
fe3ecae
Update CODEOWNERS
Oct 10, 2022
687db11
fix: workflow file names, add readme
Fron10d Oct 10, 2022
4a6eaa6
Merge branch 'testnet' of github.com:mynearwallet/near-wallet
Fron10d Oct 10, 2022
1e21cb4
fix: renamed to mynearwallet
Fron10d Oct 10, 2022
70eaa6a
feat/MYNW-78 add DEX swaps (#21)
Disti4ct Oct 11, 2022
124ea60
MWN fix unit tests (#43)
Disti4ct Oct 12, 2022
1c81efa
fix: code formatting for wallet.js (#45)
lapkoshka Oct 12, 2022
1b16b84
MNW-192 change tokens representation (#46)
Disti4ct Oct 14, 2022
f186c60
MNW-218 Add a dynamic list of blacklisted tokens (#42)
Disti4ct Oct 14, 2022
afba488
feat: add ts basic support (#48)
followdarko Oct 17, 2022
2537361
MNW-191 tokens sort (#49)
Disti4ct Oct 18, 2022
855e1e6
feat: enable HAPI checks on mainnet (#51)
followdarko Oct 18, 2022
75bbdaf
fix: correct NEAR sending and token row display (#52)
Disti4ct Oct 19, 2022
a0fe8f8
fix: tuned display error msg in near instead yoctonear (#53)
followdarko Oct 19, 2022
148366d
fix: refactor exports (#55)
lapkoshka Oct 20, 2022
41d10d5
fix: Fix broken redirect (#56)
lapkoshka Oct 21, 2022
6409275
fix: ru translates (#57)
lapkoshka Oct 21, 2022
c734fad
MNW-97 update swap page UI (#50)
Disti4ct Oct 21, 2022
dafb912
feat: added 'yarn run dev' cmd to package json (#60)
followdarko Oct 21, 2022
e4fbf38
feat: removed .vscode folder from git (#59)
followdarko Oct 24, 2022
8113d69
MNW add Prettier (#58)
Disti4ct Oct 24, 2022
a5f8726
feat: removed isWhitelabel and all the stuff (#62)
followdarko Oct 24, 2022
1ec123f
feat: replace blacklist endpoints (#64)
Disti4ct Oct 24, 2022
b7ff415
MNW-233 Filter swap pools and tokens (#63)
Disti4ct Oct 26, 2022
730cdb2
MNW-255 Recovery refactoring + Password Protection in Profile (#54)
lapkoshka Oct 26, 2022
fe04080
feat(wallet): add new events (#67)
Disti4ct Oct 27, 2022
e7da247
MNW-276 Refactor config (#65)
lapkoshka Oct 27, 2022
899500f
MNW-226 Add SetPasswordForm (#69)
lapkoshka Oct 27, 2022
d91f36a
MNW Fix interface issues (#70)
Disti4ct Oct 27, 2022
4aa6ba7
MNW Refactor (#71)
Disti4ct Oct 31, 2022
e99eeba
Start migrate to i18next (#72)
lapkoshka Oct 31, 2022
ea762d1
fix: correct favicon display (#74)
Disti4ct Nov 2, 2022
311cb0b
fix: Fix testnet releases preview deployments
Nov 3, 2022
ccf82e9
MNW-298 Fix the calculation of the token's fiat balance (#78)
Disti4ct Nov 7, 2022
27f1870
MNW Update swap events format (#80)
Disti4ct Nov 8, 2022
448f609
feat: Remove FTX exchange (#83)
lebedev Nov 9, 2022
45cca22
MNW-323: Fix UTORG (#85)
lebedev Nov 9, 2022
1e62c0c
fix(swaps): check wNEAR for deposit (#87)
Disti4ct Nov 9, 2022
dbad223
fix: make verify-owner pass public key as string to the callbackUrl
xilosada Nov 10, 2022
2f2dbf0
feat: pass verify-owner result as a url fragment
xilosada Nov 10, 2022
2ac32e4
Merge pull request #4 from calimero-is-near/xabi_update_2022-11-10
xilosada Nov 10, 2022
31325de
feat: update verify owner
frdomovic Feb 20, 2023
32c09c9
fix: remove unused console.log's
frdomovic Feb 20, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 0 additions & 8 deletions .dockerignore

This file was deleted.

2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Jenkinsfile @morgsmccauley @andy-haynes
Jenkinsfile @pinkinice
15 changes: 15 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
## Issues

<!-- List of issues this pull request is related to or solves -->

## Changes description

<!-- Changes description -->

## Preview

<!-- Any information that helps to see the result of the changes: images, links, etc. -->

## Demo

<!-- If this is possible and these are complex changes, attach a demo for them -->
12 changes: 12 additions & 0 deletions .github/workflows/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# MyNearWallet CICD

[![Build Status](https://travis-ci.com/near/near-wallet.svg?branch=master)](https://travis-ci.com/near/near-wallet)

## DEPLOY TRIGGERS:
On push to mainnet - deploy to app.mynearwallet.com --- deploy-mnw-mainnet.yml

On push to testnet - deploy to testnet.mynerawallet.com --- deploy-mnw-testnet.yml

On push to master - deploy to *-staging.mynearwallet.com --- deploy-staging.yml

On PR to master - deploy *-preview.mynearwallet.com --- pull-request.yml
6 changes: 3 additions & 3 deletions .github/workflows/bundle-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ jobs:
aws-region: us-west-2
role-to-assume: ${{ secrets.AWS_DEPLOYMENT_ROLE }}
role-skip-session-tagging: true
role-duration-seconds: 900
role-duration-seconds: 900
- if: ${{ github.event_name == 'pull_request' }}
run: aws s3 sync dist/${{ inputs.environment }} s3://${{ secrets.S3_BUCKET }}/${{ github.event.pull_request.number }} --delete
- if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/stable') }}
run: aws s3 sync dist/${{ inputs.environment }} s3://${{ secrets.S3_BUCKET }} --delete
- if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/mainnet' || github.ref == 'refs/heads/testnet') }}
run: aws s3 sync dist/${{ inputs.environment }} s3://${{ secrets.S3_BUCKET }} --delete
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Deploy Mainnet
on:
push:
branches:
- stable
- mainnet

concurrency:
group: 'mainnet'
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/deploy-mnw-testnet.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Deploy Testnet

on:
push:
branches:
- testnet

concurrency:
group: 'testnet'
cancel-in-progress: true

jobs:
testnet-live-deploy:
uses: ./.github/workflows/bundle-and-deploy.yml
with:
environment: testnet
near_wallet_env: testnet
secrets: inherit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Deploy Testnet
name: Deploy Staging

on:
push:
Expand All @@ -17,13 +17,6 @@ jobs:
near_wallet_env: testnet_STAGING
secrets: inherit

testnet-live-deploy:
uses: ./.github/workflows/bundle-and-deploy.yml
with:
environment: testnet
near_wallet_env: testnet
secrets: inherit

mainnet-staging-deploy:
uses: ./.github/workflows/bundle-and-deploy.yml
with:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: PR

on:
pull_request:
branches:
- master
- testnet

concurrency:
group: ${{ github.event.pull_request.number }}
Expand Down Expand Up @@ -36,3 +39,4 @@ jobs:
environment: mainnet-preview
near_wallet_env: mainnet_STAGING
secrets: inherit

3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# IDEA
# IDE
.idea
.vscode

# dependencies
/node_modules
Expand Down
10 changes: 0 additions & 10 deletions .gitpod.yml

This file was deleted.

19 changes: 0 additions & 19 deletions .travis.yml

This file was deleted.

8 changes: 0 additions & 8 deletions .vscode/settings.json

This file was deleted.

36 changes: 0 additions & 36 deletions Dockerfile

This file was deleted.

18 changes: 0 additions & 18 deletions Dockerfile.fast

This file was deleted.

Loading