Fixes

Fix asset issue component Fix the select asset component Set the account type properly so the BEET NFT signing prompt shows in wizard
BTS-CM · Jul 28, 2023 · bc6a183 · bc6a183
1 parent f80407b
commit bc6a183
Show file tree

Hide file tree

Showing 29 changed files with 151 additions and 259 deletions.
diff --git a/public/locales/da/blockchain.json b/public/locales/da/blockchain.json
@@ -8,7 +8,10 @@
     "noResultsHeader": "Ingen udstedte aktiver fundet",
     "noResultsDesc": "Denne Bitshares-konto har ikke udstedt nogen NFT'er på BTS DEX.",
     "notice": "Bemærk: At købe og eje en NFT på BTS DEX giver dig ikke automatisk NFT-redigeringsrettigheder.",
-    "selection": "Vælg den NFT, du ønsker at redigere",
+    "selection": {
+      "edit": "Vælg den NFT, du ønsker at redigere",
+      "issue": "Vælg den NFT, du ønsker at udstede"
+    },
     "back": "Gå tilbage",
     "refresh": "Opdater",
     "nonNFT1": "Følgende aktiver er endnu ikke NFT'er",
@@ -78,7 +81,7 @@
       "licensePlaceholder": "Licens",
       "sigHeader": "Valgfri signaturbevis",
       "pubkeyLabel": "Angiv en offentlig nøgle til medtagelse i strengen, der signeres",
-      "signedLabel": "Underskriv følgende tekst med den private nøgle, der er knyttet til ovenstående offentlige nøgle",
+      "signedLabel": "Underskriv følgende tekst med den private nøgle, der er knyttet til ovennævnte offentlige nøgle",
       "signedPlaceholder": "tekst",
       "signatureLabel": "Angiv den manuelt beregnede signatur",
       "signaturePlaceholder": "Underskrift",
@@ -97,7 +100,7 @@
       "poaLabel": "Aktivejer kan overføre aktiv tilbage til sig selv (override_authority)",
       "disabledTR": "Tilladelsen transfer_restricted blev permanent deaktiveret.",
       "trLabel": "Aktivejer skal godkende alle overførsler (transfer_restricted)",
-      "disabledDC": "Tilladelsen disable_confidential blev permanent deaktiveret.",
+      "disabledDC": "Tilladelsen disable_confidential blev deaktiveret permanent.",
       "dcLabel": "Deaktiver fortrolige transaktioner (disable_confidential)",
       "flagsHeader": "Flag",
       "flagsSubHeader": "Hvis en relateret tilladelse ovenfor er aktiveret, kan disse flag til enhver tid ændres.",

diff --git a/public/locales/de/blockchain.json b/public/locales/de/blockchain.json
@@ -8,7 +8,10 @@
     "noResultsHeader": "Keine ausgegebenen Vermögenswerte gefunden",
     "noResultsDesc": "Dieses Bitshares-Konto hat keine NFTs auf dem BTS DEX ausgegeben.",
     "notice": "Hinweis: Der Kauf und Besitz eines NFT auf dem BTS DEX gewährt Ihnen nicht automatisch NFT-Bearbeitungsrechte.",
-    "selection": "Wählen Sie den NFT aus, den Sie bearbeiten möchten",
+    "selection": {
+      "edit": "Wählen Sie den NFT aus, den Sie bearbeiten möchten",
+      "issue": "Wählen Sie den NFT aus, den Sie ausgeben möchten"
+    },
     "back": "Geh zurück",
     "refresh": "Aktualisierung",
     "nonNFT1": "Die folgenden Vermögenswerte sind noch keine NFTs",

diff --git a/public/locales/en/blockchain.json b/public/locales/en/blockchain.json
@@ -8,7 +8,10 @@
         "noResultsHeader": "No issued assets found",
         "noResultsDesc": "This Bitshares account hasn't issued any NFTs on the BTS DEX.",
         "notice": "Note: Buying and owning an NFT on the BTS DEX doesn't automatically grant you NFT editing rights.",
