Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
0bdcceb
feat: add_all_tlds_and paymentid
Candy9797 May 9, 2025
3ce9397
feat: code review
Candy9797 May 13, 2025
34c9791
feat: code review
Candy9797 May 13, 2025
6606496
feat: fix yarn build
Candy9797 May 13, 2025
eb9b005
devop: make necessary changes
kvhnuke May 14, 2025
1316df5
devop: merge develop
kvhnuke May 20, 2025
cd4677a
devop: to address field
kvhnuke May 21, 2025
fe4ed5b
feat: add label to tx confirmation
olgakup May 21, 2025
6cab721
fix: ledger package issue
kvhnuke May 22, 2025
a375ae9
devop: switch trezor based on platform
kvhnuke May 22, 2025
274f157
devop: update yarn
kvhnuke May 23, 2025
39638a5
fix: currency filter when over thousands or below a certain value
gamalielhere May 23, 2025
37ee211
devop: fix ellipsis error
kvhnuke May 23, 2025
ff62969
devop: replace all formatFiatValue to use parseCurrency
gamalielhere May 23, 2025
21819c6
devop: revert test address
gamalielhere May 23, 2025
cb69550
devop: cleanup
gamalielhere May 23, 2025
ab81f6c
devop: switch extension check
kvhnuke May 23, 2025
081461f
devop: move trezor-web to dev dep
kvhnuke May 27, 2025
6b5a503
devop: move trezor-web to dev dep
kvhnuke May 27, 2025
fcce244
devop: move trezor-web to dev dep
kvhnuke May 27, 2025
e1dab4c
devop: follow similar logic
kvhnuke May 28, 2025
c17d693
devop: package updates
kvhnuke May 29, 2025
5892e97
fix: conflicts
kvhnuke May 29, 2025
1f81576
fix: loading less than
gamalielhere May 29, 2025
c10dfde
fix: code error
gamalielhere May 29, 2025
8730342
fix: code issues
kvhnuke May 29, 2025
849cd27
devop: update packages
kvhnuke May 29, 2025
dfab253
devop: merge
kvhnuke May 30, 2025
0af7ff6
Merge pull request #706 from enkryptcom/feat/add-to-address
kvhnuke May 30, 2025
eb31eaa
devop: merge
kvhnuke May 30, 2025
87eda71
Merge pull request #705 from enkryptcom/devop/trezor-conditional
kvhnuke May 30, 2025
3ccec68
devop: add safe buffer to Rootstock collective staking gas estimation
kvhnuke May 30, 2025
37553c4
devop: add hemi and bump version
kvhnuke May 30, 2025
a4dce73
devop: bump hw wallets version
kvhnuke May 30, 2025
6b98719
fix: hw wallet package
kvhnuke May 30, 2025
0f404ae
devop: cleanup
kvhnuke Jun 2, 2025
7dbe5e6
Merge pull request #700 from enkryptcom/fix/currency-filter
kvhnuke Jun 2, 2025
5c3cacb
devop: minor changes
kvhnuke Jun 2, 2025
61d94ef
Merge branch 'devop/release-v2-8-0' of github.com:enkryptcom/enKrypt …
kvhnuke Jun 2, 2025
be3e905
devop: merge
kvhnuke Jun 2, 2025
f012109
Merge pull request #704 from enkryptcom/feat/space-id-support
kvhnuke Jun 2, 2025
3e82a90
devop: minor changes
kvhnuke Jun 2, 2025
e0bfa67
fix: coderabbit recommendations
gamalielhere Jun 2, 2025
1cbe741
fix: blank page
kvhnuke Jun 3, 2025
56d6d8b
Merge pull request #707 from enkryptcom/devop/release-v2-8-0
kvhnuke Jun 4, 2025
13df0aa
Merge branch 'main' into develop
kvhnuke Jun 4, 2025
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"devDependencies": {
"@commitlint/cli": "^19.8.1",
"@commitlint/config-conventional": "^19.8.1",
"@swc/core": "^1.11.24",
"@swc/core": "^1.11.29",
"concurrently": "^9.1.2",
"husky": "^9.1.7",
"node-notifier": "^10.0.1",
Expand Down
14 changes: 7 additions & 7 deletions packages/extension-bridge/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@
"webextension-polyfill": "^0.12.0"
},
"devDependencies": {
"@types/node": "^22.15.17",
"@types/node": "^22.15.24",
"@types/webextension-polyfill": "^0.12.3",
"@typescript-eslint/eslint-plugin": "^8.32.1",
"@typescript-eslint/parser": "^8.32.1",
"bumpp": "^10.1.0",
"eslint": "^9.26.0",
"@typescript-eslint/eslint-plugin": "^8.33.0",
"@typescript-eslint/parser": "^8.33.0",
"bumpp": "^10.1.1",
"eslint": "^9.27.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-prettier": "^10.1.5",
"eslint-import-resolver-alias": "^1.1.2",
Expand All @@ -58,9 +58,9 @@
"prettier": "^3.5.3",
"ts-node": "^10.9.2",
"tsconfig-paths": "^4.2.0",
"tsup": "^8.4.0",
"tsup": "^8.5.0",
"type-fest": "^4.41.0",
"typescript": "^5.8.3",
"typescript-eslint": "8.32.1"
"typescript-eslint": "8.33.0"
}
}
48 changes: 24 additions & 24 deletions packages/extension/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@enkryptcom/extension",
"version": "2.7.0",
"version": "2.8.0",
"private": true,
"type": "module",
"scripts": {
Expand All @@ -23,7 +23,7 @@
"watch:firefox": "yarn prebuild && cross-env BROWSER='firefox' vite"
},
"dependencies": {
"@amplitude/analytics-browser": "^2.17.4",
"@amplitude/analytics-browser": "^2.17.6",
"@enkryptcom/extension-bridge": "workspace:^",
"@enkryptcom/hw-wallets": "workspace:^",
"@enkryptcom/keyring": "workspace:^",
Expand All @@ -38,19 +38,19 @@
"@ethereumjs/wallet": "^2.0.4",
"@kadena/client": "^1.17.1",
"@kadena/pactjs-cli": "^1.17.1",
"@ledgerhq/hw-transport-webusb": "^6.29.4",
"@ledgerhq/hw-transport-webusb": "^6.29.5",
"@metamask/eth-sig-util": "^8.2.0",
"@metaplex-foundation/mpl-bubblegum": "^5.0.0",
"@metaplex-foundation/mpl-bubblegum": "^5.0.1",
"@metaplex-foundation/umi": "^1.2.0",
"@metaplex-foundation/umi-bundle-defaults": "^1.2.0",
"@polkadot/api": "^15.9.3",
"@polkadot/extension-inject": "^0.58.9",
"@polkadot/keyring": "^13.4.4",
"@polkadot/rpc-provider": "^15.9.3",
"@polkadot/types": "^15.9.3",
"@polkadot/types-known": "^15.9.3",
"@polkadot/ui-shared": "^3.13.1",
"@polkadot/util": "^13.4.4",
"@polkadot/api": "^16.1.1",
"@polkadot/extension-inject": "^0.58.10",
"@polkadot/keyring": "^13.5.1",
"@polkadot/rpc-provider": "^16.1.1",
"@polkadot/types": "^16.1.1",
"@polkadot/types-known": "^16.1.1",
"@polkadot/ui-shared": "^3.14.1",
"@polkadot/util": "^13.5.1",
"@polkadot/wasm-crypto": "^7.4.1",
"@solana-developers/helpers": "2.8.0",
"@solana/spl-token": "^0.4.13",
Expand Down Expand Up @@ -78,7 +78,7 @@
"switch-ts": "^1.1.1",
"url-parse": "^1.5.10",
"uuid": "^11.1.0",
"vue": "^3.5.13",
"vue": "^3.5.16",
"vue-echarts": "7.0.3",
"vue-router": "^4.5.1",
"vue3-lottie": "^3.3.1",
Expand All @@ -99,13 +99,13 @@
"@rollup/plugin-typescript": "^12.1.2",
"@tsconfig/node20": "^20.1.5",
"@types/bs58": "^5.0.0",
"@types/chrome": "^0.0.322",
"@types/chrome": "^0.0.323",
"@types/ethereumjs-abi": "^0.6.5",
"@types/events": "^3.0.3",
"@types/fs-extra": "^11.0.4",
"@types/less": "^3.0.8",
"@types/lodash": "^4.17.16",
"@types/node": "^22.15.17",
"@types/lodash": "^4.17.17",
"@types/node": "^22.15.24",
"@types/semver": "^7.7.0",
"@types/url-parse": "^1.4.11",
"@types/utf-8-validate": "^5.0.2",
Expand All @@ -116,28 +116,28 @@
"@vue/eslint-config-prettier": "^10.2.0",
"@vue/eslint-config-typescript": "^14.5.0",
"@vue/tsconfig": "^0.7.0",
"@vueuse/core": "^13.1.0",
"@vueuse/core": "^13.3.0",
"cross-env": "^7.0.3",
"eslint": "^9.26.0",
"eslint": "^9.27.0",
"eslint-plugin-vue": "^10.1.0",
"fs-extra": "^11.3.0",
"jsdom": "^26.1.0",
"less": "^4.3.0",
"less-loader": "^12.3.0",
"npm-run-all2": "^8.0.1",
"npm-run-all2": "^8.0.4",
"prettier": "^3.5.3",
"rimraf": "^6.0.1",
"rollup": "^4.40.2",
"rollup-plugin-visualizer": "^5.14.0",
"rollup": "^4.41.1",
"rollup-plugin-visualizer": "^6.0.1",
"semver": "^7.7.2",
"systeminformation": "^5.25.11",
"tsup": "^8.4.0",
"systeminformation": "^5.27.1",
"tsup": "^8.5.0",
"typescript": "~5.8.3",
"url": "^0.11.4",
"vite": "^6.3.5",
"vite-plugin-node-polyfills": "0.23.0",
"vite-tsconfig-paths": "^5.1.4",
"vitest": "^3.1.3",
"vitest": "^3.1.4",
"vue-tsc": "^2.2.10",
"webextension-polyfill": "^0.12.0"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/extension/src/libs/name-resolver/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ class GenericNameResolver {
});
}

