From 48c99c6a701a210889c7e8d3021825de0abbff8c Mon Sep 17 00:00:00 2001 From: secondl1ght <85003930+secondl1ght@users.noreply.github.com> Date: Sun, 21 Aug 2022 20:53:21 -0400 Subject: remove leaflet and run format --- package.json | 1 - pnpm-lock.yaml | 6 - src/components/404.svelte | 2 +- src/components/About.svelte | 30 ++- src/components/AppHeader.svelte | 6 +- src/components/FaqCard.svelte | 10 +- src/components/Footer.svelte | 6 +- src/components/HowItWorksCard.svelte | 2 +- src/components/LandingHeader.svelte | 2 +- src/components/LandingHero.svelte | 10 +- src/locales/en.json | 328 ++++++++++++------------ src/locales/fr.json | 18 +- src/routes/+error.svelte | 8 +- src/routes/+layout.svelte | 8 +- src/routes/+page.svelte | 24 +- src/routes/[username]/+page.server.js | 2 +- src/routes/[username]/+page.svelte | 2 +- src/routes/[username]/dashboard/+page.svelte | 16 +- src/routes/[username]/receive/+page.svelte | 5 +- src/routes/[username]/settings/+page.svelte | 20 +- src/routes/[username]/support/+page.svelte | 6 +- src/routes/[username]/transactions/+page.svelte | 6 +- src/routes/invoice/[id]/+page.svelte | 9 +- src/routes/jobs/+page.svelte | 8 +- src/routes/login/+page.server.js | 2 +- src/routes/register/+page.server.js | 4 +- 26 files changed, 278 insertions(+), 263 deletions(-) diff --git a/package.json b/package.json index 04dbf4ae..00f90aba 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,6 @@ "@zerodevx/svelte-toast": "^0.7.2", "autoprefixer": "^10.4.7", "cookie": "^0.5.0", - "leaflet": "^1.8.0", "postcss": "^8.4.14", "prettier": "^2.7.1", "prettier-plugin-svelte": "^2.7.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b68a7e3f..73e3501f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,7 +6,6 @@ specifiers: '@zerodevx/svelte-toast': ^0.7.2 autoprefixer: ^10.4.7 cookie: ^0.5.0 - leaflet: ^1.8.0 postcss: ^8.4.14 prettier: ^2.7.1 prettier-plugin-svelte: ^2.7.0 @@ -24,7 +23,6 @@ devDependencies: '@zerodevx/svelte-toast': 0.7.2 autoprefixer: 10.4.7_postcss@8.4.14 cookie: 0.5.0 - leaflet: 1.8.0 postcss: 8.4.14 prettier: 2.7.1 prettier-plugin-svelte: 2.7.0_o3ioganyptcsrh6x4hnxvjkpqi @@ -944,10 +942,6 @@ packages: engines: {node: '>=6'} dev: true - /leaflet/1.8.0: - resolution: {integrity: sha512-gwhMjFCQiYs3x/Sf+d49f10ERXaEFCPr+nVTryhAW8DWbMGqJqt9G4XuIaHmFW08zYvhgdzqXGr8AlW8v8dQkA==} - dev: true - /lilconfig/2.0.6: resolution: {integrity: sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==} engines: {node: '>=10'} diff --git a/src/components/404.svelte b/src/components/404.svelte index fbc05048..4d5be76e 100644 --- a/src/components/404.svelte +++ b/src/components/404.svelte @@ -1,6 +1,6 @@
diff --git a/src/components/About.svelte b/src/components/About.svelte index 2b64bbf4..7ec0800c 100644 --- a/src/components/About.svelte +++ b/src/components/About.svelte @@ -1,6 +1,6 @@

{$_('about.header')}

@@ -8,29 +8,35 @@ class="md:px-10 lg:px-0 block lg:flex justify-center text-secondary text-xl lg:space-x-20 mx-auto max-w-7xl relative" >

- {@html $_('about.p1')} + {@html $_('about.p1')}

- {@html $_('about.p2')} + {@html $_('about.p2')}

- {@html $_('about.p3')} + {@html $_('about.p3')}

- {@html $_('about.p4')} + {@html $_('about.p4')}

-

{$_('about.founder.header')}

