Skip to content

Commit

Permalink
Merge pull request #974 from liquality/develop
Browse files Browse the repository at this point in the history 
Release 0.82.5 to master
  • Loading branch information
@bradleySuira
bradleySuira authored Jan 3, 2023
2 parents 6940404 + 607ca18 commit 0ec77ac
Show file tree
Hide file tree
Showing 61 changed files with 2,915 additions and 1,788 deletions.
5 changes: 4 additions & 1 deletion .env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,7 @@ VUE_APP_FIREBASE_APP_ID=
VUE_APP_FIREBASE_MEASUREMENT_ID=
VUE_APP_FIREBASE_DATABASE_URL=
VUE_APP_MAX_ERROR_LOG_SIZE=100
VUE_APP_REPORT_TARGETS=
VUE_APP_REPORT_TARGETS=Sentry
VUE_APP_NPM_PACKAGE_VERSION=0_81_0
VUE_APP_SENTRY_DSN=https://2c52b9d6e67741cf9d4eabe32369827a@o241807.ingest.sentry.io/5444900

1 change: 1 addition & 0 deletions .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ env:
FIREBASE_APP_ID: ${{ secrets.FIREBASE_APP_ID }}
FIREBASE_MEASUREMENT_ID: ${{ secrets.FIREBASE_MEASUREMENT_ID }}
FIREBASE_DATABASE_URL: ${{ secrets.FIREBASE_DATABASE_URL }}
NODE_OPTIONS: "--max_old_space_size=4096"

jobs:
build:
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,7 @@ artifacts
.yarn/cache
.yarn/versions
.yarn/install-state.gz
.yarn/unplugged
.yarn/unplugged

