Skip to content
Open
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
20 changes: 9 additions & 11 deletions pyinstaller/electron/src/output.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/cryptoadvance/specter/devices/trezor.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 9 additions & 11 deletions src/cryptoadvance/specter/static/output.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/cryptoadvance/specter/templates/500.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<link rel="shortcut icon" type="image/png" href="{{ url_for('static', filename='img/favicon.png') }}"/>
<title>{{ _("Specter") }}</title>
<title>{{ _("Fortiquo") }}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='output.css') }}">
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='typography.css') }}">
Expand Down
4 changes: 2 additions & 2 deletions src/cryptoadvance/specter/templates/500_timeout.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<link rel="shortcut icon" type="image/png" href="{{ url_for('static', filename='img/icon.png') }}"/>
<title>{{ _("Specter Desktop") }}</title>
<title>{{ _("Fortiquo Desktop") }}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles.css') }}">
<div style="display: none;"><!--<style>-->
Expand All @@ -22,7 +22,7 @@
<br></div>
{{ _("Please have a look in the below log. There are effectively two ways to resolve this:") }}"
<ul>
<li>{{ _("Either the process was just slow and Specter was too impatient") }}</li>
<li>{{ _("Either the process was just slow and Fortiquo was too impatient") }}</li>
<li>{{ _("The process is in trouble which should be reflected by the content of the logs below") }}</li>
</ul>
{{ _("Details from the log file") }}:
Expand Down
12 changes: 6 additions & 6 deletions src/cryptoadvance/specter/templates/base.jinja
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html class="bg-dark-900 overflow-hidden max-h-screen">
<html class="overflow-hidden max-h-screen">
<head>
<title>{{ _("Specter") }}</title>
<title>{{ _("Fortiquo") }}</title>

<!-- Light mode favicon by default -->
<link id="favicon" rel="shortcut icon" type="image/png" href="{{ url_for('static', filename='img/favicon-light-mode.png') }}"/>
Expand All @@ -22,7 +22,7 @@
{% block head %}{% endblock %}
</head>

<body spellcheck="false">
<body class="bg-gradient-to-b from-blue-500 to-white" spellcheck="false">
{% include "services/inject_in_basejinja_body_top.jinja" %}

<div class="pageloader" id="pageloader"></div>
Expand All @@ -43,7 +43,7 @@

{% include "includes/tool-tip.html" %}

<div class="flex w-screen h-screen bg-dark-900">
<div class="flex w-screen h-screen bg-transparent">
<div>
{% block sidebar %}
{% include "includes/sidebar/sidebar.jinja" %}
Expand All @@ -53,7 +53,7 @@

<!-- Status Bar -->
{% if current_user.is_authenticated and not hwi_bridge %}
<div class="flex row p-3 bg-dark-900 border-b border-dark-700 h-16 min-h-[64px] justify-between items-center" id="status-bar" data-style="{% if session['is_language_rtl'] %}border-radius: 0 0 15px 0; left{% else %}border-radius: 0 0 15px 15px; right{% endif %}: 2.4%; position: absolute; color: #ddd; background-color: #323e50;">
<div class="flex row p-3 border-b border-dark-700 h-16 min-h-[64px] justify-between items-center" id="status-bar" data-style="{% if session['is_language_rtl'] %}border-radius: 0 0 15px 0; left{% else %}border-radius: 0 0 15px 15px; right{% endif %}: 2.4%; position: absolute; color: #ddd; background-color: #323e50;">
<div class="h-full w-32 my-2 rounded-lg">

</div>
Expand Down Expand Up @@ -93,7 +93,7 @@
</div>

<!-- Main Content -->
<main class="overflow-scroll w-full px-[calc((100%-700px)/2)] bg-dark-900 flex flex-col grow py-20 text-white">
<main class="overflow-scroll w-full px-[calc((100%-700px)/2)] bg-transparent flex flex-col grow py-20 text-black">
{% block main %}
{% if error %}
<br><br>{{ _("Something went wrong:") }}<br><br>{{error}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
</div>
<button type="button" class="button w-full mb-0" onclick="togglePriceCheck(false)">{{ _("Disable showing price") }}</button>
{% else %}
<p>{{ _("You can enable showing price feature to see the price information of your Bitcoin amounts across Specter.")}}</p>
<p>{{ _("You can enable showing price feature to see the price information of your Bitcoin amounts across Fortiquo.")}}</p>
<button type="button" class="button w-full mb-0 mt-3" onclick="togglePriceCheck(true)">{{ _("Enable showing price") }}</button>
{% endif %}
</form>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
</div>

<div id="specter-instructions" class="{%if device_class.device_type != 'specter' %}hidden{% endif %}">
<p>{{ _("Connect your Specter-DIY to the computer via USB and unlock it or scan the wallet master public key.") }}</p>
<p>{{ _("Connect your Fortiquo-DIY to the computer via USB and unlock it or scan the wallet master public key.") }}</p>

<ol>
<li>{{ _("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.") }}</li>
<li>{{ _("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.") }}</li>
</ol>
</div>

Expand All @@ -55,16 +55,16 @@
<li>{{ _("To get the master public keys QR codes to scan:") }}</li>
<li>{{ _("For single sig, click on: Setting &rarr; Watch-Only Wallet &rarr; Generic Wallet, Click the top right 3 dots (...) &rarr; Wallet Info &rarr; Toggle Address Type, then select the wallet address type you would like to use for your wallet.") }}</li>
<li>{{ _("For multisig, click on: Multisig Wallet &rarr; Click the top right 3 dots (...) &rarr; Show/Export XPUB, then select the wallet address type you would like to use for your wallet.") }}</li>
<li>{{ _("Cobo Vault will then display the QR code which you should scan into Specter.") }}</li>
<li>{{ _("Cobo Vault will then display the QR code which you should scan into Fortiquo.") }}</li>
<li>{{ _("To import with SD card, click on \"touch here to export the file with microSD\" on the same screen as the QR code.") }}</li>
</ol>
</div>

<div id="passport-instructions" class="{%if device_class.device_type != 'passport' %}hidden{% endif %}">
<p>{{ _("Pair your Passport to Specter using QR codes or a microSD card.") }}</p>
<p>{{ _("Pair your Passport to Fortiquo using QR codes or a microSD card.") }}</p>

<ol>
<li>{{ _("To pair your Passport with Specter, navigate to Pair Wallet –> Specter and follow the instructions on your Passport.")}}</li>
<li>{{ _("To pair your Passport with Fortiquo, navigate to Pair Wallet –> Fortiquo and follow the instructions on your Passport.")}}</li>
<li>{{ _("If your webcam is having difficulty scanning QR codes on Passport’s screen, we recommend using a microSD.") }}</li>
</ol>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ <h3 class="mb-0">{{ _("Address Data") }}</h3>
addressInfoHTML += `<tr><td>{{ _("Service") }}:</td><td><button type="button" id="associate-btn" class="btn" onclick="location.href='${associateServiceUrl}';" data-cy="associate-address-with-service-btn">&#128229;&nbsp;{{ _("Associate with a service") }}</button></td></tr>`;
};

