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.

Sign up for GitHub

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

Jump to bottom

add ripple to wallet list #2380

Merged
merged 1 commit into from
Nov 28, 2023
Merged

add ripple to wallet list #2380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3,422 changes: 2,141 additions & 1,281 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

53 changes: 26 additions & 27 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,37 +37,37 @@
"@metamask/contract-metadata": "^2.4.0",
"@metamask/eth-json-rpc-infura": "^9.0.0",
"@metamask/eth-json-rpc-middleware": "^12.0.1",
"@metamask/eth-json-rpc-provider": "^2.2.0",
"@metamask/eth-sig-util": "^7.0.0",
"@sentry/browser": "^7.77.0",
"@sentry/tracing": "^7.77.0",
"@sentry/vue": "^7.77.0",
"@metamask/eth-json-rpc-provider": "^2.3.0",
"@metamask/eth-sig-util": "^7.0.1",
"@sentry/browser": "^7.82.0",
"@sentry/tracing": "^7.82.0",
"@sentry/vue": "^7.82.0",
"@toruslabs/broadcast-channel": "^9.0.1",
"@toruslabs/eccrypto": "^4.0.0",
"@toruslabs/http-helpers": "^5.0.0",
"@toruslabs/loglevel-sentry": "^6.0.1",
"@toruslabs/metadata-helpers": "^5.0.0",
"@toruslabs/openlogin": "^6.0.0",
"@toruslabs/openlogin-jrpc": "^6.0.0",
"@toruslabs/openlogin": "^6.1.0",
"@toruslabs/openlogin-jrpc": "^6.1.0",
"@toruslabs/openlogin-session-manager": "^3.0.0",
"@toruslabs/openlogin-subkey": "^6.0.0",
"@toruslabs/openlogin-utils": "^6.0.0",
"@toruslabs/openlogin-utils": "^6.1.0",
"@uniswap/default-token-list": "^11.9.0",
"@walletconnect/sign-client": "^2.10.4",
"@walletconnect/utils": "^2.10.4",
"@walletconnect/sign-client": "^2.10.5",
"@walletconnect/utils": "^2.10.5",
"await-semaphore": "^0.1.3",
"bignumber.js": "^9.1.2",
"bn.js": "^5.2.1",
"bowser": "^2.11.0",
"copy-to-clipboard": "^3.3.3",
"core-js": "^3.33.2",
"core-js": "^3.33.3",
"das-sdk": "^1.9.3",
"deepmerge": "^4.3.1",
"eth-block-tracker": "^8.1.0",
"eth-json-rpc-filters": "^6.0.1",
"eth-query": "^2.1.2",
"eth-rpc-errors": "^4.0.3",
"ethers": "^6.8.1",
"ethers": "^6.9.0",
"ethjs-query": "^0.3.8",
"fast-json-patch": "^3.1.1",
"jsonschema": "^1.4.1",
Expand Down Expand Up @@ -97,14 +97,14 @@
"workbox-strategies": "^7.0.0"
},
"devDependencies": {
"@babel/core": "^7.23.2",
"@babel/eslint-parser": "^7.22.15",
"@babel/core": "^7.23.3",
"@babel/eslint-parser": "^7.23.3",
"@babel/eslint-plugin": "^7.22.10",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-numeric-separator": "^7.18.6",
"@babel/preset-env": "^7.23.2",
"@babel/preset-env": "^7.23.3",
"@babel/register": "^7.22.15",
"@sentry/cli": "^2.21.2",
"@sentry/cli": "^2.22.3",
"@vue/cli-plugin-babel": "^5.0.8",
"@vue/cli-plugin-eslint": "^5.0.8",
"@vue/cli-plugin-pwa": "^5.0.8",
Expand All @@ -115,13 +115,13 @@
"cross-env": "^7.0.3",
"dotenv": "^16.3.1",
"empty-module": "0.0.2",
"eslint": "^8.53.0",
"eslint": "^8.54.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-prettier": "^9.0.0",
"eslint-config-problems": "^8.0.0",
"eslint-config-standard": "^17.1.0",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-n": "^16.3.0",
"eslint-plugin-n": "^16.3.1",
"eslint-plugin-only-error": "^1.0.2",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-promise": "^6.1.1",
Expand All @@ -131,29 +131,28 @@
"eslint-plugin-vue": "^9.18.1",
"eslint-plugin-vue-scoped-css": "^2.5.1",
"express": "^4.18.2",
"fibers": "^5.0.3",
"ganache": "^7.9.1",
"husky": "^8.0.3",
"jsdom": "^22.1.0",
"jsdom": "^23.0.0",
"jsdom-global": "^3.0.2",
"lint-staged": "^15.0.2",
"lint-staged": "^15.1.0",
"lodash-es": "^4.17.21",
"luxon": "^3.4.3",
"luxon": "^3.4.4",
"mocha": "^10.2.0",
"nock": "13.3.8",
"nock": "13.4.0",
"nyc": "^15.1.0",
"prettier": "^3.0.3",
"prettier": "^3.1.0",
"process": "^0.11.10",
"puppeteer": "^21.5.0",
"puppeteer": "^21.5.2",
"sass": "~1.32.13",
"sass-loader": "^13.3.2",
"sinon": "^15.2.0",
"stylus": "^0.60.0",
"stylus": "^0.62.0",
"stylus-loader": "^7.1.3",
"terser-webpack-plugin": "^5.3.9",
"through2": "^4.0.2",
"uglifyify": "^5.0.2",
"undici": "^5.27.2",
"undici": "^5.28.1",
"url": "^0.11.3",
"vue-cli-plugin-vuetify": "^2.5.8",
"vue-cli-plugin-webpack-bundle-analyzer": "~4.0.0",
Expand Down
8 changes: 4 additions & 4 deletions src/components/Confirm/ConfirmForm/ConfirmForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,8 @@
assetParams.type.toLowerCase() === CONTRACT_TYPE_ERC20
? parseInt(assetParams.options.balance)
: assetParams.type.toLowerCase() === CONTRACT_TYPE_ERC721
? 1
: parseInt(assetParams.options.balance)
? 1
: parseInt(assetParams.options.balance)
"
:explorerlink="assetParams.type.toLowerCase() === CONTRACT_TYPE_ERC20 ? '' : assetParams.options.explorerLink"
:symbol="assetParams.type.toLowerCase() === CONTRACT_TYPE_ERC20 ? assetParams.options.symbol : ''"
Expand Down Expand Up @@ -264,8 +264,8 @@
type === MESSAGE_TYPE.ETH_GET_ENCRYPTION_PUBLIC_KEY
? t('dappProvider.encryptionRequest')
: type === MESSAGE_TYPE.ETH_DECRYPT
? t('dappProvider.decryptionRequest')
: t('dappTransfer.permission')
? t('dappProvider.decryptionRequest')
: t('dappTransfer.permission')
}}
</div>
</v-flex>
Expand Down
4 changes: 2 additions & 2 deletions src/containers/WalletTransfer/WalletTransfer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,8 @@
amount <= 0
? ''
: convertedAmount
? `~ ${convertedAmount} ${!!toggle_exclusive && selectedItem ? selectedItem.symbol : selectedCurrency}`
: ''
? `~ ${convertedAmount} ${!!toggle_exclusive && selectedItem ? selectedItem.symbol : selectedCurrency}`
: ''
"
persistent-hint
type="number"
Expand Down
3 changes: 1 addition & 2 deletions src/controllers/TorusKeyring.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,7 @@ export default class TorusKeyring extends EventEmitter {
const wallet = this._getWalletForAccount(address)
const privKey = wallet.privateKey
const stripped = stripHexPrefix(privKey)
const buffer = Buffer.from(stripped, 'hex')
return getEncryptionPublicKey(buffer)
return getEncryptionPublicKey(stripped)
}

