Skip to content

Commit 0e6d816

Browse files
committed
Merge branch 'main' into feat/safari-support
2 parents 4c181a6 + ccbae8f commit 0e6d816

68 files changed

Lines changed: 2378 additions & 4832 deletions

File tree

Some content is hidden

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"devDependencies": {
3535
"@commitlint/cli": "^19.8.1",
3636
"@commitlint/config-conventional": "^19.8.1",
37-
"@swc/core": "^1.11.24",
37+
"@swc/core": "^1.11.29",
3838
"concurrently": "^9.1.2",
3939
"husky": "^9.1.7",
4040
"node-notifier": "^10.0.1",

packages/extension-bridge/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@
4444
"webextension-polyfill": "^0.12.0"
4545
},
4646
"devDependencies": {
47-
"@types/node": "^22.15.17",
47+
"@types/node": "^22.15.24",
4848
"@types/webextension-polyfill": "^0.12.3",
49-
"@typescript-eslint/eslint-plugin": "^8.32.1",
50-
"@typescript-eslint/parser": "^8.32.1",
51-
"bumpp": "^10.1.0",
52-
"eslint": "^9.26.0",
49+
"@typescript-eslint/eslint-plugin": "^8.33.0",
50+
"@typescript-eslint/parser": "^8.33.0",
51+
"bumpp": "^10.1.1",
52+
"eslint": "^9.27.0",
5353
"eslint-config-airbnb-base": "^15.0.0",
5454
"eslint-config-prettier": "^10.1.5",
5555
"eslint-import-resolver-alias": "^1.1.2",
@@ -58,9 +58,9 @@
5858
"prettier": "^3.5.3",
5959
"ts-node": "^10.9.2",
6060
"tsconfig-paths": "^4.2.0",
61-
"tsup": "^8.4.0",
61+
"tsup": "^8.5.0",
6262
"type-fest": "^4.41.0",
6363
"typescript": "^5.8.3",
64-
"typescript-eslint": "8.32.1"
64+
"typescript-eslint": "8.33.0"
6565
}
6666
}

