Skip to content

Commit 67a85cc

Browse files
committed
Merge remote-tracking branch 'origin/release-candidate-0.77.0'
2 parents 58e798e + 35718f9 commit 67a85cc

File tree

80 files changed

+1604
-1740
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+1604
-1740
lines changed

.env

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,12 @@ VUE_APP_ONRAMPER_API_KEY=
1212
VUE_APP_SUPPORTED_LOCALES=en,es,zh,pt,ph,cb
1313
VUE_APP_DEFAULT_LOCALE=en
1414
VUE_APP_SOLANA_MAINNET_URL=https://red-sleek-rain.solana-mainnet.discover.quiknode.pro/fc112deb1e0228d09d0d8c12b8de5a601d251d80
15+
VUE_APP_FIREBASE_API_KEY=
16+
VUE_APP_FIREBASE_AUTH_DOMAIN=
17+
VUE_APP_FIREBASE_PROJECT_ID=
18+
VUE_APP_FIREBASE_STORAGE_BUCKET=
19+
VUE_APP_FIREBASE_MESSAGING_SENDER_ID=
20+
VUE_APP_FIREBASE_APP_ID=
21+
VUE_APP_FIREBASE_MEASUREMENT_ID=
22+
VUE_APP_FIREBASE_DATABASE_URL=
1523

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
version: 2
2+
updates:
3+
# Maintain dependencies for GitHub Actions
4+
- package-ecosystem: 'github-actions'
5+
directory: '/'
6+
schedule:
7+
interval: 'daily'

.github/workflows/pullrequests.yml

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,17 @@ jobs:
3131
runs-on: ubuntu-latest
3232
steps:
3333
- name: Checkout code
34-
uses: actions/checkout@v2.4.2
34+
uses: actions/checkout@v3
3535
with:
36+
node-version: 16
3637
fetch-depth: 0
3738

3839
- name: Build project
39-
uses: actions/setup-node@v2.5.1
40+
uses: actions/setup-node@v3
4041
env:
4142
PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: 'true'
4243
with:
43-
node-version: '14'
44+
node-version: 16
4445
# Create screenshots directory
4546
- run: mkdir screenshots
4647

@@ -49,7 +50,7 @@ jobs:
4950
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
5051

5152
- name: Restore yarn cache
52-
uses: actions/cache@v2
53+
uses: actions/cache@v3
5354
id: yarn-cache
5455
with:
5556
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,16 +77,16 @@ jobs:
7677
yarn lint
7778
yarn build
7879
79-
- name: Create wallet artifact
80-
uses: actions/upload-artifact@v2.3.1
81-
if: always()
82-
with:
83-
name: pull-request-wallet
84-
path: dist
85-
if-no-files-found: ignore
86-
retention-days: 30
80+
# - name: Create wallet artifact
81+
# uses: actions/upload-artifact@v2.3.1
82+
# if: always()
83+
# with:
84+
# name: pull-request-wallet
85+
# path: dist
86+
# if-no-files-found: ignore
87+
# retention-days: 30
8788

88-
- name: Run Smoke tests againt PullRequest
89+
- name: Run Smoke tests against PullRequest
8990
uses: beemi/puppeteer-headful@v1.0.11
9091
env:
9192
CI: 'true'
@@ -94,17 +95,17 @@ jobs:
9495
args: yarn test:pullrequest
9596

9697
- name: Save Screenshots
97-
uses: actions/upload-artifact@v2.3.1
98+
uses: actions/upload-artifact@v3
9899
if: always()
99100
with:
100101
name: screenshots
101102
path: screenshots
102103
if-no-files-found: ignore
103104

104-
- name: Discord notification
105-
uses: sarisia/actions-status-discord@v1
106-
if: always()
107-
with:
108-
webhook: ${{ secrets.DISCORD_PULL_REQUESTS_WEBHOOK }}
109-
title: "${{ github.workflow}}"
105+
# - name: Discord notification
106+
# uses: sarisia/actions-status-discord@v1
107+
# if: always()
108+
# with:
109+
# webhook: ${{ secrets.DISCORD_PULL_REQUESTS_WEBHOOK }}
110+
# title: "${{ github.workflow}}"
110111

.github/workflows/release.yml

Lines changed: 40 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,15 @@ env:
2222
# Onramper details
2323
ONRAMPER_WIDGET_URL: ${{ secrets.ONRAMPER_WIDGET_URL }}
2424
ONRAMPER_API_KEY: ${{ secrets.ONRAMPER_API_KEY }}
25+
# firebase details
26+
FIREBASE_API_KEY: ${{ secrets.FIREBASE_API_KEY }}
27+
FIREBASE_AUTH_DOMAIN: ${{ secrets.FIREBASE_AUTH_DOMAIN }}
28+
FIREBASE_PROJECT_ID: ${{ secrets.FIREBASE_PROJECT_ID }}
29+
FIREBASE_STORAGE_BUCKET: ${{ secrets.FIREBASE_STORAGE_BUCKET }}
30+
FIREBASE_MESSAGING_SENDER_ID: ${{ secrets.FIREBASE_MESSAGING_SENDER_ID }}
31+
FIREBASE_APP_ID: ${{ secrets.FIREBASE_APP_ID }}
32+
FIREBASE_MEASUREMENT_ID: ${{ secrets.FIREBASE_MEASUREMENT_ID }}
33+
FIREBASE_DATABASE_URL: ${{ secrets.FIREBASE_DATABASE_URL }}
2534