decryptMessage(data, address) {
Expand Down
1 change: 1 addition & 0 deletions src/replay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export class Replay {}
1 change: 1 addition & 0 deletions src/utils/enums.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -993,6 +993,7 @@ export const AVAILABLE_WEBSITES = {
Solana: 'https://solana.tor.us',
Polygon: 'https://polygon.tor.us',
Binance: 'https://bnb.tor.us',
'XRP Ledger': 'https://xrpl.tor.us',
}

export const FORCE_POPUP_LOGIN_MODE = [FACEBOOK_LOGIN_PROVIDER, LINE_LOGIN_PROVIDER]
5 changes: 5 additions & 0 deletions test/helper.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
/* eslint-disable no-console */
import { atob, btoa } from 'node:buffer'

import Register from '@babel/register'
import Ganache from 'ganache'
import JSDOM from 'jsdom-global'
Expand Down Expand Up @@ -68,6 +70,9 @@ const storeFn = {
globalThis.localStorage = { ...storeFn }
globalThis.sessionStorage = { ...storeFn }

globalThis.atob = atob
globalThis.btoa = btoa

Register({
extensions: ['.js'],
rootMode: 'upward',
Expand Down
1 change: 1 addition & 0 deletions vue.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ module.exports = {
'#': path.resolve(__dirname, 'src/'),
lodash: path.resolve(__dirname, 'node_modules/lodash-es'),
wasmcurves: path.resolve(__dirname, 'node_modules/empty-module'),
'@sentry/replay': path.resolve(__dirname, 'src/replay.js'),
}
config.plugins.push(new IgnorePlugin({ resourceRegExp: /^\.\/wordlists\/(?!english)/, contextRegExp: /bip39\/src$/ }))
config.plugins.push(
Expand Down
Loading