+

+ {$_('about.founder.header')} +

- {$_('about.founder.name')} + {$_('about.founder.name')} {$_('about.founder.position')}
+ >{$_('about.founder.position')} +
- {#each $json('about.founder.qualifications') as qualification} -
  • {qualification}
    • - {/each} - + {#each $json('about.founder.qualifications') as qualification} +
  • {qualification}
    • + {/each} +
    diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte index 761ce2a8..1d24cb1d 100644 --- a/src/components/AppHeader.svelte +++ b/src/components/AppHeader.svelte @@ -5,7 +5,7 @@ import { user, newPayment, colorTheme } from '$lib/store'; import { goto } from '$app/navigation'; import { Icon } from '$comp'; - import { _ } from 'svelte-i18n'; + import { _ } from 'svelte-i18n'; export let avatarPosition = 'left-[calc(50vw-48px)]'; @@ -85,7 +85,9 @@
    {:else} - + {/if} diff --git a/src/components/FaqCard.svelte b/src/components/FaqCard.svelte index 3e855e42..0d3a9fa7 100644 --- a/src/components/FaqCard.svelte +++ b/src/components/FaqCard.svelte @@ -1,10 +1,10 @@
    diff --git a/src/components/Footer.svelte b/src/components/Footer.svelte index 8d846f04..e2acd993 100644 --- a/src/components/Footer.svelte +++ b/src/components/Footer.svelte @@ -1,6 +1,6 @@ diff --git a/src/components/LandingHeader.svelte b/src/components/LandingHeader.svelte index 3e53a613..acc83001 100644 --- a/src/components/LandingHeader.svelte +++ b/src/components/LandingHeader.svelte @@ -98,7 +98,7 @@ class="bg-black text-white border rounded-full px-6 py-2 font-bold block" on:click={() => goto('/logout')} > - {$_('nav.signOut')} + {$_('nav.signOut')} {/if} diff --git a/src/components/LandingHero.svelte b/src/components/LandingHero.svelte index 7c044a4d..6553d271 100644 --- a/src/components/LandingHero.svelte +++ b/src/components/LandingHero.svelte @@ -2,7 +2,7 @@ import { goto } from '$app/navigation'; import { Icon, Image } from '$comp'; import { user } from '$lib/store'; - import { _ } from 'svelte-i18n'; + import { _ } from 'svelte-i18n';
    @@ -10,15 +10,17 @@

    - {$_('landing.header_before_icon')} + {$_('landing.header_before_icon')} + {$_('landing.header_with_icon')} - {$_('landing.header_after_icon')} + + {$_('landing.header_after_icon')}

    - {$_('landing.subheader')} + {$_('landing.subheader')}

    {#if !$user}
    diff --git a/src/locales/en.json b/src/locales/en.json index 72a458c6..851deb0e 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -1,36 +1,36 @@ { "langname": "English", - "404": { - "404": "404", - "pageNotFound": "Page not found." - }, - "about": { - "header": "About", - "p1": "CoinOS is an open source bitcoin web wallet, point of sale, ecommerce marketplace and exchange platform. Development started in Vancouver in September 2012 as a way to provide local merchants with a convenient way to accept bitcoin payments.", - "p2": "The feature set has grown over the years to accomodate a wide variety of use cases with the goal of making it as easy as possible for anyone to get started using bitcoin quickly, cheaply, and securely.", - "p3": "Anyone can download the source code and host their own instance of the platform backed by their own bitcoin, liquid or lightning nodes, or reach out and we'll gladly set this up for you.", - "p4": "Intra-account transfers between custodial wallets of different users on our server are completely free, instant, and unlimited.", - "founder": { - "header": "The Founder", - "name": "Adam Soltys", - "position": "Chief Technical Officer", - "qualifications": [ - "Running bitcoin since 2011", - "20+ years web development experience in government and industry", - "Early bitcoin Vancouver meetup organizer", - "Founder of The bitcoin Co-op and early supporter of Decentral Vancouver", - "Yogi, permaculturist, anarchist, decentralist", - "Husband, father, brother, son" - ] - } - }, - "error": { - "header": "Error", - "message": "Please try again or contact support.", - "signIn": "Please sign in to continue." - }, - "faq": { - "header": "FAQ", + "404": { + "404": "404", + "pageNotFound": "Page not found." + }, + "about": { + "header": "About", + "p1": "CoinOS is an open source bitcoin web wallet, point of sale, ecommerce marketplace and exchange platform. Development started in Vancouver in September 2012 as a way to provide local merchants with a convenient way to accept bitcoin payments.", + "p2": "The feature set has grown over the years to accomodate a wide variety of use cases with the goal of making it as easy as possible for anyone to get started using bitcoin quickly, cheaply, and securely.", + "p3": "Anyone can download the source code and host their own instance of the platform backed by their own bitcoin, liquid or lightning nodes, or reach out and we'll gladly set this up for you.", + "p4": "Intra-account transfers between custodial wallets of different users on our server are completely free, instant, and unlimited.", + "founder": { + "header": "The Founder", + "name": "Adam Soltys", + "position": "Chief Technical Officer", + "qualifications": [ + "Running bitcoin since 2011", + "20+ years web development experience in government and industry", + "Early bitcoin Vancouver meetup organizer", + "Founder of The bitcoin Co-op and early supporter of Decentral Vancouver", + "Yogi, permaculturist, anarchist, decentralist", + "Husband, father, brother, son" + ] + } + }, + "error": { + "header": "Error", + "message": "Please try again or contact support.", + "signIn": "Please sign in to continue." + }, + "faq": { + "header": "FAQ", "cost": { "question": "What does it cost?", "answer": "CoinOS is free to use. You only pay a 1% fee if/when you withdraw your funds. Compare this to 3% typically charged by a credit card processor." @@ -43,147 +43,147 @@ "question": "Are my funds safe?", "answer": "Your funds are stored on our secure server, however we recommend that you withdraw them to your own cold storage for long-term savings." } - }, - "footer": { - "followUs": "Follow Us", - "twitter": "Twitter", - "github": "GitHub", - "company": "Company", - "telegram": "Telegram", - "support": "Support", - "jobs": "Jobs" - }, - "howItWorks": { - "header": "How It Works", - "step1": { + }, + "footer": { + "followUs": "Follow Us", + "twitter": "Twitter", + "github": "GitHub", + "company": "Company", + "telegram": "Telegram", + "support": "Support", + "jobs": "Jobs" + }, + "howItWorks": { + "header": "How It Works", + "step1": { "header": "1. Create your account", "description": "A username & password is all you need to get started." - }, - "step2": { + }, + "step2": { "header": "2. Ask for payments", "description": "The same as you normally would, but with bitcoin." - }, - "step3": { + }, + "step3": { "header": "3. That's all!", "description": "You can convert to local currency at any point." - } - }, - "invoice": { - "addTip": "Add a tip", - "addTipq": "Add a tip?", - "done": "Done", - "paymentSuccessful": "Payment Successful!" - }, - "jobs": { - "header": "Jobs", - "subheader": "Current Openings", - "pitch1": "CoinOS is actively looking for developers to join our growing team (full-time or part-time, remote working OK).", - "pitch2": "Excited about working on open source bitcoin? Then take a look at our repositories on", - "github": "GitHub", - "pitch3": "If you think you can make an impact, we'd love to hear from you. Send us your resume to" - }, - "landing": { - "header_before_icon": "The", - "header_with_icon": "easiest", - "header_after_icon": "way to accept bitcoin in your store.", - "subheader": "Grow your customer base and revenue by accepting bitcoin with an easy-to-use and managed Point of Sale. No software or hardware required.", - "info1": { - "title": "Instant payments via Lightning", - "description": "The moment your customer sends a payment, it’s there. No waiting for bank settlements or worrying about chargebacks. Instant settlement, in seconds. Say goodbye to 3% credit card processing fees." - }, - "info2": { - "title": "Simple to use, custodial by default", - "description1": "Just enter an amount, share QR code and you’re done.", - "description2": "CoinOS is custodial by default, which eliminates the need to understand how bitcoin/lightning works. We do all the heavy lifting so you can focus on your business.", - "description3": "You always have the option of taking custody of your own keys." - }, - "info3": { - "title": "Brand it your way!", - "description": "Customize your point of sale look and feel, or keep it on default - totally up to you." - } - }, - "login": { - "username": "Username", - "password": "Password", - "passwordRecommendation": "We recommend a long, random password generated with a password manager.", - "forgotPassword": "Forgot Password?", - "haveAccount": "Already have an account?", - "noAccount": "Don't have an account?", - "register": "Register", - "signIn": "Sign In", - "failed": "Login failed" - }, + } + }, + "invoice": { + "addTip": "Add a tip", + "addTipq": "Add a tip?", + "done": "Done", + "paymentSuccessful": "Payment Successful!" + }, + "jobs": { + "header": "Jobs", + "subheader": "Current Openings", + "pitch1": "CoinOS is actively looking for developers to join our growing team (full-time or part-time, remote working OK).", + "pitch2": "Excited about working on open source bitcoin? Then take a look at our repositories on", + "github": "GitHub", + "pitch3": "If you think you can make an impact, we'd love to hear from you. Send us your resume to" + }, + "landing": { + "header_before_icon": "The", + "header_with_icon": "easiest", + "header_after_icon": "way to accept bitcoin in your store.", + "subheader": "Grow your customer base and revenue by accepting bitcoin with an easy-to-use and managed Point of Sale. No software or hardware required.", + "info1": { + "title": "Instant payments via Lightning", + "description": "The moment your customer sends a payment, it’s there. No waiting for bank settlements or worrying about chargebacks. Instant settlement, in seconds. Say goodbye to 3% credit card processing fees." + }, + "info2": { + "title": "Simple to use, custodial by default", + "description1": "Just enter an amount, share QR code and you’re done.", + "description2": "CoinOS is custodial by default, which eliminates the need to understand how bitcoin/lightning works. We do all the heavy lifting so you can focus on your business.", + "description3": "You always have the option of taking custody of your own keys." + }, + "info3": { + "title": "Brand it your way!", + "description": "Customize your point of sale look and feel, or keep it on default - totally up to you." + } + }, + "login": { + "username": "Username", + "password": "Password", + "passwordRecommendation": "We recommend a long, random password generated with a password manager.", + "forgotPassword": "Forgot Password?", + "haveAccount": "Already have an account?", + "noAccount": "Don't have an account?", + "register": "Register", + "signIn": "Sign In", + "failed": "Login failed" + }, "nav": { "startInSeconds": "Start in Seconds", - "account": "Account", + "account": "Account", "signIn": "Sign In", - "signOut": "Sign Out", - "dashboard": "Dashboard", - "settings": "Settings", - "support": "Support" + "signOut": "Sign Out", + "dashboard": "Dashboard", + "settings": "Settings", + "support": "Support" }, - "user": { - "addressGoesHere": "Address goes here", - "follow": "Follow", - "remove": "Remove", - "scanToPayBTC": "Scan to pay with bitcoin", - "dashboard": { - "ACCOUNT_BALANCE": "ACCOUNT BALANCE", - "bitcoinPrice": "Bitcoin Price:", - "conversionFeeWarning": "You will be charged a 1% conversion fee if you withdraw more of a certain type of Bitcoin than you deposit.", - "dataFromBinance": "Data from Binance.", - "fetchingRate": "fetching rate...", - "optionalNote": "Note (Optional)", - "send": "Send", - "withdraw": "Withdraw" - }, - "receive": { - "lessThan1BTCWarning": "Please enter an amount less than 1 bitcoin.", - "showQR": "Show QR" - }, - "settings": { - "header": "Settings", - "ACCOUNT": "ACCOUNT", - "POINT_OF_SALE": "POINT OF SALE", - "SECURITY": "SECURITY", - "locale": "Language", - "username": "Username", - "newPassword": "New Password", - "businessAddress": "Business Address", - "emailNotifications": "Email Notifications", - "emailNotificationsDescription": "Get notified via email when a change occurs on your account or when people send you payments.", - "smsNotifications": "SMS Notifications", - "smsNotificationsDescription": "CoinOS will send you text notifications when this is enabled.", - "theme": "Color Theme", - "themeDescription": "Select from the default color themes.", - "localCurrency": "Local Currency", - "btcUnit": "Display bitcoin in:", - "bitcoin": "Bitcoin", - "satoshis": "Satoshis", - "securityPIN": "Security PIN", - "securityPINDescription": "Set a security pin that will be used to unlock your settings and to send outgoing payments.", - "setPIN": "Set PIN", - "autoLock": "Auto-Lock Timer", - "autoLockDescription": "Your account will go into a secure mode automatically after a specified time:", - "twofa": "2-Factor Authentication", - "twofaDescription": "Add an extra level of security to your device by enableing 2-factor authentication.", - "twofaSetup": "Set up 2FA" - }, - "support": { - "header": "Support", - "email": "Email", - "accountName": "Account Name", - "message": "Message", - "send": "Send" - }, - "transactions": { - "header": "Transaction History", - "AMOUNT": "AMOUNT", - "TYPE": "TYPE", - "TIME": "TIME", - "sent": "Sent", - "received": "Received", - "empty": "No transactions yet." - } - } + "user": { + "addressGoesHere": "Address goes here", + "follow": "Follow", + "remove": "Remove", + "scanToPayBTC": "Scan to pay with bitcoin", + "dashboard": { + "ACCOUNT_BALANCE": "ACCOUNT BALANCE", + "bitcoinPrice": "Bitcoin Price:", + "conversionFeeWarning": "You will be charged a 1% conversion fee if you withdraw more of a certain type of Bitcoin than you deposit.", + "dataFromBinance": "Data from Binance.", + "fetchingRate": "fetching rate...", + "optionalNote": "Note (Optional)", + "send": "Send", + "withdraw": "Withdraw" + }, + "receive": { + "lessThan1BTCWarning": "Please enter an amount less than 1 bitcoin.", + "showQR": "Show QR" + }, + "settings": { + "header": "Settings", + "ACCOUNT": "ACCOUNT", + "POINT_OF_SALE": "POINT OF SALE", + "SECURITY": "SECURITY", + "locale": "Language", + "username": "Username", + "newPassword": "New Password", + "businessAddress": "Business Address", + "emailNotifications": "Email Notifications", + "emailNotificationsDescription": "Get notified via email when a change occurs on your account or when people send you payments.", + "smsNotifications": "SMS Notifications", + "smsNotificationsDescription": "CoinOS will send you text notifications when this is enabled.", + "theme": "Color Theme", + "themeDescription": "Select from the default color themes.", + "localCurrency": "Local Currency", + "btcUnit": "Display bitcoin in:", + "bitcoin": "Bitcoin", + "satoshis": "Satoshis", + "securityPIN": "Security PIN", + "securityPINDescription": "Set a security pin that will be used to unlock your settings and to send outgoing payments.", + "setPIN": "Set PIN", + "autoLock": "Auto-Lock Timer", + "autoLockDescription": "Your account will go into a secure mode automatically after a specified time:", + "twofa": "2-Factor Authentication", + "twofaDescription": "Add an extra level of security to your device by enableing 2-factor authentication.", + "twofaSetup": "Set up 2FA" + }, + "support": { + "header": "Support", + "email": "Email", + "accountName": "Account Name", + "message": "Message", + "send": "Send" + }, + "transactions": { + "header": "Transaction History", + "AMOUNT": "AMOUNT", + "TYPE": "TYPE", + "TIME": "TIME", + "sent": "Sent", + "received": "Received", + "empty": "No transactions yet." + } + } } diff --git a/src/locales/fr.json b/src/locales/fr.json index 44320607..acc0eda7 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -1,14 +1,14 @@ { "langname": "Français", - "about": { - "header": "À Propos" - }, - "faq": { - "header": "FAQ" - }, - "howItWorks": { - "header": "Comment Elle Fonctionne" - }, + "about": { + "header": "À Propos" + }, + "faq": { + "header": "FAQ" + }, + "howItWorks": { + "header": "Comment Elle Fonctionne" + }, "nav": { "startInSeconds": "Commence en Secondes", "signIn": "Connexion" diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte index 2a8846c3..2bacc8a6 100644 --- a/src/routes/+error.svelte +++ b/src/routes/+error.svelte @@ -1,7 +1,7 @@ {#if $page.error.message.includes('not found') || $page.status === 404} @@ -15,9 +15,9 @@ -

    {$_('error.header'), { default: "Error" }}

    +

    {($_('error.header'), { default: 'Error' })}

    {$page.error.message.toUpperCase()}

    -

    {$_('error.message'), { default: "Please try again or contact support." }}

    +

    {($_('error.message'), { default: 'Please try again or contact support.' })}

    {/if} diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index f2624613..12db17c3 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -11,11 +11,11 @@ import { goto } from '$app/navigation'; import { LoadingSplash } from '$comp'; import { warning, protectedRoutes } from '$lib/utils'; - import { _ } from 'svelte-i18n'; + import { _ } from 'svelte-i18n'; - $: $token = data.token + $: $token = data.token; - export let data; + export let data; let ready = false; @@ -28,7 +28,7 @@ }); if (protectedRoutes.find((p) => $page.url.pathname.match(p))) { - console.log("TOKEN", $token) + console.log('TOKEN', $token); if (!$token) { goto('/login'); warning($_('error.signIn')); diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 6bdd9699..bb5df050 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -10,7 +10,7 @@ Footer } from '$comp'; - import { _ } from 'svelte-i18n'; + import { _ } from 'svelte-i18n'; let howItWorks; let faq; @@ -22,7 +22,7 @@ { image: 'smile', stepID: 'step3' } ]; - const faqIDs = ["cost", "compatibility", "safety"]; + const faqIDs = ['cost', 'compatibility', 'safety']; @@ -34,28 +34,24 @@ - - {$_('landing.info2.description1')} + + {$_('landing.info2.description1')}

    - {$_('landing.info2.description2')} + {$_('landing.info2.description2')}

    - {@html $_('landing.info2.description3')} + {@html $_('landing.info2.description3')}
    @@ -79,7 +75,7 @@

    {$_('faq.header')}

    {#each faqIDs as faqID} - + {/each}
    diff --git a/src/routes/[username]/+page.server.js b/src/routes/[username]/+page.server.js index e31a28c0..458b1db0 100644 --- a/src/routes/[username]/+page.server.js +++ b/src/routes/[username]/+page.server.js @@ -10,7 +10,7 @@ export async function load({ params }) { body = {}; } - console.log("BODY", body) + console.log('BODY', body); return body; } diff --git a/src/routes/[username]/+page.svelte b/src/routes/[username]/+page.svelte index 6d93ba23..ed428d46 100644 --- a/src/routes/[username]/+page.svelte +++ b/src/routes/[username]/+page.svelte @@ -4,7 +4,7 @@ import { AppHeader, Icon, PageNotFound } from '$comp'; import { user } from '$lib/store'; import { copy } from '$lib/utils'; - import { _ } from 'svelte-i18n'; + import { _ } from 'svelte-i18n'; export let data; let lightningAddress = `${data?.username}@coinos.io`; diff --git a/src/routes/[username]/dashboard/+page.svelte b/src/routes/[username]/dashboard/+page.svelte index 3553661a..9e09aa16 100644 --- a/src/routes/[username]/dashboard/+page.svelte +++ b/src/routes/[username]/dashboard/+page.svelte @@ -3,7 +3,7 @@ import { tick } from 'svelte'; import { AppHeader, Icon } from '$comp'; import { rate, user, preferredCurrency } from '$lib/store'; - import { _ } from 'svelte-i18n'; + import { _ } from 'svelte-i18n'; let payreq = '', payreqField, @@ -63,14 +63,12 @@ {#if !withdrawing} {$_('user.dashboard.bitcoinPrice')} - {$rate ? btcPrice : $_('user.dashboard.fetchingRate')} + >{$_('user.dashboard.bitcoinPrice')} + {$rate ? btcPrice : $_('user.dashboard.fetchingRate')} {$preferredCurrency} - {@html $_('user.dashboard.dataFromBinance')} - + {@html $_('user.dashboard.dataFromBinance')}

    {$_('user.dashboard.ACCOUNT_BALANCE')} @@ -83,7 +81,7 @@ {accountBalanceSats} SAT {$_('user.dashboard.withdraw')}

    {$_('user.dashboard.conversionFeeWarning')}

    {:else} @@ -105,7 +103,9 @@

    - +