2635
jobs:
2736
build:
@@ -68,7 +77,6 @@ jobs:
6877
with:
6978
version: ${{ steps.previous_tag.outputs.tag }}
7079

71-
# Minor PROD releases.
7280
- name: Set production agents
7381
run: |
7482
export NODE_OPTIONS="--max-old-space-size=5120"
@@ -77,29 +85,36 @@ jobs:
7785
echo VUE_APP_AVALANCHE_TESTNET_NODE =$AVALANCHE_TESTNET_NODE >> .env
7886
echo VUE_APP_NEAR_MAINNET_URL =$NEAR_MAINNET_URL >> .env
7987
echo VUE_APP_AMPLITUDE_API_KEY =$AMPLITUDE_API_KEY_PROD >> .env
80-
8188
echo VUE_APP_TRANSAK_WIDGET_URL =$TRANSAK_WIDGET_URL_PROD >> .env
8289
echo VUE_APP_TRANSAK_API_KEY =$TRANSAK_API_KEY_PROD >> .env
8390
echo VUE_APP_TRANSAK_DEFAULT_FIAT_CURRENCY =$TRANSAK_DEFAULT_FIAT_CURRENCY >> .env
8491
echo VUE_APP_ONRAMPER_WIDGET_URL =$ONRAMPER_WIDGET_URL >> .env
8592
echo VUE_APP_ONRAMPER_API_KEY =$ONRAMPER_API_KEY >> .env
93+
echo VUE_APP_FIREBASE_API_KEY =$FIREBASE_API_KEY >> .env
94+
echo VUE_APP_FIREBASE_AUTH_DOMAIN =$FIREBASE_AUTH_DOMAIN >> .env
95+
echo VUE_APP_FIREBASE_PROJECT_ID =$FIREBASE_PROJECT_ID >> .env
96+
echo VUE_APP_FIREBASE_STORAGE_BUCKET =$FIREBASE_STORAGE_BUCKET >> .env
97+
echo VUE_APP_FIREBASE_MESSAGING_SENDER_ID =$FIREBASE_MESSAGING_SENDER_ID >> .env
98+
echo VUE_APP_FIREBASE_APP_ID =$FIREBASE_APP_ID >> .env
99+
echo VUE_APP_FIREBASE_MEASUREMENT_ID =$FIREBASE_MEASUREMENT_ID >> .env
100+
echo VUE_APP_FIREBASE_DATABASE_URL =$FIREBASE_DATABASE_URL >> .env
86101
yarn install
87102
yarn lint
88103
yarn build
89104
90-
- name: Save Screenshots
91-
uses: actions/upload-artifact@v2.3.1
92-
if: always()
93-
with:
94-
name: screenshots
95-
path: screenshots
96-
if-no-files-found: ignore
105+
# - name: Save Screenshots
106+
# uses: actions/upload-artifact@v2.3.1
107+
# if: always()
108+
# with:
109+
# name: screenshots
110+
# path: screenshots
111+
# if-no-files-found: ignore
97112

98113
- name: Changelog
99-
uses: mikepenz/release-changelog-builder-action@v3.0.1
100-
id: build_changelog
114+
uses: Bullrich/generate-release-changelog@master
115+
id: Changelog
101116
env:
102-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
117+
REPO: ${{ github.repository }}
103118

104119
- name: Create Release
105120
id: create_release
@@ -110,7 +125,9 @@ jobs:
110125
tag_name: ${{ github.ref }}
111126
release_name: ${{ github.ref }}
112127
body: |
113-
${{steps.build_changelog.outputs.changelog}}
128+
${{ steps.Changelog.outputs.changelog }}
129+
draft: false
130+
prerelease: false
114131

115132
- name: Upload release
116133
uses: actions/upload-release-asset@v1
@@ -122,13 +139,13 @@ jobs:
122139
asset_name: liquality-wallet-${{ steps.get_current_tag.outputs.tag }}.zip
123140
asset_content_type: application/zip
124141

