Skip to content

Commit

Permalink
Improvements and fixes
Browse files Browse the repository at this point in the history
Improve UX
Improve optional signature element
Parse additional file types on asset load
Set default memo for non beet mode
Fix nft creation & updates
  • Loading branch information
grctest committed Jun 10, 2023
1 parent 64cbaa9 commit d64e25f
Show file tree
Hide file tree
Showing 20 changed files with 903 additions and 804 deletions.
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
"react-dom": "^18.2.0",
"react-i18next": "^12.3.1",
"react-icons": "^4.9.0",
"react-qrcode-logo": "^2.9.0",
"simple-websocket": "^9.1.0",
"stream-browserify": "^3.0.0",
"util": "^0.12.5",
Expand Down
11 changes: 6 additions & 5 deletions public/locales/da/blockchain.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,10 @@
"licenseLabel": "NFT-licens",
"licensePlaceholder": "Licens",
"sigHeader": "Valgfri signaturbevis",
"signedLabel": "Signeret tekst",
"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",
"signedPlaceholder": "tekst",
"signatureLabel": "Beregnet signatur",
"signatureLabel": "Angiv den manuelt beregnede signatur",
"signaturePlaceholder": "Underskrift",
"cerHeader": "Kernekurs",
"cerbaLabel": "Grundbeløb",
Expand Down Expand Up @@ -118,11 +119,11 @@
"broadcastActionUpdate": "opdateret"
},
"choice": "Hvordan vil du gå videre?",
"confirmation": "Airdrop JSON genereret",
"confirmation": "JSON genereret",
"download1": "1. Start BEET-pungen og naviger til 'Lokal' i menuen.",
"download2": "2. Fra BEET Local-siden skal du uploade følgende JSON-fil, en prompt skulle vises.",
"download3": "3. Bekræft promptens indhold, før du godkender airdrop.",
"downloadButton": "Download airdrop JSON"
"download3": "3. Bekræft promptens indhold, før du godkender handlingen.",
"downloadButton": "Download JSON-fil"
},
"issueNFT": {
"form": {
Expand Down
11 changes: 6 additions & 5 deletions public/locales/de/blockchain.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,10 @@
"licenseLabel": "NFT-Lizenz",
"licensePlaceholder": "Lizenz",
"sigHeader": "Optionaler Signaturnachweis",
"signedLabel": "Signierter Text",
"pubkeyLabel": "Geben Sie einen öffentlichen Schlüssel zur Aufnahme in die zu signierende Zeichenfolge an",
"signedLabel": "Signieren Sie den folgenden Text mit dem privaten Schlüssel, der dem oben genannten öffentlichen Schlüssel zugeordnet ist",
"signedPlaceholder": "Text",
"signatureLabel": "Berechnete Signatur",
"signatureLabel": "Geben Sie die manuell berechnete Signatur an",
"signaturePlaceholder": "Unterschrift",
"cerHeader": "Kernwechselkurs",
"cerbaLabel": "Grundbetrag",
Expand Down Expand Up @@ -118,11 +119,11 @@
"broadcastActionUpdate": "Aktualisiert"
},
"choice": "Wie wollen Sie fortfahren?",
"confirmation": "Airdrop JSON generiert",
"confirmation": "JSON generiert",
"download1": "1. Starten Sie die BEET-Wallet und navigieren Sie im Menü zu „Lokal“.",
"download2": "2. Laden Sie auf der BEET Local-Seite die folgende JSON-Datei hoch. Es sollte eine Eingabeaufforderung angezeigt werden.",
"download3": "3. Überprüfen Sie den Inhalt der Eingabeaufforderung, bevor Sie den Airdrop genehmigen.",
"downloadButton": "Laden Sie Airdrop JSON herunter"
"download3": "3. Überprüfen Sie den Inhalt der Eingabeaufforderung, bevor Sie den Vorgang genehmigen.",
"downloadButton": "Laden Sie die JSON-Datei herunter"
},
"issueNFT": {
"form": {
Expand Down
11 changes: 6 additions & 5 deletions public/locales/en/blockchain.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,10 @@
"licenseLabel": "NFT license",
"licensePlaceholder": "License",
"sigHeader": "Optional signature proof",
"signedLabel": "Signed text",
"pubkeyLabel": "Provide a public key for inclusion in the string being signed",
"signedLabel": "Sign the following text with the private key associated with the above public key",
"signedPlaceholder": "text",
"signatureLabel": "Computed signature",
"signatureLabel": "Provide the manually computed signature",
"signaturePlaceholder": "signature",
"cerHeader": "Core Exchange Rate",
"cerbaLabel": "Base amount",
Expand Down Expand Up @@ -118,11 +119,11 @@
"broadcastActionUpdate": "updated"
},
"choice": "How do you want to proceed?",
"confirmation": "Airdrop JSON generated",
"confirmation": "JSON generated",
"download1": "1. Launch the BEET wallet and navigate to 'Local' in the menu.",
"download2": "2. From the BEET Local page, upload the following JSON file, a prompt should appear.",
"download3": "3. Verify the prompt's contents before approving the airdrop.",
"downloadButton": "Download airdrop JSON"
"download3": "3. Verify the prompt's contents before approving the operation.",
"downloadButton": "Download JSON file"
},
"issueNFT": {
"form": {
Expand Down
11 changes: 6 additions & 5 deletions public/locales/es/blockchain.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,10 @@
"licenseLabel": "licencia NFT",
"licensePlaceholder": "Licencia",
"sigHeader": "Prueba de firma opcional",
"signedLabel": "Texto firmado",
"pubkeyLabel": "Proporcione una clave pública para incluirla en la cadena que se está firmando",
"signedLabel": "Firme el siguiente texto con la clave privada asociada a la clave pública anterior",
"signedPlaceholder": "texto",
"signatureLabel": "Firma computada",
"signatureLabel": "Proporcione la firma calculada manualmente",
"signaturePlaceholder": "firma",
"cerHeader": "Tipo de cambio básico",
"cerbaLabel": "Cantidad base",
Expand Down Expand Up @@ -118,11 +119,11 @@
"broadcastActionUpdate": "actualizado"
},
"choice": "¿Como quieres proceder?",
"confirmation": "Airdrop JSON generado",
"confirmation": "JSON generado",
"download1": "1. Inicie la billetera BEET y navegue hasta 'Local' en el menú.",
"download2": "2. Desde la página local de BEET, cargue el siguiente archivo JSON, debería aparecer un aviso.",
"download3": "3. Verifique el contenido del aviso antes de aprobar el airdrop.",
"downloadButton": "Descargar airdrop JSON"
"download3": "3. Verifique el contenido del aviso antes de aprobar la operación.",
"downloadButton": "Descargar archivo JSON"
},
"issueNFT": {
"form": {
Expand Down
11 changes: 6 additions & 5 deletions public/locales/et/blockchain.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,10 @@
"licenseLabel": "NFT litsents",
"licensePlaceholder": "Litsents",
"sigHeader": "Valikuline allkirjatõend",
"signedLabel": "Signeeritud tekst",
"pubkeyLabel": "Esitage allkirjastatavasse stringi lisamiseks avalik võti",
"signedLabel": "Allkirjastage järgmine tekst ülaltoodud avaliku võtmega seotud privaatvõtmega",
"signedPlaceholder": "tekst",
"signatureLabel": "Arvutatud allkiri",
"signatureLabel": "Esitage käsitsi arvutatud allkiri",
"signaturePlaceholder": "allkiri",
"cerHeader": "Põhivahetuskurss",
"cerbaLabel": "Baassumma",
Expand Down Expand Up @@ -118,11 +119,11 @@
"broadcastActionUpdate": "uuendatud"
},
"choice": "Kuidas soovite edasi minna?",
"confirmation": "Loodi Airdrop JSON",
"confirmation": "JSON loodud",
"download1": "1. Käivitage BEET rahakott ja navigeerige menüüs jaotisse „Kohalik”.",
"download2": "2. Laadige lehelt BEET Local üles järgmine JSON-fail, peaks ilmuma viip.",
"download3": "3. Kontrollige enne õhulanguse kinnitamist viipa sisu.",
"downloadButton": "Laadige alla airdrop JSON"
"download3": "3. Enne toimingu kinnitamist kontrollige viipa sisu.",
"downloadButton": "Laadige alla JSON-fail"
},
"issueNFT": {
"form": {
Expand Down
11 changes: 6 additions & 5 deletions public/locales/fr/blockchain.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,10 @@
"licenseLabel": "Licence NFT",
"licensePlaceholder": "Licence",
"sigHeader": "Preuve de signature facultative",
"signedLabel": "Texte signé",
"pubkeyLabel": "Fournir une clé publique à inclure dans la chaîne en cours de signature",
"signedLabel": "Signez le texte suivant avec la clé privée associée à la clé publique ci-dessus",
"signedPlaceholder": "texte",
"signatureLabel": "Signature calculée",
"signatureLabel": "Fournir la signature calculée manuellement",
"signaturePlaceholder": "signature",
"cerHeader": "Taux de change de base",
"cerbaLabel": "Montant de base",
Expand Down Expand Up @@ -118,11 +119,11 @@
"broadcastActionUpdate": "mis à jour"
},
"choice": "Comment veux-tu procéder?",
"confirmation": "Airdrop JSON généré",
"confirmation": "JSON généré",
"download1": "1. Lancez le portefeuille BEET et accédez à \"Local\" dans le menu.",
"download2": "2. À partir de la page BEET Local, téléchargez le fichier JSON suivant, une invite devrait apparaître.",
"download3": "3. Vérifiez le contenu de l'invite avant d'approuver le parachutage.",
"downloadButton": "Télécharger airdrop JSON"
"download3": "3. Vérifiez le contenu de l'invite avant d'approuver l'opération.",
"downloadButton": "Télécharger le fichier JSON"
},
"issueNFT": {
"form": {
Expand Down
11 changes: 6 additions & 5 deletions public/locales/it/blockchain.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,10 @@
"licenseLabel": "Licenza NFT",
"licensePlaceholder": "Licenza",
"sigHeader": "Prova di firma facoltativa",
"signedLabel": "Testo firmato",
"pubkeyLabel": "Fornire una chiave pubblica da includere nella stringa da firmare",
"signedLabel": "Firma il seguente testo con la chiave privata associata alla chiave pubblica di cui sopra",
"signedPlaceholder": "testo",
"signatureLabel": "Firma calcolata",
"signatureLabel": "Fornire la firma calcolata manualmente",
"signaturePlaceholder": "firma",
"cerHeader": "Tasso di cambio principale",
"cerbaLabel": "Importo base",
Expand Down Expand Up @@ -118,11 +119,11 @@
"broadcastActionUpdate": "aggiornato"
},
"choice": "Come vuoi procedere?",
"confirmation": "Airdrop JSON generato",
"confirmation": "JSON generato",
"download1": "1. Avvia il portafoglio BEET e vai a \"Locale\" nel menu.",
"download2": "2. Dalla pagina BEET Local, carica il seguente file JSON, dovrebbe apparire un prompt.",
"download3": "3. Verificare il contenuto del prompt prima di approvare l'airdrop.",
"downloadButton": "Scarica airdrop JSON"
"download3": "3. Verificare il contenuto del prompt prima di approvare l'operazione.",
"downloadButton": "Scarica il file JSON"
},
"issueNFT": {
"form": {
Expand Down
11 changes: 6 additions & 5 deletions public/locales/ja/blockchain.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,10 @@
"licenseLabel": "NFTライセンス",
"licensePlaceholder": "ライセンス",
"sigHeader": "オプションの署名証明",
"signedLabel": "署名付きテキスト",
"pubkeyLabel": "署名される文字列に含める公開キーを提供します",
"signedLabel": "上記の公開鍵に関連付けられた秘密鍵を使用して、次のテキストに署名します。",
"signedPlaceholder": "文章",
"signatureLabel": "計算された署名",
"signatureLabel": "手動で計算された署名を提供します",
"signaturePlaceholder": "サイン",
"cerHeader": "コア為替レート",
"cerbaLabel": "基本額",
Expand Down Expand Up @@ -118,11 +119,11 @@
"broadcastActionUpdate": "更新しました"
},
"choice": "どのように進めたいですか?",
"confirmation": "Airdrop JSON が生成されました",
"confirmation": "JSON が生成されました",
"download1": "1. BEET ウォレットを起動し、メニューの「ローカル」に移動します。",
"download2": "2. BEET ローカル ページから次の JSON ファイルをアップロードすると、プロンプトが表示されます。",
"download3": "3. エアドロップを承認する前に、プロンプトの内容を確認します。",
"downloadButton": "エアドロップ JSON をダウンロード"
"download3": "3. 操作を承認する前に、プロンプトの内容を確認します。",
"downloadButton": "JSONファイルをダウンロード"
},
"issueNFT": {
"form": {
Expand Down
11 changes: 6 additions & 5 deletions public/locales/ko/blockchain.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,10 @@
"licenseLabel": "NFT 라이선스",
"licensePlaceholder": "특허",
"sigHeader": "선택적 서명 증명",
"signedLabel": "서명된 텍스트",
"pubkeyLabel": "서명 중인 문자열에 포함할 공개 키를 제공하십시오.",
"signedLabel": "위의 공개 키와 연결된 개인 키로 다음 텍스트에 서명하십시오.",
"signedPlaceholder": "텍스트",
"signatureLabel": "계산된 서명",
"signatureLabel": "수동으로 계산된 서명 제공",
"signaturePlaceholder": "서명",
"cerHeader": "핵심환율",
"cerbaLabel": "기본 금액",
Expand Down Expand Up @@ -118,11 +119,11 @@
"broadcastActionUpdate": "업데이트"
},
"choice": "어떻게 진행하시겠습니까?",
"confirmation": "에어드롭 JSON 생성",
"confirmation": "JSON 생성",
"download1": "1. BEET 지갑을 실행하고 메뉴에서 '로컬'로 이동합니다.",
"download2": "2. BEET 로컬 페이지에서 다음 JSON 파일을 업로드하면 프롬프트가 나타납니다.",
"download3": "3. 에어드롭을 승인하기 전에 프롬프트의 내용을 확인하십시오.",
"downloadButton": "에어드롭 JSON 다운로드"
"download3": "3. 작업을 승인하기 전에 프롬프트의 내용을 확인하십시오.",
"downloadButton": "JSON 파일 다운로드"
},
"issueNFT": {
"form": {
Expand Down
11 changes: 6 additions & 5 deletions public/locales/pt/blockchain.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,10 @@
"licenseLabel": "Licença NFT",
"licensePlaceholder": "Licença",
"sigHeader": "Prova de assinatura opcional",
"signedLabel": "texto assinado",
"pubkeyLabel": "Forneça uma chave pública para inclusão na string que está sendo assinada",
"signedLabel": "Assine o seguinte texto com a chave privada associada à chave pública acima",
"signedPlaceholder": "texto",
"signatureLabel": "Assinatura computada",
"signatureLabel": "Forneça a assinatura computada manualmente",
"signaturePlaceholder": "assinatura",
"cerHeader": "Taxa de Câmbio Central",
"cerbaLabel": "Valor base",
Expand Down Expand Up @@ -118,11 +119,11 @@
"broadcastActionUpdate": "Atualizada"
},
"choice": "Como você deseja proceder?",
"confirmation": "Airdrop JSON gerado",
"confirmation": "JSON gerado",
"download1": "1. Inicie a carteira BEET e navegue até 'Local' no menu.",
"download2": "2. Na página BEET Local, carregue o seguinte arquivo JSON, um prompt deve aparecer.",
"download3": "3. Verifique o conteúdo do prompt antes de aprovar o airdrop.",
"downloadButton": "Baixar airdrop JSON"
"download3": "3. Verifique o conteúdo do prompt antes de aprovar a operação.",
"downloadButton": "Baixar arquivo JSON"
},
"issueNFT": {
"form": {
Expand Down
11 changes: 6 additions & 5 deletions public/locales/th/blockchain.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,10 @@
"licenseLabel": "ใบอนุญาต NFT",
"licensePlaceholder": "ใบอนุญาต",
"sigHeader": "หลักฐานลายเซ็นเพิ่มเติม",
"signedLabel": "ข้อความที่ลงนาม",
"pubkeyLabel": "ระบุรหัสสาธารณะเพื่อรวมไว้ในสตริงที่ลงนาม",
"signedLabel": "ลงนามข้อความต่อไปนี้ด้วยรหัสส่วนตัวที่เกี่ยวข้องกับรหัสสาธารณะข้างต้น",
"signedPlaceholder": "ข้อความ",
"signatureLabel": "ลายเซ็นที่คำนวณได้",
"signatureLabel": "ระบุลายเซ็นที่คำนวณด้วยตนเอง",
"signaturePlaceholder": "ลายเซ็น",
"cerHeader": "อัตราแลกเปลี่ยนหลัก",
"cerbaLabel": "จำนวนฐาน",
Expand Down Expand Up @@ -118,11 +119,11 @@
"broadcastActionUpdate": "ปรับปรุง"
},
"choice": "คุณต้องการดำเนินการอย่างไร",
"confirmation": "สร้าง Airdrop JSON แล้ว",
"confirmation": "สร้าง JSON แล้ว",
"download1": "1. เปิด BEET wallet และไปที่ 'Local' ในเมนู",
"download2": "2. จากหน้า BEET Local ให้อัปโหลดไฟล์ JSON ต่อไปนี้ ข้อความแจ้งจะปรากฏขึ้น",
"download3": "3. ตรวจสอบเนื้อหาของพรอมต์ก่อนที่จะอนุมัติการออกอากาศ",
"downloadButton": "ดาวน์โหลด airdrop JSON"
"download3": "3. ตรวจสอบเนื้อหาของพรอมต์ก่อนที่จะอนุมัติการดำเนินการ",
"downloadButton": "ดาวน์โหลดไฟล์ JSON"
},
"issueNFT": {
"form": {
Expand Down
3 changes: 2 additions & 1 deletion src/components/beet/Connect.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export default function Connect(properties) {

const setMode = appStore((state) => state.setMode);
const setAccountType = appStore((state) => state.setAccountType);
const chosenAccountMemo = appStore((state) => state.setMode);

const environment = appStore((state) => state.environment);
const setEnvironment = appStore((state) => state.setEnvironment);
Expand Down Expand Up @@ -78,7 +79,7 @@ export default function Connect(properties) {
}

setIdentity(identity);
// setIsLinked(true);
chosenAccountMemo();
setIdentities(identity);
setInProgress(false);
}
Expand Down
3 changes: 3 additions & 0 deletions src/components/blockchain/AccountSearch.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ export default function AccountSearch(properties) {
const theme = useMantineTheme();

const setAccount = appStore((state) => state.setAccount);
const chosenAccountMemo = appStore((state) => state.chosenAccountMemo);

const nodes = appStore((state) => state.nodes);
const goBack = appStore((state) => state.back);

Expand Down Expand Up @@ -161,6 +163,7 @@ export default function AccountSearch(properties) {
key={`button.${result.name}`}
onClick={() => {
chosenAccount(result.id);
chosenAccountMemo(result.options.memo_key);
}}
>
{result.id}
Expand Down
Loading

0 comments on commit d64e25f

Please sign in to comment.