diff --git a/public/branding/android-chrome-192x192.png b/public/branding/android-chrome-192x192.png new file mode 100644 index 000000000..010c84f4f Binary files /dev/null and b/public/branding/android-chrome-192x192.png differ diff --git a/public/branding/android-chrome-512x512.png b/public/branding/android-chrome-512x512.png new file mode 100644 index 000000000..f0b694f62 Binary files /dev/null and b/public/branding/android-chrome-512x512.png differ diff --git a/public/branding/apple-touch-icon.png b/public/branding/apple-touch-icon.png new file mode 100644 index 000000000..042373d5a Binary files /dev/null and b/public/branding/apple-touch-icon.png differ diff --git a/public/branding/favicon-16x16.png b/public/branding/favicon-16x16.png new file mode 100644 index 000000000..75cac5a0a Binary files /dev/null and b/public/branding/favicon-16x16.png differ diff --git a/public/branding/favicon-32x32.png b/public/branding/favicon-32x32.png new file mode 100644 index 000000000..08ee9f79c Binary files /dev/null and b/public/branding/favicon-32x32.png differ diff --git a/public/branding/favicon.ico b/public/branding/favicon.ico new file mode 100644 index 000000000..1326d9a21 Binary files /dev/null and b/public/branding/favicon.ico differ diff --git a/public/branding/site.webmanifest b/public/branding/site.webmanifest new file mode 100644 index 000000000..45dc8a206 --- /dev/null +++ b/public/branding/site.webmanifest @@ -0,0 +1 @@ +{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"} \ No newline at end of file diff --git a/public/branding/stlos.png b/public/branding/stlos.png new file mode 100644 index 000000000..e1bc8030b Binary files /dev/null and b/public/branding/stlos.png differ diff --git a/public/branding/telos copy.ico b/public/branding/telos copy.ico new file mode 100644 index 000000000..a4ecbef13 Binary files /dev/null and b/public/branding/telos copy.ico differ diff --git a/public/branding/telos-logo copy.png b/public/branding/telos-logo copy.png new file mode 100644 index 000000000..e71e43bc5 Binary files /dev/null and b/public/branding/telos-logo copy.png differ diff --git a/public/branding/telos-logo-dark.png b/public/branding/telos-logo-dark.png new file mode 100644 index 000000000..0aa09a546 Binary files /dev/null and b/public/branding/telos-logo-dark.png differ diff --git a/public/branding/telos-logo.png b/public/branding/telos-logo.png new file mode 100644 index 000000000..e71e43bc5 Binary files /dev/null and b/public/branding/telos-logo.png differ diff --git a/public/branding/telos-scan.png b/public/branding/telos-scan.png new file mode 100644 index 000000000..0dfb7e91e Binary files /dev/null and b/public/branding/telos-scan.png differ diff --git a/public/branding/telos-wallet-light.png b/public/branding/telos-wallet-light.png new file mode 100644 index 000000000..8f5f365a2 Binary files /dev/null and b/public/branding/telos-wallet-light.png differ diff --git a/public/branding/telos-wallet.png b/public/branding/telos-wallet.png new file mode 100644 index 000000000..c7c664085 Binary files /dev/null and b/public/branding/telos-wallet.png differ diff --git a/public/branding/telos.ico b/public/branding/telos.ico new file mode 100644 index 000000000..a4ecbef13 Binary files /dev/null and b/public/branding/telos.ico differ diff --git a/public/branding/telos.png b/public/branding/telos.png new file mode 100644 index 000000000..2be9c2c7c Binary files /dev/null and b/public/branding/telos.png differ diff --git a/public/coins/TLOS.png b/public/coins/TLOS.png deleted file mode 100644 index 6fb28106d..000000000 Binary files a/public/coins/TLOS.png and /dev/null differ diff --git a/public/favicon.ico b/public/favicon.ico index d6e19c177..a4ecbef13 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/icons/favicon-16x16.png b/public/icons/favicon-16x16.png deleted file mode 100644 index 312ce84b7..000000000 Binary files a/public/icons/favicon-16x16.png and /dev/null differ diff --git a/public/icons/favicon-192x192.png b/public/icons/favicon-192x192.png deleted file mode 100644 index 33d56aa60..000000000 Binary files a/public/icons/favicon-192x192.png and /dev/null differ diff --git a/public/icons/favicon-32x32.png b/public/icons/favicon-32x32.png deleted file mode 100644 index 68611ef32..000000000 Binary files a/public/icons/favicon-32x32.png and /dev/null differ diff --git a/public/icons/favicon-512x512.png b/public/icons/favicon-512x512.png deleted file mode 100644 index 33d56aa60..000000000 Binary files a/public/icons/favicon-512x512.png and /dev/null differ diff --git a/quasar.conf.js b/quasar.conf.js index b7b0e2048..deef1ec28 100644 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -147,27 +147,22 @@ module.exports = function(/* ctx */) { theme_color: '#027be3', icons: [ { - src: 'icons/icon-128x128.png', + src: 'branding/android-chrome-192x192.png', sizes: '128x128', type: 'image/png', }, { - src: 'icons/icon-192x192.png', + src: 'branding/android-chrome-192x192.png', sizes: '192x192', type: 'image/png', }, { - src: 'icons/icon-256x256.png', + src: 'branding/android-chrome-512x512.png', sizes: '256x256', type: 'image/png', }, { - src: 'icons/icon-384x384.png', - sizes: '384x384', - type: 'image/png', - }, - { - src: 'icons/icon-512x512.png', + src: 'branding/android-chrome-512x512.png', sizes: '512x512', type: 'image/png', }, diff --git a/src/antelope/chains/EVMChainSettings.ts b/src/antelope/chains/EVMChainSettings.ts index 0c70146a2..5e256bd40 100644 --- a/src/antelope/chains/EVMChainSettings.ts +++ b/src/antelope/chains/EVMChainSettings.ts @@ -42,6 +42,7 @@ import { toStringNumber } from 'src/antelope/stores/utils/currency-utils'; import { dateIsWithinXMinutes } from 'src/antelope/stores/utils/date-utils'; import { CURRENT_CONTEXT, getAntelope, useContractStore, useNftsStore } from 'src/antelope'; import { WEI_PRECISION, PRICE_UPDATE_INTERVAL_IN_MIN } from 'src/antelope/stores/utils'; +import { BehaviorSubject, filter } from 'rxjs'; export default abstract class EVMChainSettings implements ChainSettings { @@ -89,6 +90,9 @@ export default abstract class EVMChainSettings implements ChainSettings { // This variable is used to simulate a bad indexer health state indexerBadHealthSimulated = false; + // This observable is used to check if the indexer health state was already checked + indexerChecked$ = new BehaviorSubject(false); + simulateIndexerDown(isBad: boolean) { this.indexerBadHealthSimulated = isBad; } @@ -206,6 +210,7 @@ export default abstract class EVMChainSettings implements ChainSettings { // update indexer health state promise.then((state) => { this._indexerHealthState.state = state; + this.indexerChecked$.next(true); }); return promise; @@ -216,13 +221,18 @@ export default abstract class EVMChainSettings implements ChainSettings { * This warning should appear only once per session. */ checkAndWarnIndexerHealth() { - if (!this.indexerHealthWarningShown && !this.isIndexerHealthy()) { - this.indexerHealthWarningShown = true; - const ant = getAntelope(); - ant.config.notifyNeutralMessageHandler( - ant.config.localizationHandler('antelope.chain.indexer_bad_health_warning'), - ); - } + this.indexerChecked$.pipe( + // This filter only allows to continue if the indexer health was already checked + filter(indexerChecked => indexerChecked === true), + ).subscribe(() => { + if (!this.indexerHealthWarningShown && !this.isIndexerHealthy()) { + this.indexerHealthWarningShown = true; + const ant = getAntelope(); + ant.config.notifyNeutralMessageHandler( + ant.config.localizationHandler('antelope.chain.indexer_bad_health_warning'), + ); + } + }); } isIndexerHealthy(): boolean { @@ -632,7 +642,7 @@ export default abstract class EVMChainSettings implements ChainSettings { .then(tokens => tokens.map(t => ({ ...t, network: this.getNetwork(), - logoURI: t.logoURI?.replace('ipfs://', 'https://w3s.link/ipfs/') ?? require('src/assets/logo--tlos.svg'), + logoURI: t.logoURI?.replace('ipfs://', 'https://w3s.link/ipfs/') ?? require('src/assets/tokens/telos.png'), }) as unknown as TokenSourceInfo)) .then(tokens => tokens.map(t => new TokenClass(t))) .then(tokens => [this.getSystemToken(), this.getWrappedSystemToken(), this.getStakedSystemToken(), ...tokens]); diff --git a/src/antelope/chains/NativeChainSettings.ts b/src/antelope/chains/NativeChainSettings.ts index a87a7cc91..d5b05ed24 100644 --- a/src/antelope/chains/NativeChainSettings.ts +++ b/src/antelope/chains/NativeChainSettings.ts @@ -205,7 +205,7 @@ export default abstract class NativeChainSettings implements ChainSettings { .then(tokens => tokens.map(t => ({ ...t, network: this.getNetwork(), - logoURI: t.logoURI?.replace('ipfs://', 'https://w3s.link/ipfs/') ?? require('src/assets/logo--tlos.svg'), + logoURI: t.logoURI?.replace('ipfs://', 'https://w3s.link/ipfs/') ?? require('src/assets/tokens/telos.png'), }) as unknown as TokenSourceInfo)) .then(originals => originals.map(info => new TokenClass(info))) .catch((error) => { diff --git a/src/antelope/chains/evm/telos-evm-testnet/index.ts b/src/antelope/chains/evm/telos-evm-testnet/index.ts index 107d8d00d..9f0297307 100644 --- a/src/antelope/chains/evm/telos-evm-testnet/index.ts +++ b/src/antelope/chains/evm/telos-evm-testnet/index.ts @@ -6,7 +6,7 @@ import { TokenClass, TokenSourceInfo } from 'src/antelope/types'; import { useUserStore } from 'src/antelope'; import { getFiatPriceFromIndexer } from 'src/api/price'; -const LOGO = 'https://raw.githubusercontent.com/telosnetwork/images/master/logos_2021/Symbol%202.svg'; +const LOGO = 'https://raw.githubusercontent.com/telosnetwork/token-list/main/logos/telos.png'; const CHAIN_ID = '41'; export const NETWORK = 'telos-evm-testnet'; const DISPLAY = 'Telos EVM Testnet'; @@ -28,7 +28,7 @@ const S_TOKEN = new TokenClass({ network: NETWORK, decimals: 18, address: '0xa9991E4daA44922D00a78B6D986cDf628d46C4DD', - logo: 'https://raw.githubusercontent.com/telosnetwork/teloscan/master/public/stlos-logo.png', + logo: 'https://raw.githubusercontent.com/telosnetwork/token-list/main/logos/stlos.png', isNative: false, isSystem: false, } as TokenSourceInfo); @@ -39,7 +39,7 @@ const W_TOKEN = new TokenClass({ network: NETWORK, decimals: 18, address: '0xaE85Bf723A9e74d6c663dd226996AC1b8d075AA9', - logo: 'https://raw.githubusercontent.com/telosnetwork/images/master/logos_2021/Symbol%202.svg', + logo: 'https://raw.githubusercontent.com/telosnetwork/token-list/main/logos/telos.png', isNative: false, isSystem: false, } as TokenSourceInfo); diff --git a/src/antelope/chains/evm/telos-evm/index.ts b/src/antelope/chains/evm/telos-evm/index.ts index 681163323..91b1a8533 100644 --- a/src/antelope/chains/evm/telos-evm/index.ts +++ b/src/antelope/chains/evm/telos-evm/index.ts @@ -6,7 +6,7 @@ import { TokenClass, TokenSourceInfo } from 'src/antelope/types'; import { useUserStore } from 'src/antelope'; import { getFiatPriceFromIndexer } from 'src/api/price'; -const LOGO = 'https://raw.githubusercontent.com/telosnetwork/images/master/logos_2021/Symbol%202.svg'; +const LOGO = 'https://raw.githubusercontent.com/telosnetwork/token-list/main/logos/telos.png'; const CHAIN_ID = '40'; export const NETWORK = 'telos-evm'; const DISPLAY = 'Telos EVM Mainnet'; @@ -28,7 +28,7 @@ const S_TOKEN = new TokenClass({ network: NETWORK, decimals: 18, address: '0xB4B01216a5Bc8F1C8A33CD990A1239030E60C905', - logo: 'https://raw.githubusercontent.com/telosnetwork/teloscan/master/public/stlos-logo.png', + logo: 'https://raw.githubusercontent.com/telosnetwork/token-list/main/logos/stlos.png', isNative: false, isSystem: false, } as TokenSourceInfo); @@ -39,7 +39,7 @@ const W_TOKEN = new TokenClass({ network: NETWORK, decimals: 18, address: '0xD102cE6A4dB07D247fcc28F366A623Df0938CA9E', - logo: 'https://raw.githubusercontent.com/telosnetwork/images/master/logos_2021/Symbol%202.svg', + logo: 'https://raw.githubusercontent.com/telosnetwork/token-list/main/logos/telos.png', isNative: false, isSystem: false, } as TokenSourceInfo); diff --git a/src/assets/evm/telos-scan.png b/src/assets/evm/telos-scan.png new file mode 100644 index 000000000..0dfb7e91e Binary files /dev/null and b/src/assets/evm/telos-scan.png differ diff --git a/src/assets/tokens/Tlos.svg b/src/assets/tokens/Tlos.svg deleted file mode 100644 index 92b1403fc..000000000 --- a/src/assets/tokens/Tlos.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assets/tokens/telos.png b/src/assets/tokens/telos.png new file mode 100644 index 000000000..2be9c2c7c Binary files /dev/null and b/src/assets/tokens/telos.png differ diff --git a/src/components/evm/AppNav.vue b/src/components/evm/AppNav.vue index eb5c69834..6a8c02506 100644 --- a/src/components/evm/AppNav.vue +++ b/src/components/evm/AppNav.vue @@ -207,7 +207,7 @@ export default defineComponent({
-