diff --git a/src/assets/images/check-mark.svg b/src/assets/images/check-mark.svg new file mode 100644 index 00000000..c4e2fef1 --- /dev/null +++ b/src/assets/images/check-mark.svg @@ -0,0 +1,14 @@ + diff --git a/src/assets/images/puzzle-piece-1-outline.svg b/src/assets/images/puzzle-piece-1-outline.svg new file mode 100644 index 00000000..00b3917c --- /dev/null +++ b/src/assets/images/puzzle-piece-1-outline.svg @@ -0,0 +1,7 @@ + diff --git a/src/assets/images/puzzle-piece-1.svg b/src/assets/images/puzzle-piece-1.svg new file mode 100644 index 00000000..d3c8217a --- /dev/null +++ b/src/assets/images/puzzle-piece-1.svg @@ -0,0 +1,7 @@ + diff --git a/src/components/SendTransaction.vue b/src/components/SendTransaction.vue index 1d2db699..2bb0c349 100644 --- a/src/components/SendTransaction.vue +++ b/src/components/SendTransaction.vue @@ -8,6 +8,7 @@ import AppLoader from '@/components/AppLoader.vue' import GasPrice from '@/components/GasPrice.vue' import SendTransactionCompact from '@/components/SendTransactionCompact.vue' import SignMessageAdvancedInfo from '@/components/signMessageAdvancedInfo.vue' +import SlideToSolvePuzzle from '@/components/SlideToSolvePuzzle.vue' import { useAppStore } from '@/store/app' import useCurrencyStore from '@/store/currencies' import { useRequestStore } from '@/store/request' @@ -55,50 +56,58 @@ function hideLoader() { onMounted(async () => { showLoader('Loading...') - try { - const accountHandler = getRequestHandler().getAccountHandler() - if (appStore.chainType === ChainType.solana_cv25519) { + const accountHandler = getRequestHandler().getAccountHandler() + if (appStore.chainType === ChainType.solana_cv25519) { + try { const data = await (accountHandler as SolanaAccountHandler).getFee( props.request.request.params[0] ) - } else { - const baseGasPrice = ( - await (accountHandler as EVMAccountHandler).provider.getGasPrice() - ).toString() + } catch (e) { + console.error(e) + } + } else { + try { gasLimit.value = ( await (accountHandler as EVMAccountHandler).provider.estimateGas({ ...sanitizeRequest(props.request.request).params[0], }) ).toString() - baseFee.value = new Decimal(baseGasPrice) - .div(Decimal.pow(10, 9)) - .toString() + } catch (e) { + gasLimit.value = '21000' // default value for ethereum } - if (props.request.request.params[0].maxFeePerGas) { - customGasPrice.value.maxFeePerGas = new Decimal( - props.request.request.params[0].maxFeePerGas - ) - .div(Decimal.pow(10, 9)) - .toString() - } else { - customGasPrice.value.maxFeePerGas = new Decimal(baseFee.value) - .add(1.5) - .toString() - } - if (props.request.request.params[0].maxPriorityFeePerGas) { - customGasPrice.value.maxPriorityFeePerGas = new Decimal( - props.request.request.params[0].maxPriorityFeePerGas - ) + try { + const baseGasPrice = ( + await (accountHandler as EVMAccountHandler).provider.getGasPrice() + ).toString() + baseFee.value = new Decimal(baseGasPrice) .div(Decimal.pow(10, 9)) .toString() + if (props.request.request.params[0].maxFeePerGas) { + customGasPrice.value.maxFeePerGas = new Decimal( + props.request.request.params[0].maxFeePerGas + ) + .div(Decimal.pow(10, 9)) + .toString() + } else { + customGasPrice.value.maxFeePerGas = new Decimal(baseFee.value) + .add(1.5) + .toString() + } + if (props.request.request.params[0].maxPriorityFeePerGas) { + customGasPrice.value.maxPriorityFeePerGas = new Decimal( + props.request.request.params[0].maxPriorityFeePerGas + ) + .div(Decimal.pow(10, 9)) + .toString() + } + customGasPrice.value.gasLimit = + props.request.request.params[0].gasLimit || gasLimit.value + handleSetGasPrice(customGasPrice.value) + } catch (err) { + console.log({ err }) + } finally { + hideLoader() } - customGasPrice.value.gasLimit = - props.request.request.params[0].gasLimit || gasLimit.value - handleSetGasPrice(customGasPrice.value) - } catch (err) { - console.log({ err }) - } finally { - hideLoader() } }) @@ -299,14 +308,7 @@ function calculateCurrencyValue(value) { v-if="route.name !== 'PermissionRequest'" class="mt-auto flex flex-col gap-4" > -
The following screens will help you understand the main functionalities
diff --git a/src/pages/StarterTips/page-2.vue b/src/pages/StarterTips/page-2.vue
index 5ec1bf2b..6d98f4c8 100644
--- a/src/pages/StarterTips/page-2.vue
+++ b/src/pages/StarterTips/page-2.vue
@@ -1,11 +1,9 @@
-
@@ -15,7 +15,7 @@ const dots = [1, 2, 3, 4]
v-for="dot in dots"
:key="dot"
class="block h-[5px] w-[5px] rounded-full"
- :class="dot === 2 ? 'bg-[#FFFFFF]' : 'bg-[#8D8D8D]'"
+ :class="dot === 4 ? 'bg-[#FFFFFF]' : 'bg-[#8D8D8D]'"
>
Should you ever need to switch to a different Web3 wallet, you can
@@ -17,10 +17,9 @@ const dots = [1, 2, 3, 4]
v-for="dot in dots"
:key="dot"
class="block h-[5px] w-[5px] rounded-full"
- :class="dot === 3 ? 'bg-[#FFFFFF]' : 'bg-[#8D8D8D]'"
+ :class="dot === 5 ? 'bg-[#FFFFFF]' : 'bg-[#8D8D8D]'"
>
Digital Collectibles Support
Freedom Above All Else