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.

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

fix: rename account identicon #361

Merged
merged 3 commits into from
Oct 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 packages/extension/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@enkryptcom/extension",
"version": "1.28.0",
"version": "1.29.0",
"private": true,
"scripts": {
"zip": "cd dist; zip -r release.zip *;",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
class="rename-account-form__input"
:class="{ focus: isFocus && isValidName, error: !isValidName }"
>
<img :src="network.identicon(account.address || '')" />
<img
:src="network.identicon(network.displayAddress(account.address))"
/>
<input
ref="renameAccountInput"
v-model="accountName"
Expand Down
12 changes: 12 additions & 0 deletions packages/swap/tests/fixtures/mainnet/configs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,17 @@ const fromToken: TokenType = {
type: NetworkType.EVM,
};

const fromTokenWBTC: TokenType = {
address: "0x2260fac5e5542a773aa44fbcfedf7c193bc2c599",
decimals: 8,
logoURI: "https://api.rango.exchange/tokens/ETH/WBTC.png",
name: "WBTC",
symbol: "WBTC",
rank: 18,
cgId: "bitcoin",
type: NetworkType.EVM,
};

const toTokenWETH: TokenTypeTo = {
address: "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
decimals: 18,
Expand Down Expand Up @@ -68,6 +79,7 @@ export {
fromToken,
toToken,
toTokenWETH,
fromTokenWBTC,
amount,
fromAddress,
toAddress,
Expand Down
20 changes: 11 additions & 9 deletions packages/swap/tests/rango.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { expect } from "chai";
import { toBN } from "web3-utils";
import Web3Eth from "web3-eth";
import Rango from "../src/providers/rango";
import {
Expand All @@ -7,28 +8,29 @@ import {
WalletIdentifier,
} from "../src/types";
import {
fromToken,
fromTokenWBTC,
toToken,
amount,
fromAddress,
toAddress,
nodeURL,
nodeURLMatic,
fromTokenNative,
amount,
} from "./fixtures/mainnet/configs";

describe("Rango Provider", () => {
// @ts-ignore
it("it should return a quote", async () => {
const localAmount = toBN("100000000");
const web3eth = new Web3Eth(nodeURL);
const rango = new Rango(web3eth, SupportedNetworkName.Ethereum);
const init = rango.init();
await init;
const quote = await rango.getQuote(
{
amount,
fromAddress,
fromToken,
amount: localAmount,
fromAddress: "0x9ff58f4ffb29fa2266ab25e75e2a8b3503311656", // aave
fromToken: fromTokenWBTC,
toToken,
toAddress,
},
Expand All @@ -39,13 +41,13 @@ describe("Rango Provider", () => {
expect(quote?.quote.meta.walletIdentifier).to.be.eq(
WalletIdentifier.enkrypt
);
expect(quote?.fromTokenAmount.toString()).to.be.eq(amount.toString());
expect(quote?.fromTokenAmount.toString()).to.be.eq(localAmount.toString());
expect(quote?.toTokenAmount.gtn(0)).to.be.eq(true);

const swap = await rango.getSwap(quote!.quote);
expect(swap?.transactions.length).to.be.eq(2);
expect(swap?.transactions[0].to).to.be.eq(fromToken.address);
}).timeout(20000);
expect(swap?.transactions[0].to).to.be.eq(fromTokenWBTC.address);
}).timeout(25000);

it("it should return cross chain swap", async () => {
const web3eth = new Web3Eth(nodeURLMatic);
Expand All @@ -72,5 +74,5 @@ describe("Rango Provider", () => {
expect(quote?.additionalNativeFees.gtn(0)).to.be.eq(true);
const swap = await rango.getSwap(quote!.quote);
expect(swap?.transactions.length).to.be.eq(1);
}).timeout(20000);
}).timeout(25000);
});
10 changes: 5 additions & 5 deletions packages/swap/tests/swap.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ describe("Swap", () => {
toToken,
toAddress,
});
expect(quotes?.length).to.be.eq(4);
expect(quotes?.length).to.be.eq(3);
const oneInceQuote = quotes.find(
(q) => q.provider === ProviderName.oneInch
);
Expand All @@ -72,12 +72,12 @@ describe("Swap", () => {
(q) => q.provider === ProviderName.changelly
);
const zeroxQuote = quotes.find((q) => q.provider === ProviderName.zerox);
const rangoQuote = quotes.find((q) => q.provider === ProviderName.rango);
// const rangoQuote = quotes.find((q) => q.provider === ProviderName.rango);
expect(zeroxQuote).to.be.eq(undefined);
expect(changellyQuote!.provider).to.be.eq(ProviderName.changelly);
expect(oneInceQuote!.provider).to.be.eq(ProviderName.oneInch);
expect(paraswapQuote!.provider).to.be.eq(ProviderName.paraswap);
expect(rangoQuote!.provider).to.be.eq(ProviderName.rango);
// expect(rangoQuote!.provider).to.be.eq(ProviderName.rango);
const swapOneInch = await enkryptSwap.getSwap(oneInceQuote!.quote);
expect(swapOneInch?.fromTokenAmount.toString()).to.be.eq(amount.toString());
expect(swapOneInch?.transactions.length).to.be.eq(2);
Expand Down Expand Up @@ -105,11 +105,11 @@ describe("Swap", () => {
(q) => q.provider === ProviderName.changelly
);
const zeroxQuote = quotes.find((q) => q.provider === ProviderName.zerox);
const rangoQuote = quotes.find((q) => q.provider === ProviderName.rango);
// const rangoQuote = quotes.find((q) => q.provider === ProviderName.rango);
expect(zeroxQuote!.provider).to.be.eq(ProviderName.zerox);
expect(changellyQuote!.provider).to.be.eq(ProviderName.changelly);
expect(oneInceQuote!.provider).to.be.eq(ProviderName.oneInch);
expect(paraswapQuote!.provider).to.be.eq(ProviderName.paraswap);
expect(rangoQuote!.provider).to.be.eq(ProviderName.rango);
// expect(rangoQuote!.provider).to.be.eq(ProviderName.rango);
}).timeout(10000);
});
Loading