-        "selection": "Select the NFT you wish to edit",
+        "selection": {
+            "edit": "Select the NFT you wish to edit",
+            "issue": "Select the NFT you wish to issue"
+        },
         "back": "Go back",
         "refresh": "Refresh",
         "nonNFT1": "The following assets are not yet NFTs",

diff --git a/public/locales/es/blockchain.json b/public/locales/es/blockchain.json
@@ -8,7 +8,10 @@
     "noResultsHeader": "No se encontraron activos emitidos",
     "noResultsDesc": "Esta cuenta de Bitshares no ha emitido ningún NFT en BTS DEX.",
     "notice": "Nota: Comprar y poseer un NFT en BTS DEX no le otorga automáticamente derechos de edición de NFT.",
-    "selection": "Seleccione el NFT que desea editar",
+    "selection": {
+      "edit": "Seleccione el NFT que desea editar",
+      "issue": "Seleccione el NFT que desea emitir"
+    },
     "back": "Regresa",
     "refresh": "Actualizar",
     "nonNFT1": "Los siguientes activos aún no son NFT",
@@ -97,7 +100,7 @@
       "poaLabel": "El propietario del activo puede transferirse el activo a sí mismo (override_authority)",
       "disabledTR": "El permiso transfer_restricted se inhabilitó permanentemente.",
       "trLabel": "El propietario del recurso debe aprobar todas las transferencias (transfer_restricted)",
-      "disabledDC": "El permiso disabled_confidential se deshabilitó de forma permanente.",
+      "disabledDC": "El permiso disabled_confidential se deshabilitó permanentemente.",
       "dcLabel": "Deshabilitar transacciones confidenciales (disable_confidential)",
       "flagsHeader": "banderas",
       "flagsSubHeader": "Si un permiso relacionado arriba está habilitado, estas banderas se pueden cambiar en cualquier momento.",

diff --git a/public/locales/et/blockchain.json b/public/locales/et/blockchain.json
@@ -6,9 +6,12 @@
     "lookup": "Otsige kasutaja väljastatud varasid",
     "fetching": "Teabe hankimine teie Bitsharesi kontolt",
     "noResultsHeader": "Välja antud varasid ei leitud",
-    "noResultsDesc": "See Bitsharesi konto ei ole BTS DEXis ühtegi NFT-d väljastanud.",
+    "noResultsDesc": "See Bitsharesi konto ei ole BTS DEXis väljastanud ühtegi NFT-d.",
     "notice": "Märkus. NFT ostmine ja omamine BTS DEXis ei anna teile automaatselt NFT redigeerimisõigusi.",
-    "selection": "Valige NFT, mida soovite redigeerida",
+    "selection": {
+      "edit": "Valige NFT, mida soovite redigeerida",
+      "issue": "Valige NFT, mille soovite väljastada"
+    },
     "back": "Mine tagasi",
     "refresh": "Värskenda",
     "nonNFT1": "Järgmised varad ei ole veel NFT-d",
@@ -46,7 +49,7 @@
       "imgHeader": "Pildi üksikasjad",
       "qtyImages": "See NFT sisaldab praegu järgmist {{qty}} pildid:",
       "changeImages": "Muuda pilte",
-      "issuerLabel": "Bitsharesi konto, mida kasutatakse NFT emiteerimiseks",
+      "issuerLabel": "NFT emissiooniks kasutatav bitsharesi konto",
       "symbolLabel": "Vara sümbol",
       "symbolPlaceholder": "DEX-navigeerimise vara sümbol",
       "mainLabel": "Peamine kirjeldus",
@@ -77,14 +80,14 @@
       "licenseLabel": "NFT litsents",
       "licensePlaceholder": "Litsents",
       "sigHeader": "Valikuline allkirjatõend",