packages/extension/package.json

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@enkryptcom/extension",
3-
"version": "2.7.0",
3+
"version": "2.8.0",
44
"private": true,
55
"type": "module",
66
"scripts": {
@@ -24,7 +24,7 @@
2424
"watch:firefox": "yarn prebuild && cross-env BROWSER='firefox' vite"
2525
},
2626
"dependencies": {
27-
"@amplitude/analytics-browser": "^2.17.4",
27+
"@amplitude/analytics-browser": "^2.17.6",
2828
"@enkryptcom/extension-bridge": "workspace:^",
2929
"@enkryptcom/hw-wallets": "workspace:^",
3030
"@enkryptcom/keyring": "workspace:^",
@@ -39,19 +39,19 @@
3939
"@ethereumjs/wallet": "^2.0.4",
4040
"@kadena/client": "^1.17.1",
4141
"@kadena/pactjs-cli": "^1.17.1",
42-
"@ledgerhq/hw-transport-webusb": "^6.29.4",
42+
"@ledgerhq/hw-transport-webusb": "^6.29.5",
4343
"@metamask/eth-sig-util": "^8.2.0",
44-
"@metaplex-foundation/mpl-bubblegum": "^5.0.0",
44+
"@metaplex-foundation/mpl-bubblegum": "^5.0.1",
4545
"@metaplex-foundation/umi": "^1.2.0",
4646
"@metaplex-foundation/umi-bundle-defaults": "^1.2.0",
47-
"@polkadot/api": "^15.9.3",
48-
"@polkadot/extension-inject": "^0.58.9",
49-
"@polkadot/keyring": "^13.4.4",
50-
"@polkadot/rpc-provider": "^15.9.3",
51-
"@polkadot/types": "^15.9.3",
52-
"@polkadot/types-known": "^15.9.3",
53-
"@polkadot/ui-shared": "^3.13.1",
54-
"@polkadot/util": "^13.4.4",
47+
"@polkadot/api": "^16.1.1",
48+
"@polkadot/extension-inject": "^0.58.10",
49+
"@polkadot/keyring": "^13.5.1",
50+
"@polkadot/rpc-provider": "^16.1.1",
51+
"@polkadot/types": "^16.1.1",
52+
"@polkadot/types-known": "^16.1.1",
53+
"@polkadot/ui-shared": "^3.14.1",
54+
"@polkadot/util": "^13.5.1",
5555
"@polkadot/wasm-crypto": "^7.4.1",
5656
"@solana-developers/helpers": "2.8.0",
5757
"@solana/spl-token": "^0.4.13",
@@ -79,7 +79,7 @@
7979
"switch-ts": "^1.1.1",
8080
"url-parse": "^1.5.10",
8181
"uuid": "^11.1.0",
82-
"vue": "^3.5.13",
82+
"vue": "^3.5.16",
8383
"vue-echarts": "7.0.3",
8484
"vue-router": "^4.5.1",
8585
"vue3-lottie": "^3.3.1",
@@ -100,13 +100,13 @@
100100
"@rollup/plugin-typescript": "^12.1.2",
101101
"@tsconfig/node20": "^20.1.5",
102102
"@types/bs58": "^5.0.0",
103-
"@types/chrome": "^0.0.322",
103+
"@types/chrome": "^0.0.323",
104104
"@types/ethereumjs-abi": "^0.6.5",
105105
"@types/events": "^3.0.3",
106106
"@types/fs-extra": "^11.0.4",
107107
"@types/less": "^3.0.8",
108-
"@types/lodash": "^4.17.16",
109-
"@types/node": "^22.15.17",
108+
"@types/lodash": "^4.17.17",
109+
"@types/node": "^22.15.24",
110110
"@types/semver": "^7.7.0",
111111
"@types/url-parse": "^1.4.11",
112112
"@types/utf-8-validate": "^5.0.2",
@@ -117,28 +117,28 @@
117117
"@vue/eslint-config-prettier": "^10.2.0",
118118
"@vue/eslint-config-typescript": "^14.5.0",
119119
"@vue/tsconfig": "^0.7.0",
120-
"@vueuse/core": "^13.1.0",
120+
"@vueuse/core": "^13.3.0",
121121
"cross-env": "^7.0.3",
122-
"eslint": "^9.26.0",
122+
"eslint": "^9.27.0",
123123
"eslint-plugin-vue": "^10.1.0",
124124
"fs-extra": "^11.3.0",
125125
"jsdom": "^26.1.0",
126126
"less": "^4.3.0",
127127
"less-loader": "^12.3.0",
128-
"npm-run-all2": "^8.0.1",
128+
"npm-run-all2": "^8.0.4",
129129
"prettier": "^3.5.3",
130130
"rimraf": "^6.0.1",
131-
"rollup": "^4.40.2",
132-
"rollup-plugin-visualizer": "^5.14.0",
131+
"rollup": "^4.41.1",
132+
"rollup-plugin-visualizer": "^6.0.1",
133133
"semver": "^7.7.2",
134-
"systeminformation": "^5.25.11",
135-
"tsup": "^8.4.0",
134+
"systeminformation": "^5.27.1",
135+
"tsup": "^8.5.0",
136136
"typescript": "~5.8.3",
137137
"url": "^0.11.4",
138138
"vite": "^6.3.5",
139139
"vite-plugin-node-polyfills": "0.23.0",
140140
"vite-tsconfig-paths": "^5.1.4",
141-
"vitest": "^3.1.3",
141+
"vitest": "^3.1.4",
142142
"vue-tsc": "^2.2.10",
143143
"webextension-polyfill": "^0.12.0"
144144
},

packages/extension/src/libs/name-resolver/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ class GenericNameResolver {
1414
});
1515
}
1616