yalc.lock
.yalc
20 changes: 15 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "liquality-wallet",
"version": "0.81.0",
"version": "0.82.5",
"private": true,
"author": "Liquality <info@liquality.io>",
"scripts": {
Expand All @@ -10,6 +10,7 @@
"build:staging": "vue-cli-service build --mode staging",
"clean": "rm -rf node_modules",
"dev": "vue-cli-service build --mode development --watch",
"dev:tools": "vue-devtools & vue-cli-service build --mode development --watch",
"jest": "jest",
"postinstall": "husky install",
"sync-versions": "node script/sync-versions.js",
Expand All @@ -18,15 +19,17 @@
"test:mainnet:prodagent": "NODE_ENV=mainnet NODE_AGENT=prodagent node_modules/mocha/bin/mocha --grep 'MAINNET'",
"test:mainnet:prodagent:release": "NODE_ENV=mainnet NODE_AGENT=prodagent node_modules/mocha/bin/mocha --grep 'MAINNET_RELEASE'",
"test:pullrequest": "node_modules/mocha/bin/mocha --grep 'PULL_REQUEST_TEST'",
"test-full-regression": "node_modules/mocha/bin/mocha"
"test-full-regression": "node_modules/mocha/bin/mocha",
"devtools": "node_modules/.bin/vue-devtools"
},
"dependencies": {
"@liquality/cryptoassets": "2.1.0-next.2",
"@liquality/error-parser": "2.0.1-next.2",
"@chainify/hw-ledger": "2.2.0",
"@liquality/cryptoassets": "2.1.0",
"@liquality/error-parser": "2.0.1",
"@liquality/ethereum-utils": "^1.13.12",
"@liquality/terra-networks": "^1.13.12",
"@liquality/types": "^1.13.12",
"@liquality/wallet-core": "3.0.0",
"@liquality/wallet-core": "4.1.0",
"@terra-money/terra.js": "^3.1.6",
"@testing-library/vue": "^5.8.2",
"amplitude-js": "8.18.2",
Expand Down Expand Up @@ -76,6 +79,7 @@
"@vue/cli-plugin-unit-jest": "^4.5.8",
"@vue/cli-plugin-vuex": "4.5.15",
"@vue/cli-service": "4.5.15",
"@vue/devtools": "^6.4.5",
"@vue/eslint-config-prettier": "^6.0.0",
"@vue/test-utils": "1.3.3",
"babel-eslint": "^10.1.0",
Expand Down Expand Up @@ -119,5 +123,11 @@
"repository": {
"type": "git",
"url": "git@github.com:liquality/wallet.git"
},
"resolutions": {
"@ledgerhq/devices": "6.27.1",
"@ledgerhq/hw-transport": "6.27.1",
"@ledgerhq/hw-transport-webhid": "6.27.1",
"@ledgerhq/hw-app-eth": "6.26.0"
}
}
59 changes: 29 additions & 30 deletions src/App.vue
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<template>
<div id="app">
<template v-if="brokerReady && localesLoaded">
<Head v-if="unlockedAt" :show-dapp-connections="showDappConnections" />
<template v-if="unlockedAt && termsAcceptedAt">
<Head :show-dapp-connections="showDappConnections" />
<GlobalModals />
</template>
<router-view />
<GlobalModals v-if="unlockedAt && termsAcceptedAt" />
</template>
<div class="login-wrapper spinner-container" v-else>
<SpinnerIcon class="btn-loading" />
Expand All @@ -14,12 +16,11 @@
<script>
import { mapState, mapActions } from 'vuex'
import Head from '@/components/Head.vue'
import GlobalModals from '@/components/GlobalModals.vue'
import SpinnerIcon from '@/assets/icons/spinner.svg'
export default {
components: {
Head,
GlobalModals,
GlobalModals: () => import('@/components/GlobalModals.vue'),
SpinnerIcon
},
data() {
Expand Down Expand Up @@ -50,32 +51,30 @@ export default {
...mapActions(['initializeAnalytics']),
...mapActions('app', ['setLocalePreference', 'getBrowserLocale', 'setWhatsNewModalContent'])
},
async created() {
await this.initializeAnalytics()
if (this.locale) {
await this.changeLocale(this.locale)
} else {
const browserLocale = await this.getBrowserLocale()
const _locale = this.locales.includes(browserLocale)
? browserLocale
: process.env.VUE_APP_DEFAULT_LOCALE
await this.changeLocale(_locale)
// store the locale in state
await this.setLocalePreference({ locale: this.currentLocale })
}
if (
this.whatsNewModalVersion !== this.appVersion ||
process.env.VUE_APP_SHOW_WHATS_NEW_ALWAYS
) {
const content = await import(`@/locales/${this.currentLocale}/whats_new.json`)
await this.setWhatsNewModalContent({ content: content.default })
}
this.localesLoaded = true
},
watch: {
localeKey(newVal, oldVal) {
console.log('localeKey', newVal, oldVal)
}
mounted() {
this.initializeAnalytics()
setTimeout(async () => {
if (this.locale) {
await this.changeLocale(this.locale)
} else {
const browserLocale = await this.getBrowserLocale()
const _locale = this.locales.includes(browserLocale)
? browserLocale
: process.env.VUE_APP_DEFAULT_LOCALE
await this.changeLocale(_locale)
// store the locale in state
await this.setLocalePreference({ locale: _locale })
}
if (
this.whatsNewModalVersion !== this.appVersion ||
process.env.VUE_APP_SHOW_WHATS_NEW_ALWAYS
) {
const content = await import(`@/locales/${this.currentLocale}/whats_new.json`)
this.setWhatsNewModalContent({ content: content.default })
}
this.localesLoaded = true
}, 1000)
}
}
</script>
Expand Down
14 changes: 14 additions & 0 deletions src/assets/scss/style.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -872,6 +872,11 @@ svg.qr-icon {
z-index: 9999;
}


.modal-dialog {
min-width: 320px !important;
}

.modal-dialog-bottom {
display: flex;
align-items: flex-end;
Expand Down Expand Up @@ -981,3 +986,12 @@ svg.qr-icon {
.custom-control-input:checked ~ .custom-control-label::after {
background-image: none !important;
}

.fade-enter-active,
.fade-leave-active {
transition: opacity 0.1s ease;
}
.fade-enter-from,
.fade-leave-to {
opacity: 0;
}
46 changes: 24 additions & 22 deletions src/background.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@ function asyncLoop(fn, delay) {
.then(() => asyncLoop(fn, delay))
}

chrome.runtime.onInstalled.addListener((details) => {
if (details.reason === 'install') {
chrome.runtime.setUninstallURL('https://liquality.typeform.com/feedbackuninst')
}
})
if (process.env.NODE_ENV !== 'development') {
chrome.runtime.onInstalled.addListener((details) => {
if (details.reason === 'install') {
chrome.runtime.setUninstallURL('https://liquality.typeform.com/feedbackuninst')
}
})
}

function getBalance(state) {
let total = 0
Expand All @@ -32,7 +34,7 @@ function getBalance(state) {
return total
}

store.subscribe(async ({ type, payload }, state) => {
store.subscribe(({ type, payload }, state) => {
let currentState = _.cloneDeep(state)
const { dispatch, getters } = store

Expand Down Expand Up @@ -79,7 +81,7 @@ store.subscribe(async ({ type, payload }, state) => {
network: state.activeNetwork,
walletId: state.activeWalletId
})
await dispatch('app/trackAnalytics', {
dispatch('app/trackAnalytics', {
event: `Change Active Network to ${state.activeNetwork}`,
properties: {
walletVersion,
Expand All @@ -99,7 +101,7 @@ store.subscribe(async ({ type, payload }, state) => {
dispatch('updateMarketData', { network: state.activeNetwork })
break
case 'LOCK_WALLET':
await dispatch('app/trackAnalytics', {
dispatch('app/trackAnalytics', {
event: 'Wallet locked successfully',
properties: {
walletVersion,
Expand Down Expand Up @@ -154,7 +156,7 @@ store.subscribe(async ({ type, payload }, state) => {
// eslint-disable-next-line no-case-declarations
let toAmountValue = unitToCurrency(cryptoassets[payload.swap.to], payload.swap.toAmount)

await dispatch('app/trackAnalytics', {
dispatch('app/trackAnalytics', {
event: 'New SWAP',
properties: {
category: 'Swaps',
Expand All @@ -177,7 +179,7 @@ store.subscribe(async ({ type, payload }, state) => {
cryptoassets[payload.transaction.from],
payload.transaction.amount
)
await dispatch('app/trackAnalytics', {
dispatch('app/trackAnalytics', {
event: `User send funds`,
properties: {
walletVersion,
Expand All @@ -193,7 +195,7 @@ store.subscribe(async ({ type, payload }, state) => {
})
break
case 'ADD_EXTERNAL_CONNECTION':
await dispatch('app/trackAnalytics', {
dispatch('app/trackAnalytics', {
event: 'Connect to Dapps',
properties: {
walletVersion,
Expand All @@ -206,7 +208,7 @@ store.subscribe(async ({ type, payload }, state) => {
})
break
case 'ADD_CUSTOM_TOKEN':
await dispatch('app/trackAnalytics', {
dispatch('app/trackAnalytics', {
event: 'Custom Token Added',
properties: {
walletVersion,
Expand All @@ -224,7 +226,7 @@ store.subscribe(async ({ type, payload }, state) => {
})
break
case 'REMOVE_CUSTOM_TOKEN':
await dispatch('app/trackAnalytics', {
dispatch('app/trackAnalytics', {
event: 'Custom Token Removed',
properties: {
walletVersion,
Expand All @@ -240,7 +242,7 @@ store.subscribe(async ({ type, payload }, state) => {
const item = getters.historyItemById(payload.network, payload.walletId, payload.id)
if (item.type === 'SWAP' && payload.updates) {
if (payload.updates.status !== 'undefined') {
await dispatch('app/trackAnalytics', {
dispatch('app/trackAnalytics', {
event: 'Swap status change',
properties: {
walletVersion,
Expand All @@ -256,7 +258,7 @@ store.subscribe(async ({ type, payload }, state) => {
}
if (item.type === 'SEND' && payload.updates) {
if (payload.updates.status !== 'undefined') {
await dispatch('app/trackAnalytics', {
dispatch('app/trackAnalytics', {
event: 'Send status change',
properties: {
walletVersion,
Expand All @@ -270,7 +272,7 @@ store.subscribe(async ({ type, payload }, state) => {
}
if (item.type === 'NFT' && payload.updates) {
if (payload.updates.status !== 'undefined') {
await dispatch('app/trackAnalytics', {
dispatch('app/trackAnalytics', {
event: 'Send NFT status change',
properties: {
walletVersion,
Expand All @@ -289,7 +291,7 @@ store.subscribe(async ({ type, payload }, state) => {
const newBalance = getBalance(currentState)
// Only trigger event for the first time when user funds their wallet, any subsequent balance updates are ignored.
if (prevBalance === 0 && newBalance > prevBalance) {
await dispatch('app/trackAnalytics', {
dispatch('app/trackAnalytics', {
event: 'User funded wallet',
properties: {
walletVersion,
Expand All @@ -302,7 +304,7 @@ store.subscribe(async ({ type, payload }, state) => {
prevState = currentState
break
case 'TOGGLE_EXPERIMENT':
await dispatch('app/trackAnalytics', {
dispatch('app/trackAnalytics', {
event: `User on Experiment feature ${payload.name}`,
properties: {
walletVersion,
Expand All @@ -313,7 +315,7 @@ store.subscribe(async ({ type, payload }, state) => {
})
break
case 'CHANGE_PASSWORD':
await dispatch('app/trackAnalytics', {
dispatch('app/trackAnalytics', {
walletVersion,
event: 'Change Password',
properties: {
Expand All @@ -323,7 +325,7 @@ store.subscribe(async ({ type, payload }, state) => {
})
break
case 'DISABLE_ASSETS':
await dispatch('app/trackAnalytics', {
dispatch('app/trackAnalytics', {
walletVersion,
event: 'User Disable Asset',
properties: {
Expand All @@ -334,7 +336,7 @@ store.subscribe(async ({ type, payload }, state) => {
})
break
case 'DISABLE_ETHEREUM_INJECTION':
await dispatch('app/trackAnalytics', {
dispatch('app/trackAnalytics', {
walletVersion,
event: 'User Disable Default Web3 Wallet Injection',
properties: {
Expand All @@ -344,7 +346,7 @@ store.subscribe(async ({ type, payload }, state) => {
})
break
case 'ENABLE_ETHEREUM_INJECTION':
await dispatch('app/trackAnalytics', {
dispatch('app/trackAnalytics', {
walletVersion,
event: 'User Enable Default Web3 Wallet Injection',
properties: {
Expand Down
Loading

0 comments on commit 0ec77ac

Please sign in to comment.