-      "pubkeyLabel": "Esitage allkirjastatavasse stringi lisamiseks avalik võti",
+      "pubkeyLabel": "Sisestage allkirjastatavasse stringi lisamiseks avalik võti",
       "signedLabel": "Allkirjastage järgmine tekst ülaltoodud avaliku võtmega seotud privaatvõtmega",
       "signedPlaceholder": "tekst",
       "signatureLabel": "Esitage käsitsi arvutatud allkiri",
       "signaturePlaceholder": "allkiri",
       "cerHeader": "Põhivahetuskurss",
       "cerbaLabel": "Baassumma",
-      "cerbaIDLabel": "põhivara ID",
+      "cerbaIDLabel": "põhivara id",
       "cerqaLabel": "hinnapakkumise summa",
       "cerqaIDLabel": "hinnapakkumise vara ID",
       "permsHeader": "load",
@@ -135,7 +138,7 @@
       "readyHeader": "Valmis väljastama NFT-sid Bitsharesi plokiahelas!",
       "subHeader": "NFT väljastamise jätkamiseks täitke allolev vorm.",
       "issueHeader": "Varade väljastamise vorm",
-      "issuerLabel": "Bitsharesi konto, mida kasutatakse NFT emiteerimiseks",
+      "issuerLabel": "NFT emissiooniks kasutatav bitsharesi konto",
       "assetID": "NFT vara ID",
       "quantity": "Väljastatava NFT kogus",
       "target": "Sihtkonto, millele NFT väljastada",

diff --git a/public/locales/fr/blockchain.json b/public/locales/fr/blockchain.json
@@ -8,7 +8,10 @@
     "noResultsHeader": "Aucun actif émis trouvé",
     "noResultsDesc": "Ce compte Bitshares n'a émis aucun NFT sur le BTS DEX.",
     "notice": "Remarque : L'achat et la possession d'un NFT sur le BTS DEX ne vous accordent pas automatiquement les droits d'édition NFT.",
-    "selection": "Sélectionnez le NFT que vous souhaitez modifier",
+    "selection": {
+      "edit": "Sélectionnez le NFT que vous souhaitez modifier",
+      "issue": "Sélectionnez le NFT que vous souhaitez émettre"
+    },
     "back": "Retourner",
     "refresh": "Rafraîchir",
     "nonNFT1": "Les actifs suivants ne sont pas encore des NFT",

diff --git a/public/locales/it/blockchain.json b/public/locales/it/blockchain.json
@@ -8,7 +8,10 @@
     "noResultsHeader": "Nessun asset emesso trovato",
     "noResultsDesc": "Questo account Bitshares non ha emesso alcun NFT sul BTS DEX.",
     "notice": "Nota: l'acquisto e il possesso di un NFT su BTS DEX non ti garantisce automaticamente i diritti di modifica NFT.",
-    "selection": "Seleziona l'NFT che desideri modificare",
+    "selection": {
+      "edit": "Seleziona l'NFT che desideri modificare",
+      "issue": "Seleziona l'NFT che desideri emettere"
+    },
     "back": "Torna indietro",
     "refresh": "ricaricare",
     "nonNFT1": "I seguenti asset non sono ancora NFT",
@@ -56,7 +59,7 @@
       "marketLabel": "Mercato",
       "marketPlaceholder": "Attività di trading primaria, ad es. ",
       "msLabel": "Massima offerta",
-      "precisionLabel": "Precisione asset (cifre decimali)",
+      "precisionLabel": "Precisione dell'asset (cifre decimali)",
       "nftHeader": "Dettagli NFT",
       "titleLabel": "Titolo NFT",
       "titlePlaceholder": "Titolo NFT",
@@ -88,7 +91,7 @@
       "cerqaLabel": "importo del preventivo",
       "cerqaIDLabel": "ID risorsa quotazione",
       "permsHeader": "Autorizzazioni",
-      "permsSubHeader": "Nota: la disabilitazione delle autorizzazioni è una decisione permanente.",
+      "permsSubHeader": "Nota: la disabilitazione delle autorizzazioni è una decisione definitiva.",
       "disabledCMFPerm": "L'autorizzazione charge_market_fee è stata disabilitata in modo permanente.",
       "cmfPLabel": "Abilita commissione di mercato (charge_market_fee)",
       "disabledWL": "L'autorizzazione white_list è stata disabilitata in modo permanente.",