// 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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ <h3>{{ _("Export addresses to CSV") }}</h3>
* 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)
Expand Down Expand Up @@ -352,7 +352,7 @@ <h3>{{ _("Export addresses to CSV") }}</h3>
}

/**
* 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++;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ <h4 slot="title">{{ _("Subtract fees from amount") }}</h4>
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();
Expand Down
4 changes: 2 additions & 2 deletions src/cryptoadvance/specter/templates/includes/hwi/hwi.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<p id="bitbox02-pairing-code" data-style="margin: auto;"></p>
<img src="{{ url_for('static', filename='img/loader_boxes.svg') }}">
<div class="flex-center hidden" id="hwi_progress_note" data-style="cursor: pointer;">
{{ _("If your device does not show up, close any other wallet software that may be connected to your device and ensure the Specter USB settings are correctly configured.") }}<br><br>
{{ _("If your device does not show up, close any other wallet software that may be connected to your device and ensure the Fortiquo USB settings are correctly configured.") }}<br><br>
<a href="{{ url_for('settings_endpoint.hwi') }}" data-style="color: #fff; text-decoration: underline; cursor: pointer;">
{{ _("View USB settings") }}
</a>
Expand Down Expand Up @@ -83,7 +83,7 @@
// detect device
if (devicePath == null) {
if (deviceTypes == 'ledger') {
showHWIProgress(`{{ _("Detecting...") }}`, `{{ _("Plug in your Ledger. Make sure you have opened the Bitcoin app on your Ledger otherwise Specter can't detect the device.") }}`);
showHWIProgress(`{{ _("Detecting...") }}`, `{{ _("Plug in your Ledger. Make sure you have opened the Bitcoin app on your Ledger otherwise Fortiquo can't detect the device.") }}`);
}
else {
showHWIProgress(`{{ _("Detecting...") }}`, `{{ _("Plug in your device") }}`);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<h4 slot="title">{{ _("Merkle Proof Validation") }}</h4>
<span slot="paragraph">
{{ _("This option is intended for the usage of Specter Desktop with nodes that you don't fully trust (e.g. remote / cloud nodes).") }} <br>
{{ _("This option is intended for the usage of Fortiquo Desktop with nodes that you don't fully trust (e.g. remote / cloud nodes).") }} <br>
{{ _("If enabled, you will see block hashes in the transactions overview.") }} <br>
{{ _("You can take those block hashes to double check whether they also exist in other locations (other nodes, block explorers, etc).") }} <br>
{{ _("If so, you can be sure that the corresponding transaction was included in this block, since there is a relationship between the blockhash and the tx.") }} <br><br>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
let isopen = this.hasAttribute('open');
if(isopen){
if(navigator.mediaDevices === undefined && location.protocol == "http:"){
this.triggerError('{{ _("Can\'t get access to the camera. Specter should run on localhost or over https to enable QR code scanning.") }}');
this.triggerError('{{ _("Can\'t get access to the camera. Fortiquo should run on localhost or over https to enable QR code scanning.") }}');
return;
}
try{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
- wallet: Wallet object of the item.
- wallet_alias: Active wallet alias.
- chain: Chain name specter is connected to. Options: 'main', 'test', 'regtest', 'signet'.
- loading: Boolean indicating if the wallet is loaded in Specter already or not.
- loading: Boolean indicating if the wallet is loaded in Fortiquo already or not.
#}
{% macro sidebar_wallet_list_item(wallet, wallet_alias, chain, loading=false) -%}
<a class="flex hover:bg-dark-800 {% if wallet_alias == wallet.alias %} bg-dark-800 {% endif %} rounded-xl -mx-3 relative px-3 h-12 items-center my-1" id="{{wallet.alias}}-sidebar-list-item" href="{{ url_for('wallets_endpoint.wallet', wallet_alias=wallet.alias) }}" class="item {% if wallet_alias == wallet.alias %}active{% endif %}" data-cy="wallet-sidebar-btn-{{wallet.name}}">
Expand Down
Loading
Loading