async resolveName(name: string, coins: CoinType[]): Promise<string | null> {
async resolveName(name: string, coins: CoinType[], providerChain?: string): Promise<string | null> {
let response: string | null = null;
for (const coin of coins) {
response = await this.nameResolver
.resolveAddress(name, coin)
.resolveAddress(name, coin, providerChain)
.catch(() => null);
if (response) return response;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { BitcoinNetworkInfo } from '.';
import { payments } from 'bitcoinjs-lib';
import { hexToBuffer, fromBase } from '@enkryptcom/utils';
import {
formatFiatValue,
formatFloatingPointValue,
} from '@/libs/utils/number-formatter';
import MarketData from '@/libs/market-data';
Expand Down Expand Up @@ -131,13 +130,12 @@ export class BitcoinNetwork extends BaseNetwork {
balance: balance,
balancef: formatFloatingPointValue(userBalance).value,
balanceUSD: usdBalance.toNumber(),
balanceUSDf: formatFiatValue(usdBalance.toString()).value,
balanceUSDf: usdBalance.toString(),
icon: this.icon,
name: this.name_long,
symbol: this.currencyName,
value: marketData[0]?.current_price?.toString() ?? '0',
valuef: formatFiatValue(marketData[0]?.current_price?.toString() ?? '0')
.value,
valuef: marketData[0]?.current_price?.toString() ?? '0',
contract: '',
decimals: this.decimals,
sparkline: marketData.length
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@
<span>{{ network.currencyName }}</span>
</h4>
<p>
${{
{{
fiatValue !== '~'
? $filters.formatFiatValue(fiatValue).value
? $filters.parseCurrency(fiatValue)
: fiatValue
}}
</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
Not enough funds. You are<br />~{{
$filters.formatFloatingPointValue(nativeValue).value
}}
{{ nativeSymbol }} (${{
$filters.formatFiatValue(priceDifference).value
}}) short.
{{ nativeSymbol }} ({{ $filters.parseCurrency(priceDifference) }}) short.
</p>
</div>
</template>
Expand Down
6 changes: 1 addition & 5 deletions packages/extension/src/providers/common/libs/new-features.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import { NetworkNames } from '@enkryptcom/types';

const newNetworks: NetworkNames[] = [
NetworkNames.Derive,
NetworkNames.Conflux,
NetworkNames.UnitZero,
];
const newNetworks: NetworkNames[] = [NetworkNames.Hemi];
const newSwaps: NetworkNames[] = [];

export { newNetworks, newSwaps };
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
Not enough funds. You are<br />~{{
$filters.formatFloatingPointValue(nativeValue).value
}}
{{ nativeSymbol }} (${{
$filters.formatFiatValue(priceDifference).value
}}) short.
{{ nativeSymbol }} ({{ $filters.parseCurrency(priceDifference) }}) short.
</p>
</div>
</template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,9 @@ const isChecked = (address: string) => {
props.network.displayAddress(address)
);
} catch (err) {
console.error('Error checking if address is checked', err);
console.error(
'Error checking if address is checked, probably name resolver',
);
return false;
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@
&__logo {
margin-bottom: 8px;
}
&__label {
font-size: 12px;
line-height: 16px;
letter-spacing: 0.5px;
color: @grayPrimary;
margin: 0 0 4px 44px;
}
&__network {
display: flex;
justify-content: flex-start;
Expand Down Expand Up @@ -167,11 +174,11 @@

&-to {
font-style: normal;
font-weight: 400;
font-size: 14px;
line-height: 20px;
letter-spacing: 0.25px;
color: @primaryLabel;
font-weight: 400 !important;
font-size: 16px !important;
line-height: 20px !important;
letter-spacing: 0.5px;
color: @black !important;
word-break: break-all;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
{{ fromBase(token.amount, token.decimals) }}
<span>{{ token.symbol }}</span>
</h4>
<h6>{{ $filters.formatFiatValue(token.valueUSD).value }}</h6>
<h6>{{ $filters.parseCurrency(token.valueUSD) }}</h6>
</div>
</div>
</template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,11 @@ const NetworkEndpoints: Record<string, string> = {
[NetworkNames.Scroll]: 'https://api.scrollscan.com/',
[NetworkNames.Fraxtal]: 'https://api.fraxscan.com/',
[NetworkNames.Coti]: 'https://mainnet.cotiscan.io/',
[NetworkNames.CytonicTestnet]: 'https://explorer-api.evm.testnet.cytonic.com/api/',
[NetworkNames.CytonicTestnet]:
'https://explorer-api.evm.testnet.cytonic.com/api/',
[NetworkNames.Derive]: 'https://explorer.derive.xyz/',
[NetworkNames.Conflux]: 'https://evmapi.confluxscan.org/',
[NetworkNames.Hemi]: 'https://explorer.hemi.xyz/',
};

export { NetworkEndpoints };
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { fromBase } from '@enkryptcom/utils';
import { toBN } from 'web3-utils';
import BigNumber from 'bignumber.js';
import {
formatFiatValue,

formatFloatingPointValue,
} from '@/libs/utils/number-formatter';
import API from '@/providers/ethereum/libs/api';
Expand Down Expand Up @@ -278,15 +278,15 @@ export default (

const marketInfo = supportedNetworks[networkName].cgPlatform
? await marketData.getMarketInfoByContracts(
Object.keys(balances).filter(
contract => contract !== NATIVE_TOKEN_ADDRESS,
),
supportedNetworks[networkName].cgPlatform as CoingeckoPlatform,
)
Object.keys(balances).filter(
contract => contract !== NATIVE_TOKEN_ADDRESS,
),
supportedNetworks[networkName].cgPlatform as CoingeckoPlatform,
)
: tokens.reduce(
(obj, cur) => ({ ...obj, [cur.contract]: null }),
{} as Record<string, CoinGeckoTokenMarket | null>,
);
(obj, cur) => ({ ...obj, [cur.contract]: null }),
{} as Record<string, CoinGeckoTokenMarket | null>,
);
if (network.coingeckoID) {
const nativeMarket = await marketData.getMarketData([
network.coingeckoID,
Expand Down Expand Up @@ -337,12 +337,12 @@ export default (
balance: toBN(balances[address].balance).toString(),
balancef: formatFloatingPointValue(userBalance).value,
balanceUSD: usdBalance.toNumber(),
balanceUSDf: formatFiatValue(usdBalance.toString()).value,
balanceUSDf: usdBalance.toString(),
icon: market.image,
name: market.name,
symbol: market.symbol,
value: currentPrice.toString(),
valuef: formatFiatValue(currentPrice.toString()).value,
valuef: currentPrice.toString(),
contract: address,
decimals: tokenInfo[address].decimals,
sparkline: new Sparkline(market.sparkline_in_24h.price, 25)
Expand Down Expand Up @@ -377,15 +377,15 @@ export default (
balance: toBN(balances[unknownTokens[idx]].balance).toString(),
balancef: formatFloatingPointValue(userBalance).value,
balanceUSD: 0,
balanceUSDf: formatFiatValue('0').value,
balanceUSDf: '0',
icon:
tokenInfo[unknownTokens[idx]]?.logoURI ||
tInfo.icon ||
network.icon,
name: tInfo.name,
symbol: tInfo.symbol,
value: '0',
valuef: formatFiatValue('0').value,
valuef: '0',
contract: unknownTokens[idx],
decimals: tInfo.decimals,
sparkline: '',
Expand Down
Loading