17-
async resolveName(name: string, coins: CoinType[]): Promise<string | null> {
17+
async resolveName(name: string, coins: CoinType[], providerChain?: string): Promise<string | null> {
1818
let response: string | null = null;
1919
for (const coin of coins) {
2020
response = await this.nameResolver
21-
.resolveAddress(name, coin)
21+
.resolveAddress(name, coin, providerChain)
2222
.catch(() => null);
2323
if (response) return response;
2424
}

packages/extension/src/providers/bitcoin/types/bitcoin-network.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { BitcoinNetworkInfo } from '.';
1010
import { payments } from 'bitcoinjs-lib';
1111
import { hexToBuffer, fromBase } from '@enkryptcom/utils';
1212
import {
13-
formatFiatValue,
1413
formatFloatingPointValue,
1514
} from '@/libs/utils/number-formatter';
1615
import MarketData from '@/libs/market-data';
@@ -131,13 +130,12 @@ export class BitcoinNetwork extends BaseNetwork {
131130
balance: balance,
132131
balancef: formatFloatingPointValue(userBalance).value,
133132
balanceUSD: usdBalance.toNumber(),
134-
balanceUSDf: formatFiatValue(usdBalance.toString()).value,
133+
balanceUSDf: usdBalance.toString(),
135134
icon: this.icon,
136135
name: this.name_long,
137136
symbol: this.currencyName,
138137
value: marketData[0]?.current_price?.toString() ?? '0',
139-
valuef: formatFiatValue(marketData[0]?.current_price?.toString() ?? '0')
140-
.value,
138+
valuef: marketData[0]?.current_price?.toString() ?? '0',
141139
contract: '',
142140
decimals: this.decimals,
143141
sparkline: marketData.length

packages/extension/src/providers/bitcoin/ui/btc-verify-transaction.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@
6262
<span>{{ network.currencyName }}</span>
6363
</h4>
6464
<p>
65-
${{
65+
{{
6666
fiatValue !== '~'
67-
? $filters.formatFiatValue(fiatValue).value
67+
? $filters.parseCurrency(fiatValue)
6868
: fiatValue
6969
}}
7070
</p>

packages/extension/src/providers/bitcoin/ui/send-transaction/components/send-alert.vue

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
Not enough funds. You are<br />~{{
88
$filters.formatFloatingPointValue(nativeValue).value
99
}}
10-
{{ nativeSymbol }} (${{
11-
$filters.formatFiatValue(priceDifference).value
12-
}}) short.
10+
{{ nativeSymbol }} ({{ $filters.parseCurrency(priceDifference) }}) short.
1311
</p>
1412
</div>
1513
</template>
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
import { NetworkNames } from '@enkryptcom/types';
22

3-
const newNetworks: NetworkNames[] = [
4-
NetworkNames.Derive,
5-
NetworkNames.Conflux,
6-
NetworkNames.UnitZero,
7-
];
3+
const newNetworks: NetworkNames[] = [NetworkNames.Hemi];
84
const newSwaps: NetworkNames[] = [];
95

106
export { newNetworks, newSwaps };

packages/extension/src/providers/common/ui/send-transaction/send-alert.vue

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
Not enough funds. You are<br />~{{
66
$filters.formatFloatingPointValue(nativeValue).value
77
}}
8-
{{ nativeSymbol }} (${{
9-
$filters.formatFiatValue(priceDifference).value
10-
}}) short.
8+
{{ nativeSymbol }} ({{ $filters.parseCurrency(priceDifference) }}) short.
119
</p>
1210
</div>
1311
</template>

packages/extension/src/providers/common/ui/send-transaction/send-contacts-list.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,9 @@ const isChecked = (address: string) => {
125125
props.network.displayAddress(address)
126126
);
127127
} catch (err) {
128-
console.error('Error checking if address is checked', err);
128+
console.error(
129+
'Error checking if address is checked, probably name resolver',
130+
);
129131
return false;
130132
}
131133
};

0 commit comments

Comments
 (0)