125-
# Run tests against Prod mainnet
126-
# - name: Regression tests against Mainnet (PROD Agent)
127-
# uses: beemi/puppeteer-headful@v1.0.12
128-
# env:
129-
# CI: 'true'
130-
# DISPLAY: :99
131-
# SEED_WORDS: ${{ secrets.TEST_NET_SEED_WORDS }}
132-
# TWENTY_FOUR_SEEDS: ${{ secrets.TWENTY_FOUR_SEEDS }}
133-
# with:
134-
# args: yarn test:mainnet:prodagent:release
142+
# Run tests against Prod mainnet
143+
- name: Regression tests against Mainnet (PROD Agent)
144+
uses: beemi/puppeteer-headful@v1.0.12
145+
env:
146+
CI: 'true'
147+
DISPLAY: :99
148+
SEED_WORDS: ${{ secrets.TEST_NET_SEED_WORDS }}
149+
TWENTY_FOUR_SEEDS: ${{ secrets.TWENTY_FOUR_SEEDS }}
150+
with:
151+
args: yarn test:mainnet:prodagent:release

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,11 @@ $ export SEED_WORDS={testNet import wallet 12 words}
5555
5656
Ex: export SEED_WORDS="test1 test2 test3 test4 test5 test6 test7 test8 test9 test10 test11 test12"
5757
58-
$ npm run test:testNetNetwork
58+
$ npm run test:mainnet:prodagent:release
5959
```
6060

61+
Run single test locally, update the [.mocharc.yml](.mocharc.yml) values ``parallel: false jobs: 1`` and add ``.only`` to the test you want to run.
62+
6163
### Releases
6264

6365
Release to Chrome Store

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "liquality-wallet",
3-
"version": "0.76.0",
3+
"version": "0.77.0",
44
"private": true,
55
"author": "Liquality <info@liquality.io>",
66
"scripts": {
@@ -21,12 +21,12 @@
2121
"test-full-regression": "node_modules/mocha/bin/mocha"
2222
},
2323
"dependencies": {
24-
"@liquality/cryptoassets": "1.16.1",
24+
"@liquality/cryptoassets": "1.16.2",
2525
"@liquality/ethereum-utils": "^1.13.12",
2626
"@liquality/terra-networks": "^1.13.12",
2727
"@liquality/types": "^1.13.12",
28-
"@liquality/wallet-core": "1.31.1",
29-
"@terra-money/terra.js": "3.1.3",
28+
"@liquality/wallet-core": "1.31.3",
29+
"@terra-money/terra.js": "^3.1.6",
3030
"@testing-library/vue": "^5.8.2",
3131
"amplitude-js": "8.18.2",
3232
"bignumber.js": "9.1.0",
@@ -41,6 +41,7 @@
4141
"date-fns": "2.28.0",
4242
"ethers": "5.7.0",
4343
"extension-port-stream": "^2.0.1",
44+
"firebase": "^9.12.1",
4445
"human-standard-token-abi": "^2.0.0",
4546
"i18n-js": "^4.1.1",
4647
"lodash-es": "^4.17.15",

src/App.vue

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,14 @@ export default {
2828
}
2929
},
3030
computed: {
31-
...mapState(['activeNetwork', 'brokerReady', 'keyUpdatedAt', 'termsAcceptedAt', 'unlockedAt']),
31+
...mapState([
32+
'activeNetwork',
33+
'brokerReady',
34+
'keyUpdatedAt',
35+
'termsAcceptedAt',
36+
'unlockedAt',
37+
'whatsNewModalVersion'
38+
]),
3239
...mapState({
3340
locale: (state) => state.app?.locale
3441
}),
@@ -41,7 +48,7 @@ export default {
4148
},
4249
methods: {
4350
...mapActions(['initializeAnalytics']),
44-
...mapActions('app', ['setLocalePreference', 'getBrowserLocale'])
51+
...mapActions('app', ['setLocalePreference', 'getBrowserLocale', 'setWhatsNewModalContent'])
4552
},
4653
async created() {
4754
await this.initializeAnalytics()
@@ -56,6 +63,13 @@ export default {
5663
// store the locale in state
5764
await this.setLocalePreference({ locale: this.currentLocale })
5865
}
66+
if (
67+
this.whatsNewModalVersion !== this.appVersion ||
68+
process.env.VUE_APP_SHOW_WHATS_NEW_ALWAYS
69+
) {
70+
const content = await import(`@/locales/${this.currentLocale}/whats_new.json`)
71+
await this.setWhatsNewModalContent({ content: content.default })
72+
}
5973
this.localesLoaded = true
6074
},
6175
watch: {

src/assets/icons/arrow_left.svg

Lines changed: 3 additions & 0 deletions
Loading

src/assets/icons/arrow_right.svg

Lines changed: 3 additions & 0 deletions
Loading

src/assets/scss/_overrides.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ $dark: #f0f7f9;
1313
$color-text-primary: #1d1e21;
1414
$color-text-secondary: #ffffff;
1515
$color-text-muted: #747e8d;
16+
$color-text-grey: #3d4767;
1617

1718
$font-size-base: 0.75rem; // Assumes the browse, typically `16px`
1819
$font-size-lg: 1rem;

0 commit comments

Comments
 (0)