diff --git a/pyinstaller/electron/src/output.css b/pyinstaller/electron/src/output.css index 9d32dfac49..15d62997e6 100644 --- a/pyinstaller/electron/src/output.css +++ b/pyinstaller/electron/src/output.css @@ -817,15 +817,13 @@ select { border-radius: 0.5rem; border-width: 2px; --tw-border-opacity: 1; - border-color: rgb(27 28 33 / var(--tw-border-opacity)); - --tw-bg-opacity: 1; - background-color: rgb(20 21 26 / var(--tw-bg-opacity)); + border-color: rgb(59 130 246 / var(--tw-border-opacity)); + background-image: linear-gradient(to bottom, #3b82f6, #ffffff); padding-bottom: 0.5rem; } .selection:hover { - --tw-bg-opacity: 1; - background-color: rgb(27 28 33 / var(--tw-bg-opacity)); + background-image: linear-gradient(to bottom, #60a5fa, #ffffff); } .selection p { @@ -834,7 +832,7 @@ select { font-size: 1rem; line-height: 1.5rem; --tw-text-opacity: 1; - color: rgb(255 255 255 / var(--tw-text-opacity)); + color: rgb(0 0 0 / var(--tw-text-opacity)); } .selection img { @@ -850,19 +848,19 @@ select { border-radius: 0.5rem; border-width: 2px; --tw-border-opacity: 1; - border-color: rgb(27 28 33 / var(--tw-border-opacity)); - --tw-bg-opacity: 1; - background-color: rgb(20 21 26 / var(--tw-bg-opacity)); + border-color: rgb(59 130 246 / var(--tw-border-opacity)); + background-image: linear-gradient(to bottom, #3b82f6, #ffffff); padding-top: 0.25rem; padding-bottom: 0.25rem; text-align: center; font-size: 1.125rem; line-height: 1.75rem; + --tw-text-opacity: 1; + color: rgb(0 0 0 / var(--tw-text-opacity)); } .selection-button:hover { - --tw-bg-opacity: 1; - background-color: rgb(27 28 33 / var(--tw-bg-opacity)); + background-image: linear-gradient(to bottom, #60a5fa, #ffffff); } .animate-spin-slow { diff --git a/src/cryptoadvance/specter/devices/trezor.py b/src/cryptoadvance/specter/devices/trezor.py index 208b5481de..a0213165a3 100644 --- a/src/cryptoadvance/specter/devices/trezor.py +++ b/src/cryptoadvance/specter/devices/trezor.py @@ -4,7 +4,7 @@ class Trezor(HWIDevice): device_type = "trezor" - name = "Trezor" + name = "QuantumSign" icon = "img/devices/trezor_icon.svg" supports_hwi_toggle_passphrase = True supports_hwi_multisig_display_address = True diff --git a/src/cryptoadvance/specter/static/output.css b/src/cryptoadvance/specter/static/output.css index b669522b6b..89cceb3e4d 100644 --- a/src/cryptoadvance/specter/static/output.css +++ b/src/cryptoadvance/specter/static/output.css @@ -817,15 +817,13 @@ select { border-radius: 0.5rem; border-width: 2px; --tw-border-opacity: 1; - border-color: rgb(27 28 33 / var(--tw-border-opacity)); - --tw-bg-opacity: 1; - background-color: rgb(20 21 26 / var(--tw-bg-opacity)); + border-color: rgb(59 130 246 / var(--tw-border-opacity)); + background-image: linear-gradient(to bottom, #3b82f6, #ffffff); padding-bottom: 0.5rem; } .selection:hover { - --tw-bg-opacity: 1; - background-color: rgb(27 28 33 / var(--tw-bg-opacity)); + background-image: linear-gradient(to bottom, #60a5fa, #ffffff); } .selection p { @@ -834,7 +832,7 @@ select { font-size: 1rem; line-height: 1.5rem; --tw-text-opacity: 1; - color: rgb(255 255 255 / var(--tw-text-opacity)); + color: rgb(0 0 0 / var(--tw-text-opacity)); } .selection img { @@ -850,19 +848,19 @@ select { border-radius: 0.5rem; border-width: 2px; --tw-border-opacity: 1; - border-color: rgb(27 28 33 / var(--tw-border-opacity)); - --tw-bg-opacity: 1; - background-color: rgb(20 21 26 / var(--tw-bg-opacity)); + border-color: rgb(59 130 246 / var(--tw-border-opacity)); + background-image: linear-gradient(to bottom, #3b82f6, #ffffff); padding-top: 0.25rem; padding-bottom: 0.25rem; text-align: center; font-size: 1.125rem; line-height: 1.75rem; + --tw-text-opacity: 1; + color: rgb(0 0 0 / var(--tw-text-opacity)); } .selection-button:hover { - --tw-bg-opacity: 1; - background-color: rgb(27 28 33 / var(--tw-bg-opacity)); + background-image: linear-gradient(to bottom, #60a5fa, #ffffff); } .animate-spin-slow { diff --git a/src/cryptoadvance/specter/templates/500.jinja b/src/cryptoadvance/specter/templates/500.jinja index 16b65b1d93..5a2c7dd879 100644 --- a/src/cryptoadvance/specter/templates/500.jinja +++ b/src/cryptoadvance/specter/templates/500.jinja @@ -2,7 +2,7 @@ - {{ _("Specter") }} + {{ _("Fortiquo") }} diff --git a/src/cryptoadvance/specter/templates/500_timeout.jinja b/src/cryptoadvance/specter/templates/500_timeout.jinja index f6efcdae9c..71b2a7b3ac 100644 --- a/src/cryptoadvance/specter/templates/500_timeout.jinja +++ b/src/cryptoadvance/specter/templates/500_timeout.jinja @@ -2,7 +2,7 @@ - {{ _("Specter Desktop") }} + {{ _("Fortiquo Desktop") }}
@@ -22,7 +22,7 @@
{{ _("Please have a look in the below log. There are effectively two ways to resolve this:") }}" {{ _("Details from the log file") }}: diff --git a/src/cryptoadvance/specter/templates/base.jinja b/src/cryptoadvance/specter/templates/base.jinja index 90731ba80c..931c94150e 100644 --- a/src/cryptoadvance/specter/templates/base.jinja +++ b/src/cryptoadvance/specter/templates/base.jinja @@ -1,7 +1,7 @@ - + - {{ _("Specter") }} + {{ _("Fortiquo") }} @@ -22,7 +22,7 @@ {% block head %}{% endblock %} - + {% include "services/inject_in_basejinja_body_top.jinja" %}
@@ -43,7 +43,7 @@ {% include "includes/tool-tip.html" %} -
+
{% block sidebar %} {% include "includes/sidebar/sidebar.jinja" %} @@ -53,7 +53,7 @@ {% if current_user.is_authenticated and not hwi_bridge %} -
+
@@ -93,7 +93,7 @@
-
+
{% block main %} {% if error %}

{{ _("Something went wrong:") }}

{{error}} diff --git a/src/cryptoadvance/specter/templates/components/price_bar.jinja b/src/cryptoadvance/specter/templates/components/price_bar.jinja index f47ce0f36f..a0a769b880 100644 --- a/src/cryptoadvance/specter/templates/components/price_bar.jinja +++ b/src/cryptoadvance/specter/templates/components/price_bar.jinja @@ -122,7 +122,7 @@
{% else %} -

{{ _("You can enable showing price feature to see the price information of your Bitcoin amounts across Specter.")}}

+

{{ _("You can enable showing price feature to see the price information of your Bitcoin amounts across Fortiquo.")}}

{% endif %} diff --git a/src/cryptoadvance/specter/templates/device/new_device/new_device_keys.jinja b/src/cryptoadvance/specter/templates/device/new_device/new_device_keys.jinja index 6b5f35a794..7c4bf2e72f 100644 --- a/src/cryptoadvance/specter/templates/device/new_device/new_device_keys.jinja +++ b/src/cryptoadvance/specter/templates/device/new_device/new_device_keys.jinja @@ -41,10 +41,10 @@
-

{{ _("Connect your Specter-DIY to the computer via USB and unlock it or scan the wallet master public key.") }}

+

{{ _("Connect your Fortiquo-DIY to the computer via USB and unlock it or scan the wallet master public key.") }}

    -
  1. {{ _("To get the master public key QR code to scan, click on: Master public keys, then select each key type you'd like to import and scan the displayed QR code for each into Specter.") }}
    2. +
  2. {{ _("To get the master public key QR code to scan, click on: Master public keys, then select each key type you'd like to import and scan the displayed QR code for each into Fortiquo.") }}
@@ -55,16 +55,16 @@
  • {{ _("To get the master public keys QR codes to scan:") }}
  • {{ _("For single sig, click on: Setting → Watch-Only Wallet → Generic Wallet, Click the top right 3 dots (...) → Wallet Info → Toggle Address Type, then select the wallet address type you would like to use for your wallet.") }}
  • {{ _("For multisig, click on: Multisig Wallet → Click the top right 3 dots (...) → Show/Export XPUB, then select the wallet address type you would like to use for your wallet.") }}
    • -
  • {{ _("Cobo Vault will then display the QR code which you should scan into Specter.") }}
    • +
  • {{ _("Cobo Vault will then display the QR code which you should scan into Fortiquo.") }}
  • {{ _("To import with SD card, click on \"touch here to export the file with microSD\" on the same screen as the QR code.") }}
    • -

    {{ _("Pair your Passport to Specter using QR codes or a microSD card.") }}

    +

    {{ _("Pair your Passport to Fortiquo using QR codes or a microSD card.") }}

      -
    1. {{ _("To pair your Passport with Specter, navigate to Pair Wallet –> Specter and follow the instructions on your Passport.")}}
      2. +
    2. {{ _("To pair your Passport with Fortiquo, navigate to Pair Wallet –> Fortiquo and follow the instructions on your Passport.")}}
    3. {{ _("If your webcam is having difficulty scanning QR codes on Passport’s screen, we recommend using a microSD.") }}
    diff --git a/src/cryptoadvance/specter/templates/includes/address-data.html b/src/cryptoadvance/specter/templates/includes/address-data.html index 9eecf9698c..50d13f2097 100644 --- a/src/cryptoadvance/specter/templates/includes/address-data.html +++ b/src/cryptoadvance/specter/templates/includes/address-data.html @@ -95,7 +95,7 @@

    {{ _("Address Data") }}

    addressInfoHTML += `{{ _("Service") }}:`; }; - // Message signing feature restricted to singlesig wallets using a Specter DIY + // Message signing feature restricted to singlesig wallets using a Fortiquo DIY {% set device = wallet.devices[0] %} {% if wallet.is_singlesig and device.hwi_support or wallet.is_singlesig and device.supports_qr_message_signing %} let redirectUrl = `{{ url_for('devices_endpoint.device', device_alias=device.alias, origin='wallet', address='ADDRESS', derivation_path='DERIVATION_PATH') }}`.replace('ADDRESS', address).replace('DERIVATION_PATH', derivation_path); diff --git a/src/cryptoadvance/specter/templates/includes/addresses-table.html b/src/cryptoadvance/specter/templates/includes/addresses-table.html index 2db6383cb2..74d0732c2b 100644 --- a/src/cryptoadvance/specter/templates/includes/addresses-table.html +++ b/src/cryptoadvance/specter/templates/includes/addresses-table.html @@ -141,7 +141,7 @@

    {{ _("Export addresses to CSV") }}

    * Can be configured to show: * - The receive addresses of a wallet (set attribute `type` to "receive" and `wallet` to the wallet's alias) * - The change addresses of a wallet (set attribute `type` to "change" and `wallet` to the wallet's alias) - * It uses Specter's API to fetch addresses every time the user changes its parameters. + * It uses Fortiquo's API to fetch addresses every time the user changes its parameters. * These parameters are configured using components included in this table element: * - Tabs for switching between Receive addresses (`type="receive"`) and Change addresses (`type="change"`) * - Sorting addresses by any column (ascending or descending) @@ -352,7 +352,7 @@

    {{ _("Export addresses to CSV") }}

    } /** - * Fetches addresses list from the Specter API and loads the result into AddressRowElement + * Fetches addresses list from the Fortiquo API and loads the result into AddressRowElement */ async fetchAddressesItems() { this.callId++; diff --git a/src/cryptoadvance/specter/templates/includes/fee-selection.html b/src/cryptoadvance/specter/templates/includes/fee-selection.html index 50b084e829..c8425d0fea 100644 --- a/src/cryptoadvance/specter/templates/includes/fee-selection.html +++ b/src/cryptoadvance/specter/templates/includes/fee-selection.html @@ -228,7 +228,7 @@

    {{ _("Subtract fees from amount") }}

    this.subtractClickHook() } - // Fetches fees from the Specter API + // Fetches fees from the Fortiquo API async fetchFees(wallet_alias) { let url = `{{ url_for('wallets_endpoint_api.fees') }}` var formData = new FormData(); diff --git a/src/cryptoadvance/specter/templates/includes/hwi/hwi.jinja b/src/cryptoadvance/specter/templates/includes/hwi/hwi.jinja index 1b3f08c8e9..c6f8f70f3f 100644 --- a/src/cryptoadvance/specter/templates/includes/hwi/hwi.jinja +++ b/src/cryptoadvance/specter/templates/includes/hwi/hwi.jinja @@ -16,7 +16,7 @@