From a10036f6d8a8c8c42b10d8d2b52d8fe92a5a2c7f Mon Sep 17 00:00:00 2001 From: jojobyte <184880+jojobyte@users.noreply.github.com> Date: Fri, 15 Mar 2024 19:16:03 -0600 Subject: [PATCH 1/8] refactor: :coffin: remove unused imports from tx-info --- src/rigs/tx-info.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/rigs/tx-info.js b/src/rigs/tx-info.js index c0a3238..126aa58 100644 --- a/src/rigs/tx-info.js +++ b/src/rigs/tx-info.js @@ -1,10 +1,4 @@ import { lit as html } from '../helpers/lit.js' -import { qrSvg } from '../helpers/qr.js' -import { - setClipboard, - openBlobSVG, - generatePaymentRequestURI, -} from '../helpers/utils.js' export let txInfoRig = (async function (globals) { 'use strict'; From 871836fd452eb9cce7811ce402bbc267306312fe Mon Sep 17 00:00:00 2001 From: jojobyte <184880+jojobyte@users.noreply.github.com> Date: Fri, 15 Mar 2024 19:17:18 -0600 Subject: [PATCH 2/8] fix(data): :construction: partial fix for importing old out of date full wallet backups --- src/helpers/utils.js | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/helpers/utils.js b/src/helpers/utils.js index 6ed6abc..5a4c08c 100644 --- a/src/helpers/utils.js +++ b/src/helpers/utils.js @@ -1054,11 +1054,26 @@ export function getPartialHDPath(wallet) { ].join('/') } -export function getAddressIndexFromUsage(wallet, account, usage) { - let usageIndex = usage ?? wallet.usageIndex +export function getAddressIndexFromUsage(wallet, account, usageIdx) { + let usageIndex = usageIdx ?? wallet?.usageIndex ?? 0 + let addressIndex = account.usage?.[usageIndex] ?? account.addressIndex ?? 0 + let usage = account.usage ?? [ + account.addressIndex ?? 0, + 0 + ] + + // console.log( + // 'getAddressIndexFromUsage', + // usageIndex, + // addressIndex, + // account, + // usage, + // ) + return { ...account, + usage, usageIndex, - addressIndex: account.usage[usageIndex], + addressIndex, } } From 93a06def9e69a14e69326ccefb3c32366ca4dab8 Mon Sep 17 00:00:00 2001 From: jojobyte <184880+jojobyte@users.noreply.github.com> Date: Fri, 15 Mar 2024 19:19:51 -0600 Subject: [PATCH 3/8] feat(ui): :goal_net: add `showErrorDialog` to display errors --- src/main.js | 145 ++++++++++++++++++++++++++++++++---- src/rigs/confirm-action.js | 54 +++++++++----- src/rigs/send-or-request.js | 44 +++++++---- src/rigs/wallet-decrypt.js | 8 +- 4 files changed, 204 insertions(+), 47 deletions(-) diff --git a/src/main.js b/src/main.js index b3f0a79..a24131b 100644 --- a/src/main.js +++ b/src/main.js @@ -377,6 +377,13 @@ async function getUserInfo() { ([k,v]) => userInfo[k] = v ) }) + .catch(err => { + showErrorDialog({ + title: 'Unable to decrypt seed phrase', + msg: err, + showActBtn: false, + }) + }) } } @@ -428,6 +435,77 @@ function getTarget(event, selector) { return target } +async function showNotification({ + type = '', + title = '', + msg = '', + sticky = false, +}) { + console.log('notification', {type, title, msg, sticky}) +} + +async function showErrorDialog(options) { + let opts = { + type: 'warn', + title: '⚠️ Error', + msg: '', + showCancelBtn: true, + showActBtn: true, + // timeout: null, + ...options, + } + + if (opts.type === 'dang') { + console.error('showErrorDialog', opts.msg) + } else { + console.log('showErrorDialog', opts) + } + + await appDialogs.confirmAction?.render({ + name: opts.title, + actionTxt: 'Report Issue', + actionAlt: 'Report the error at GitHub', + action: 'lock', + cancelTxt: 'Close', + cancelAlt: `Close`, + // target: '', + // targetFallback: 'this wallet', + actionType: opts.type, + // action: 'disconnect', + // target: '', + // targetFallback: 'this wallet', + // actionType: 'dang', + showCancelBtn: opts.showCancelBtn, + showActBtn: opts.showActBtn, + submitIcon: state => `⚠️`, + alert: state => html``, + content: state => html` + ${state.header(state)} + +
+ + Looks like we encountered an error. + + 
${opts.msg}
+
+ + ${state.footer(state)} + `, + callback: () => { + let firstLineFromError = opts.msg.match(/[^\r\n]+/g)?.[0] + + // console.log('firstLineFromError', firstLineFromError) + + window.open( + `https://github.com/dashhive/wallet-ui/issues?q=${firstLineFromError}`, + '_blank', + ) + }, + }) + + return appDialogs.confirmAction?.showModal() +} + async function main() { appState.encryptionPassword = window.atob( sessionStorage.encryptionPassword || '' @@ -463,6 +541,11 @@ async function main() { } ) + appDialogs.confirmAction = await confirmActionRig({ + mainApp, setupDialog, + appDialogs, appState, appTools, + }) + appDialogs.walletEncrypt = await walletEncryptRig({ setupDialog, appDialogs, appState, mainApp, wallet, wallets, bodyNav, dashBalance, @@ -471,6 +554,7 @@ async function main() { appDialogs.walletDecrypt = await walletDecryptRig({ setupDialog, appDialogs, appState, mainApp, importFromJson, wallets, decryptKeystore, getUserInfo, store, deriveWalletData, + showErrorDialog, }) appDialogs.walletBackup = await walletBackupRig({ @@ -503,11 +587,6 @@ async function main() { mainApp, wallet, userInfo, contactsList, }) - appDialogs.confirmAction = await confirmActionRig({ - mainApp, setupDialog, - appDialogs, appState, appTools, - }) - appDialogs.confirmDelete = await confirmDeleteRig({ mainApp, setupDialog, appDialogs, appState, appTools, store, userInfo, contactsList, @@ -532,7 +611,7 @@ async function main() { mainApp, appDialogs, appState, appTools, store, wallet, account: appState.account, walletFunds, setupDialog, deriveWalletData, createTx, - getAddrsWithFunds, batchGenAcctAddrs, getUnusedChangeAddress, getAccountWallet, + getAddrsWithFunds, batchGenAcctAddrs, getUnusedChangeAddress, getAccountWallet, showErrorDialog, }) appDialogs.txInfo = await txInfoRig({ @@ -577,10 +656,15 @@ async function main() { ks, ) } catch(err) { - console.error( - '[fail] unable to decrypt seed phrase', - err - ) + // console.error( + // '[fail] unable to decrypt seed phrase', + // err + // ) + await showErrorDialog({ + title: 'Unable to decrypt seed phrase', + msg: err, + showActBtn: false, + }) sessionStorage.removeItem('encryptionPassword') } } @@ -743,7 +827,14 @@ async function main() { .then(funds => { console.log('updateAllFunds then funds', funds) }) - .catch(err => console.error('catch updateAllFunds', err, wallet)) + .catch(err => { + // console.error('catch updateAllFunds', err, wallet) + showNotification({ + type: 'error', + title: 'Update funds', + msg: err, + }) + }) }) }) @@ -940,10 +1031,22 @@ async function main() { // .then(funds => { // console.log('updateAllFunds then funds', funds) // }) - // .catch(err => console.error('catch updateAllFunds', err, wallet)) + // .catch(err => { + // // console.error('catch updateAllFunds', err, wallet) + // showNotification({ + // type: 'error', + // title: 'Update funds', + // msg: err, + // }) + // }) let storedAddrs = (await store.addresses.keys()) || [] + // showErrorDialog({ + // title: 'Test error', + // msg: err, + // }) + initDashSocket({ onMessage: async function (evname, data) { let updates = {} @@ -968,7 +1071,14 @@ async function main() { .then(funds => { console.log('updateAllFunds then funds', funds) }) - .catch(err => console.error('catch updateAllFunds', err, wallet)), + .catch(err => { + // console.error('catch updateAllFunds', err, wallet) + showNotification({ + type: 'error', + title: 'Update funds', + msg: err, + }) + }), 1000 ) } @@ -1127,7 +1237,14 @@ async function main() { .then(funds => { console.log('updateAllFunds then funds', funds) }) - .catch(err => console.error('catch updateAllFunds', err, wallet)), + .catch(err => { + // console.error('catch updateAllFunds', err, wallet) + showNotification({ + type: 'error', + title: 'Update funds', + msg: err, + }) + }), 1000 ) } diff --git a/src/rigs/confirm-action.js b/src/rigs/confirm-action.js index a7996ad..798390a 100644 --- a/src/rigs/confirm-action.js +++ b/src/rigs/confirm-action.js @@ -30,36 +30,52 @@ export let confirmActionRig = (async function (globals) { warn: 'outline brd-warn warn dark-hover bg-warn-hover', dang: 'outline brd-dang dang light-hover bg-dang-hover', }, + showCancelBtn: true, + showActBtn: true, // submitIcon: state => html` // // // // `, + cancelBtn: state => { + if (!state.showCancelBtn) { + return `` + } + + return html`` + }, + actionBtn: state => { + if (!state.showActBtn) { + return `` + } + + return html`` + }, submitIcon: state => `🔒`, footer: state => html` `, diff --git a/src/rigs/send-or-request.js b/src/rigs/send-or-request.js index ec876b5..fdd9e43 100644 --- a/src/rigs/send-or-request.js +++ b/src/rigs/send-or-request.js @@ -17,7 +17,7 @@ export let sendOrReceiveRig = (async function (globals) { let { mainApp, setupDialog, appDialogs, appState, appTools, store, createTx, deriveWalletData, getAddrsWithFunds, batchGenAcctAddrs, - wallet, wallets, accounts, walletFunds, getUnusedChangeAddress, getAccountWallet, + wallet, wallets, accounts, walletFunds, getUnusedChangeAddress, getAccountWallet, showErrorDialog, } = globals let sendOrReceive = await setupDialog( @@ -516,7 +516,15 @@ export let sendOrReceiveRig = (async function (globals) { address = to } - if (amount > 0 && walletFunds.balance < amount) { + let leftoverBalance = walletFunds.balance - amount + // let fullTransfer = leftoverBalance <= 0.0010_0200 + let fullTransfer = leftoverBalance <= 0.0001_0200 + + if ( + amount > 0 && + walletFunds.balance < amount && + !fullTransfer + ) { console.log( `INSUFFICIENT FUNDS IN WALLET`, [ @@ -591,18 +599,28 @@ export let sendOrReceiveRig = (async function (globals) { fundingAddrs = Object.values( fundingAddrs || {} ) - let leftoverBalance = walletFunds.balance - amount - // let fullTransfer = leftoverBalance <= 0.0010_0200 - let fullTransfer = leftoverBalance <= 0.0001_0200 - let { tx, changeAddr, fee } = await createTx( - state.wallet, - fundingAddrs, - [changeAddress], - address, - amount, - fullTransfer, - ) + let createdTx = {} + + try { + createdTx = await createTx( + state.wallet, + fundingAddrs, + [changeAddress], + address, + amount, + fullTransfer, + ) + } catch(err) { + await showErrorDialog({ + type: 'dang', + title: 'Failed to create transaction', + msg: err, + // showActBtn: false, + }) + } + + let { tx, changeAddr, fee } = createdTx let fullAmount = 0 diff --git a/src/rigs/wallet-decrypt.js b/src/rigs/wallet-decrypt.js index ee7b58f..b61ac18 100644 --- a/src/rigs/wallet-decrypt.js +++ b/src/rigs/wallet-decrypt.js @@ -13,6 +13,7 @@ export let walletDecryptRig = (async function (globals) { setupDialog, appDialogs, appState, mainApp, wallets, decryptKeystore, getUserInfo, store, deriveWalletData, importFromJson, + // showErrorDialog, } = globals; let walletDecrypt = await setupDialog( @@ -190,7 +191,12 @@ export let walletDecryptRig = (async function (globals) { state.elements.dialog.returnValue = String(fde.intent) } catch(err) { - console.error('[fail] unable to decrypt seed phrase', err) + console.warn('[fail] unable to decrypt seed phrase', err) + // await showErrorDialog({ + // title: 'Unable to decrypt seed phrase', + // msg: err, + // showActBtn: false, + // }) event.target.pass.setCustomValidity( 'Unable to decrypt seed phrase. Did you type the correct encryption password?' ) From ae18dc9f0387ede64b83d13d42b01fa5b9adcf89 Mon Sep 17 00:00:00 2001 From: jojobyte <184880+jojobyte@users.noreply.github.com> Date: Fri, 15 Mar 2024 19:28:02 -0600 Subject: [PATCH 4/8] docs(ui): :lipstick: change receive button to `Edit Amount or Contact` --- src/main.js | 2 +- src/rigs/send-or-request.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.js b/src/main.js index a24131b..cccf2b0 100644 --- a/src/main.js +++ b/src/main.js @@ -777,7 +777,7 @@ async function main() { await appDialogs.requestQr.render( { name: 'Share to receive funds', - submitTxt: `Select a Contact`, + submitTxt: `Edit Amount or Contact`, submitAlt: `Change the currently selected contact`, footer: state => html`