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

swap asset icons #3538

Merged
merged 6 commits into from
Jun 13, 2024
Merged

swap asset icons #3538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8cc45b2
added loading logo from metadata for swap assets
vsubhuman Jun 10, 2024
0f7d0ae
Merge remote-tracking branch 'origin/ruslan/yoroi-lib-bump' into rusl…
vsubhuman Jun 10, 2024
d871498
eslint fixes
vsubhuman Jun 10, 2024
6003c6b
Version bump: 5.1.425 (nightly)
vsubhuman Jun 10, 2024
8ece60c
Merge branch 'develop' into ruslan/YOEXT-1173/swap-asset-icons
vsubhuman Jun 13, 2024
a351b6f
test fixes
vsubhuman Jun 13, 2024
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
5 changes: 5 additions & 0 deletions packages/e2e-tests/helpers/wallet-dbSnapshots/testWallet1.indexedDB.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1967,6 +1967,7 @@
"IsNFT": false,
"Metadata": {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -1986,6 +1987,7 @@
"IsNFT": false,
"Metadata": {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -2005,6 +2007,7 @@
"IsNFT": false,
"Metadata": {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -2024,6 +2027,7 @@
"IsNFT": false,
"Metadata": {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -2043,6 +2047,7 @@
"IsNFT": false,
"Metadata": {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand Down
5 changes: 5 additions & 0 deletions packages/e2e-tests/helpers/wallet-dbSnapshots/testWallet1MemoAdded.indexedDB.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2895,6 +2895,7 @@
"IsNFT": false,
"Metadata": {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -2914,6 +2915,7 @@
"IsNFT": false,
"Metadata": {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -2933,6 +2935,7 @@
"IsNFT": false,
"Metadata": {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -2952,6 +2955,7 @@
"IsNFT": false,
"Metadata": {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -2971,6 +2975,7 @@
"IsNFT": false,
"Metadata": {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand Down
1 change: 1 addition & 0 deletions packages/yoroi-extension/app/api/ada/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,7 @@ describe('app/api/ada/index', () => {
assetName: '',
ticker: 'TADA',
longName: null,
logo: null,
numberOfDecimals: 6
}
},
Expand Down
5 changes: 4 additions & 1 deletion packages/yoroi-extension/app/api/ada/lib/state-fetch/remoteFetcher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,10 @@ export class RemoteFetcher implements IFetcher {
if (resp.data.ticker?.value) {
v.ticker = resp.data.ticker.value;
}
if (v.name || v.decimals || v.ticker) {
if (resp.data.logo?.value) {
v.logo = resp.data.logo.value;
}
if (v.name || v.decimals || v.ticker || v.logo) {
res[resp.data.subject] = v;
}

Expand Down
1 change: 1 addition & 0 deletions packages/yoroi-extension/app/api/ada/lib/state-fetch/types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,7 @@ export type RemoteTokenInfo = {|
+name?: string,
+decimals?: number,
+ticker?: string,
+logo?: string,
|};
export type TokenInfoResponse = {|
[key: string]: (RemoteTokenInfo | null),
Expand Down
5 changes: 5 additions & 0 deletions ...roi-extension/app/api/ada/lib/storage/bridge/tests/__snapshots__/multiwallet.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,6 +675,7 @@ Array [
"IsNFT": false,
"Metadata": Object {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -691,6 +692,7 @@ Array [
"IsNFT": false,
"Metadata": Object {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -707,6 +709,7 @@ Array [
"IsNFT": false,
"Metadata": Object {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -723,6 +726,7 @@ Array [
"IsNFT": false,
"Metadata": Object {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -739,6 +743,7 @@ Array [
"IsNFT": false,
"Metadata": Object {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand Down
5 changes: 5 additions & 0 deletions ...s/yoroi-extension/app/api/ada/lib/storage/bridge/tests/__snapshots__/shelley.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,7 @@ Array [
"IsNFT": false,
"Metadata": Object {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -522,6 +523,7 @@ Array [
"IsNFT": false,
"Metadata": Object {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -538,6 +540,7 @@ Array [
"IsNFT": false,
"Metadata": Object {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -554,6 +557,7 @@ Array [
"IsNFT": false,
"Metadata": Object {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -570,6 +574,7 @@ Array [
"IsNFT": false,
"Metadata": Object {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand Down
5 changes: 5 additions & 0 deletions ...yoroi-extension/app/api/ada/lib/storage/bridge/tests/__snapshots__/simpleTxs.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,7 @@ Array [
"IsNFT": false,
"Metadata": Object {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -526,6 +527,7 @@ Array [
"IsNFT": false,
"Metadata": Object {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -542,6 +544,7 @@ Array [
"IsNFT": false,
"Metadata": Object {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -558,6 +561,7 @@ Array [
"IsNFT": false,
"Metadata": Object {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -574,6 +578,7 @@ Array [
"IsNFT": false,
"Metadata": Object {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand Down
10 changes: 10 additions & 0 deletions ...es/yoroi-extension/app/api/ada/lib/storage/bridge/tests/__snapshots__/status.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -964,6 +964,7 @@ Array [
"IsNFT": false,
"Metadata": Object {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -980,6 +981,7 @@ Array [
"IsNFT": false,
"Metadata": Object {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -996,6 +998,7 @@ Array [
"IsNFT": false,
"Metadata": Object {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -1012,6 +1015,7 @@ Array [
"IsNFT": false,
"Metadata": Object {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -1028,6 +1032,7 @@ Array [
"IsNFT": false,
"Metadata": Object {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand Down Expand Up @@ -2193,6 +2198,7 @@ Array [
"IsNFT": false,
"Metadata": Object {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -2209,6 +2215,7 @@ Array [
"IsNFT": false,
"Metadata": Object {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -2225,6 +2232,7 @@ Array [
"IsNFT": false,
"Metadata": Object {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -2241,6 +2249,7 @@ Array [
"IsNFT": false,
"Metadata": Object {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand All @@ -2257,6 +2266,7 @@ Array [
"IsNFT": false,
"Metadata": Object {
"assetName": "",
"logo": null,
"longName": null,
"numberOfDecimals": 6,
"policyId": "",
Expand Down
2 changes: 2 additions & 0 deletions packages/yoroi-extension/app/api/ada/lib/storage/bridge/tests/multiwallet.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ async function checkPub1HasTx(
Identifier: '',
Metadata: {
assetName: '',
logo: null,
longName: null,
numberOfDecimals: 6,
policyId: '',
Expand Down Expand Up @@ -352,6 +353,7 @@ async function checkPub2HasTx(
Identifier: '',
Metadata: {
assetName: '',
logo: null,
longName: null,
numberOfDecimals: 6,
policyId: '',
Expand Down
3 changes: 3 additions & 0 deletions packages/yoroi-extension/app/api/ada/lib/storage/bridge/tests/shelley.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ async function syncingSimpleTransaction(
Identifier: '',
Metadata: {
assetName: '',
logo: null,
longName: null,
numberOfDecimals: 6,
policyId: '',
Expand Down Expand Up @@ -418,6 +419,7 @@ async function syncingSimpleTransaction(
Identifier: '',
Metadata: {
assetName: '',
logo: null,
longName: null,
numberOfDecimals: 6,
policyId: '',
Expand Down Expand Up @@ -462,6 +464,7 @@ async function syncingSimpleTransaction(
Identifier: '',
Metadata: {
assetName: '',
logo: null,
longName: null,
numberOfDecimals: 6,
policyId: '',
Expand Down
5 changes: 5 additions & 0 deletions packages/yoroi-extension/app/api/ada/lib/storage/bridge/tests/simpleTxs.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,7 @@ async function syncingSimpleTransaction(
Identifier: '',
Metadata: {
assetName: '',
logo: null,
longName: null,
numberOfDecimals: 6,
policyId: '',
Expand Down Expand Up @@ -518,6 +519,7 @@ async function syncingSimpleTransaction(
Identifier: '',
Metadata: {
assetName: '',
logo: null,
longName: null,
numberOfDecimals: 6,
policyId: '',
Expand Down Expand Up @@ -562,6 +564,7 @@ async function syncingSimpleTransaction(
Identifier: '',
Metadata: {
assetName: '',
logo: null,
longName: null,
numberOfDecimals: 6,
policyId: '',
Expand Down Expand Up @@ -903,6 +906,7 @@ async function utxoCreatedAndUsed(
Identifier: '',
Metadata: {
assetName: '',
logo: null,
longName: null,
numberOfDecimals: 6,
policyId: '',
Expand Down Expand Up @@ -947,6 +951,7 @@ async function utxoCreatedAndUsed(
Identifier: '',
Metadata: {
assetName: '',
logo: null,
longName: null,
numberOfDecimals: 6,
policyId: '',
Expand Down
Loading
Loading