diff --git a/public/locales/ja/blockchain.json b/public/locales/ja/blockchain.json
@@ -8,7 +8,10 @@
     "noResultsHeader": "発行済み資産が見つかりません",
     "noResultsDesc": "この Bitshares アカウントは BTS DEX で NFT を発行していません。",
     "notice": "注: BTS DEX で NFT を購入して所有しても、NFT 編集権限は自動的に付与されません。",
-    "selection": "編集したいNFTを選択します",
+    "selection": {
+      "edit": "編集したいNFTを選択します",
+      "issue": "発行したいNFTを選択します"
+    },
     "back": "戻る",
     "refresh": "リフレッシュ",
     "nonNFT1": "以下のアセットはまだNFT化されていません",

diff --git a/public/locales/ko/blockchain.json b/public/locales/ko/blockchain.json
@@ -8,7 +8,10 @@
     "noResultsHeader": "발행된 자산이 없습니다.",
     "noResultsDesc": "이 Bitshares 계정은 BTS DEX에서 NFT를 발행하지 않았습니다.",
     "notice": "참고: BTS DEX에서 NFT를 구매하고 소유한다고 해서 자동으로 NFT 편집 권한이 부여되는 것은 아닙니다.",
-    "selection": "편집하려는 NFT를 선택합니다.",
+    "selection": {
+      "edit": "편집하려는 NFT를 선택합니다.",
+      "issue": "발행하려는 NFT를 선택하십시오"
+    },
     "back": "돌아가기",
     "refresh": "새로 고치다",
     "nonNFT1": "다음 자산은 아직 NFT가 아닙니다.",

diff --git a/public/locales/pt/blockchain.json b/public/locales/pt/blockchain.json
@@ -1,14 +1,17 @@
 {
   "accountSearch": {
-    "inputPrompt": "Insira o ID/nome da sua conta blockchain para continuar"
+    "inputPrompt": "Insira o ID/nome da sua conta blockchain para prosseguir"
   },
   "selectAsset": {
     "lookup": "Ativos de pesquisa emitidos por um usuário",
     "fetching": "Recuperando informações em sua conta Bitshares",
     "noResultsHeader": "Nenhum ativo emitido encontrado",
     "noResultsDesc": "Esta conta Bitshares não emitiu NFTs no BTS DEX.",
     "notice": "Nota: Comprar e possuir um NFT no BTS DEX não concede automaticamente a você direitos de edição de NFT.",
-    "selection": "Selecione a NFT que deseja editar",
+    "selection": {
+      "edit": "Selecione a NFT que deseja editar",
+      "issue": "Selecione a NFT que deseja emitir"
+    },
     "back": "Volte",
     "refresh": "Atualizar",
     "nonNFT1": "Os seguintes ativos ainda não são NFTs",
@@ -20,7 +23,7 @@
     "noAccount": "Essa conta não foi encontrada, verifique a entrada e tente novamente.",
     "searchResults": "Procurar Resultados",
     "loading": "Carregando...",
-    "invalidID": "ID de conta inválido - Deve começar com '1.2.' ",
+    "invalidID": "ID de conta inválida - Deve começar com '1.2.' ",
     "accountID": "ID da conta (por exemplo, 1.2.0)",
     "existingID": "Prossiga com um ID de conta existente da conta Beet vinculada?",
     "beetReq": "Buscar ID da conta da carteira Beet",
@@ -29,7 +32,7 @@
   "loadAsset": {
     "noHeader": "nada para editar",
     "noSubHeader": "Você ainda não salvou nenhum rascunho de NFT.",
-    "draftHeader": "Selecione o rascunho NFT que deseja editar",
+    "draftHeader": "Selecione o rascunho de NFT que deseja editar",
     "back": "Volte"
   },
   "wizard": {
@@ -44,7 +47,7 @@
       "poolTip": "Lembre-se também de retirar o pool de taxas do NFT após a criação.",
       "spec": "Especificação BTS NFT",
       "imgHeader": "Detalhes da imagem",
-      "qtyImages": "Este NFT contém atualmente o seguinte {{qty}} imagens:",
+      "qtyImages": "Este NFT atualmente contém o seguinte {{qty}} imagens:",
       "changeImages": "Alterar imagens",
       "issuerLabel": "Conta Bitshares usada para emissão de NFT",
       "symbolLabel": "símbolo de ativo",
@@ -54,7 +57,7 @@
       "snLabel": "Nome curto",
       "snPlaceholder": "Nome abreviado para DEX",
       "marketLabel": "Mercado",
-      "marketPlaceholder": "Ativo comercial primário, por exemplo ",
+      "marketPlaceholder": "Ativo de negociação primário, por exemplo ",
       "msLabel": "Fornecimento máximo",
       "precisionLabel": "Precisão do ativo (casas decimais)",
       "nftHeader": "detalhes NFT",
@@ -69,7 +72,7 @@
       "typeLabel": "tipo NFT",
       "typePlaceholder": "NFT/ARTE/VISUAL",
       "attestationLabel": "atestado NFT",
-      "attestationPlaceholder": "Um atestado referente a esta NFT",
+      "attestationPlaceholder": "Um atestado sobre esta NFT",
       "ackLabel": "Reconhecimentos NFT",
       "ackPlaceholder": "Quaisquer agradecimentos que você tenha que fazer",
       "holderLicenceLabel": "Licença de titulares de NFT",
@@ -86,7 +89,7 @@
       "cerbaLabel": "Valor base",
       "cerbaIDLabel": "ID do recurso básico",
       "cerqaLabel": "valor da cotação",
-      "cerqaIDLabel": "cotar id do ativo",
+      "cerqaIDLabel": "cotar ID do recurso",
       "permsHeader": "Permissões",
       "permsSubHeader": "Observação: desabilitar permissões é uma decisão permanente.",
       "disabledCMFPerm": "A permissão charge_market_fee foi desativada permanentemente.",
@@ -131,7 +134,7 @@
       "header": "Para emitir esta NFT, abra a carteira Beet e digitalize o código QR abaixo.",
       "back": "Volte",
       "progress": "Por favor, aguarde...",
-      "success": "Sua NFT foi emitida com sucesso no {{network}} blockchain!",
+      "success": "Emitiu com sucesso sua NFT no {{network}} blockchain!",
       "readyHeader": "Pronto para emitir NFTs na blockchain Bitshares!",
       "subHeader": "Preencha o formulário abaixo para prosseguir com a emissão da NFT.",
       "issueHeader": "Formulário de emissão de ativos",

diff --git a/public/locales/th/blockchain.json b/public/locales/th/blockchain.json
@@ -8,7 +8,10 @@
     "noResultsHeader": "ไม่พบสินทรัพย์ที่ออก",
     "noResultsDesc": "บัญชี Bitshares นี้ไม่ได้ออก NFT ใดๆ บน BTS DEX",
     "notice": "หมายเหตุ: การซื้อและเป็นเจ้าของ NFT บน BTS DEX ไม่ได้ให้สิทธิ์ในการแก้ไข NFT แก่คุณโดยอัตโนมัติ",
-    "selection": "เลือก NFT ที่คุณต้องการแก้ไข",
+    "selection": {
+      "edit": "เลือก NFT ที่คุณต้องการแก้ไข",
+      "issue": "เลือก NFT ที่คุณต้องการออก"
+    },
     "back": "กลับไป",
     "refresh": "รีเฟรช",
     "nonNFT1": "เนื้อหาต่อไปนี้ยังไม่ใช่ NFT",
@@ -78,7 +81,7 @@
       "licensePlaceholder": "ใบอนุญาต",
       "sigHeader": "หลักฐานลายเซ็นเพิ่มเติม",
       "pubkeyLabel": "ระบุรหัสสาธารณะเพื่อรวมไว้ในสตริงที่ลงนาม",
-      "signedLabel": "ลงนามข้อความต่อไปนี้ด้วยรหัสส่วนตัวที่เกี่ยวข้องกับรหัสสาธารณะข้างต้น",
+      "signedLabel": "ลงชื่อข้อความต่อไปนี้ด้วยคีย์ส่วนตัวที่เกี่ยวข้องกับคีย์สาธารณะด้านบน",
       "signedPlaceholder": "ข้อความ",
       "signatureLabel": "ระบุลายเซ็นที่คำนวณด้วยตนเอง",
       "signaturePlaceholder": "ลายเซ็น",

diff --git a/src/App.jsx b/src/App.jsx
@@ -44,7 +44,6 @@ import Create from './pages/Create';
 import Edit from './pages/Edit';
 import Load from './pages/Load';
 import Issue from './pages/Issue';
-import Settings from './pages/Settings';
 
 import './App.css';
 
@@ -53,14 +52,8 @@ import './App.css';
  * @param {String} loc
  */
 function openURL(loc) {
-  if (loc === 'gallery') {
-    window.electron.openURL('gallery');
-  } else if (loc === 'viewer') {
-    window.electron.openURL('viewer');
-  } else if (loc === 'airdrop') {
-    window.electron.openURL('airdrop');
-  } else if (loc === 'beet') {
-    window.electron.openURL('beet');
+  if (['gallery', 'viewer', 'airdrop', 'beet'].includes(loc)) {
+    window.electron.openURL(loc);
   }
 }
 
@@ -243,7 +236,6 @@ function App() {
                 <Route path="/upgrade" element={<Upgrade />} />
                 <Route path="/faq" element={<Faq />} />
                 <Route path="/nodes" element={<Nodes />} />
-                <Route path="/settings" element={<Settings />} />
               </Routes>
             </Col>
 
@@ -290,18 +282,6 @@ function App() {
                 >
                   NFT Viewer
                 </Button>
-                {environment ? (
-                  <Link style={{ textDecoration: 'none' }} to="/settings">
-                    <Button
-                      variant="outline"
-                      color="dark"
-                      sx={{ marginTop: '15px', marginRight: '5px', marginBottom: '5px' }}
-                      href="/settings"
-                    >
-                      {t('setup:settings.settings')}
-                    </Button>
-                  </Link>
-                ) : null}
               </span>
             </Col>
           </Grid>

diff --git a/src/components/beet/BeetLink.jsx b/src/components/beet/BeetLink.jsx
@@ -5,7 +5,7 @@ import {
 } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
 
-import { appStore, beetStore, identitiesStore } from '../../lib/states';
+import { appStore, beetStore, tempStore, identitiesStore } from '../../lib/states';
 
 export default function BeetLink(properties) {
   const { t, i18n } = useTranslation();
@@ -15,6 +15,8 @@ export default function BeetLink(properties) {
   const setConnection = beetStore((state) => state.setConnection);
   const setAuthenticated = beetStore((state) => state.setAuthenticated);
 
+  const setAccountType = tempStore((state) => state.setAccountType);
+
   const [inProgress, setInProgress] = useState(false);
   /*
    * After connection attempt to link app to Beet client
@@ -68,6 +70,7 @@ export default function BeetLink(properties) {
               onClick={() => {
                 setConnection();
                 setAuthenticated();
+                setAccountType();
               }}
             >
               {t('beet:beetlink.backButton')}

diff --git a/src/components/beet/BeetModal.jsx b/src/components/beet/BeetModal.jsx
@@ -7,10 +7,8 @@ import {
   Accordion,
   JsonInput,
   Modal,
-  Select,
   Button,
   Group,
-  ColorInput,
 } from '@mantine/core';
 import { useDisclosure } from '@mantine/hooks';
 import { useParams } from "react-router-dom";