-
-
-
import { useVModel } from "@vueuse/core";
-import { defineComponent, PropType, reactive } from "vue";
+import { defineComponent, PropType, reactive, onMounted } from "vue";
import { useOperatingSystem, ANDROID, IOS } from "../../hooks/platform";
import Image from "./Image.vue";
-export interface Option {
+export type Option = {
name: string;
- iconLight: string;
- iconDark: string;
-}
+ iconLight: string | null;
+ iconDark: string | null;
+};
export default defineComponent({
name: "Select",
@@ -139,14 +139,18 @@ export default defineComponent({
},
emits: ["update:modelValue"],
setup(props, context) {
- const os = useOperatingSystem();
- const isMobile = os == ANDROID || os == IOS;
+ let isMobile = false;
+
+ onMounted(async () => {
+ const os = await useOperatingSystem();
+ isMobile = os == ANDROID || os == IOS;
+ });
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
const selected = useVModel(props, "modelValue", context.emit);
- let state = reactive({
+ const state = reactive({
indexOfSelected: 0,
open: false,
});
diff --git a/src/components/base/TextInput.vue b/src/components/base/TextInput.vue
index 074ec21f..adb6dc63 100644
--- a/src/components/base/TextInput.vue
+++ b/src/components/base/TextInput.vue
@@ -122,7 +122,7 @@ export default defineComponent({
isEyeOpen.value = !isEyeOpen.value;
}
- let numberOfChars = ref(0);
+ const numberOfChars = ref(0);
watch(
() => props.modelValue,
diff --git a/src/components/history/BalanceDetail.vue b/src/components/history/BalanceDetail.vue
index 904d160a..74e465e8 100644
--- a/src/components/history/BalanceDetail.vue
+++ b/src/components/history/BalanceDetail.vue
@@ -5,18 +5,18 @@
@@ -24,9 +24,10 @@
diff --git a/src/components/history/TransferDetail.vue b/src/components/history/TransferDetail.vue
deleted file mode 100644
index c5c5a4a9..00000000
--- a/src/components/history/TransferDetail.vue
+++ /dev/null
@@ -1,56 +0,0 @@
-
- = [
+ const actions: Array = [
{ label: "Edit", action: "edit", image: editImage },
{ label: "Remove", action: "remove", image: removeImage },
];
diff --git a/src/components/interface/AddEditModal.vue b/src/components/interface/AddEditModal.vue
index 0828295c..ddda0beb 100644
--- a/src/components/interface/AddEditModal.vue
+++ b/src/components/interface/AddEditModal.vue
@@ -59,22 +59,16 @@ export default defineComponent({
},
emits: ["close", "clickAdd", "update:to", "update:asset", "update:amount"],
setup(props, { emit }) {
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
- // @ts-ignore
const refTo = useVModel(props, "to", emit);
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
- // @ts-ignore
const refAsset = useVModel(props, "asset", emit);
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
- // @ts-ignore
const refAmount = useVModel(props, "amount", emit);
const title = computed(() =>
- props.type == "add" ? "Add Transfer" : "Edit Transfer"
+ props.type === "add" ? "Add Transfer" : "Edit Transfer"
);
const buttonName = computed(() =>
- props.type == "add" ? "Add" : "Save"
+ props.type === "add" ? "Add" : "Save"
);
return {
diff --git a/src/components/interface/AddTransferModal.vue b/src/components/interface/AddTransferModal.vue
index 33a1d3a5..a4da17d1 100644
--- a/src/components/interface/AddTransferModal.vue
+++ b/src/components/interface/AddTransferModal.vue
@@ -7,15 +7,14 @@
>
@@ -37,50 +32,42 @@
diff --git a/src/components/interface/Transactions.vue b/src/components/interface/Transactions.vue
index 603dd9bc..2a5a2bfa 100644
--- a/src/components/interface/Transactions.vue
+++ b/src/components/interface/Transactions.vue
@@ -11,307 +11,55 @@
- {{ transfer.accountId }}
+ {{ transfer.account }}
- {{ formatAmount(transfer.balance) }}
+ {{ formatAmount(transfer.amount) }}
-
-
-
-
diff --git a/src/components/history/TransferList.vue b/src/components/history/TransferList.vue
new file mode 100644
index 00000000..e4107c29
--- /dev/null
+++ b/src/components/history/TransferList.vue
@@ -0,0 +1,111 @@
+
+
- {{ title }}
-
-
- {{ description }}
-
-
-
+
+
+
+
diff --git a/src/components/interface/ActionsButton.vue b/src/components/interface/ActionsButton.vue
index c8ae4148..87ecad9a 100644
--- a/src/components/interface/ActionsButton.vue
+++ b/src/components/interface/ActionsButton.vue
@@ -61,9 +61,9 @@ export default defineComponent({
},
emits: ["edit", "remove"],
setup(_props, context) {
- let showActions = ref(false);
+ const showActions = ref(false);
- let actions: Array
+
+
+
+ {{ $t("InterfaceTransactionDetails.sender") }}
+
+
+
+
+
+
+
+
+ {{ transfer?.account }}
+
+
+ {{ formatAmount(Math.abs(transfer?.amount)) }}
+
+
+
+
+
+
+ +
+ ![right arrow]()
+
+
+
+
+
+ {{ $t("InterfaceTransactionDetails.recipients") }}
+
+
+
+
+
+
+
+ {{ transfer.account?.toString() }}
+
+
+ {{ formatAmount(transfer?.amount) }}
+
+
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
- {{ state.current + 1 }}
-
-
-
-
-
-
-
-
-
-
-
-
+
-
- {
- hashgraph.value = await import("@hashgraph/sdk");
- });
-
const router = useRouter();
const store = useStore();
const i18n = useI18n();
- const hashgraph = ref(null);
- const success = computed( ()=> {
- if(state.transfers.length === 1) {
- if(state.transfers[0].asset === "HBAR"){
+ const state = reactive({
+ accountId: store.accountId,
+ generalErrorText: "",
+ sendBusyText: "",
+ indexToEdit: 0,
+ showEditModal: false,
+ memo: "",
+ maxFee: new Hbar(0),
+ showAddModal: false,
+ showAcceptModal: false,
+ showIPModal: false,
+ showAddTransferModal: false,
+ showConfirmPrivateKeyModal: false,
+ showConfirmTransferModal: false,
+ confirmed: false,
+ editTransfer: true,
+ transfer: {
+ to: undefined,
+ asset: "HBAR",
+ amount: new BigNumber(0)
+ } as SimpleTransfer,
+ transfers: [] as SimpleTransfer[],
+ decimals: 0,
+ symbol: "",
+ tokenType: ""
+ });
+
+ const success = computed(() => {
+ if (state.transfers.length === 1) {
+ if (state.transfers[0].asset === "HBAR") {
return `${i18n.t("Modal.Send.SuccessfullyTransferred")} ${formatAmount(state.transfers[0].amount?.toNumber() ?? 0)} ${i18n.t("Modal.Send.ToAccount")}: ${state.transfers[0].to?.toString()}`
}
return `${i18n.t("Modal.Send.SuccessfullyTransferred")} ${state.transfers[0].amount?.toFixed(state.decimals)} ${i18n.t("InterfaceSend.modal.of")} ${state.transfers[0].asset} ${i18n.t("Modal.Send.ToAccount")}: ${state.transfers[0].to?.toString()}`
@@ -224,70 +248,40 @@ export default defineComponent({
}
});
- const addTransferButton = computed( ()=>{
- if(state.transfers.length == 0) return i18n.t("BaseButton.addTransfer1");
- if(state.editTransfer === true) return i18n.t("InterfaceHomeSend.button.save");
+ const addTransferButton = computed(() => {
+ if (state.transfers.length == 0) return i18n.t("BaseButton.addTransfer1");
+ if (state.editTransfer === true) return i18n.t("InterfaceHomeSend.button.save");
return i18n.t("BaseButton.addAnotherTransfer");
});
- const sendValid = computed(
- () => state.transfer.to != null && state.transfer.amount != null && !isNaN(state.transfer.amount.toNumber()) && state.transfer.amount.toNumber() !== 0
+ const sendValid = computed(() =>
+ state.transfer.to != null &&
+ state.transfer.amount != null &&
+ state.transfer.amount.toNumber() > 0
);
- const disableSend = computed(()=> {
- if(state.transfers.length === 0) return !sendValid.value;
- else return false;
- });
+ const disableSave = computed(() => !state.editTransfer || !sendValid.value);
- const disableAddTransfer = computed(()=> {
- if(!sendValid.value && state.editTransfer) return true;
+ const disableAddTransfer = computed(() => {
+ if (disableSave.value) return true;
return state.transfers.length >= 10;
});
- const disableSave = computed( ()=> state.editTransfer && sendValid.value === true);
-
- let state = reactive({
- accountId: store.accountId,
- generalErrorText: null as string | null,
- sendBusyText: null as string | null,
- indexToEdit: 0,
- showEditModal: false,
- memo: "" as string,
- maxFee: null as Hbar | null | undefined,
- showAddModal: false,
- showAcceptModal: false,
- showIPModal: false,
- showAddTransferModal: false,
- showConfirmPrivateKeyModal: false,
- showConfirmTransferModal: false,
- confirmed: false,
- editTransfer: true,
- transfer: {
- to: undefined,
- asset: "HBAR",
- amount: undefined
- } as Transfer,
- transfers: [] as Transfer[],
- decimals: 0,
- symbol: null as string | null | undefined,
- tokenType: null as string | null | undefined
+ const disableSend = computed(() => {
+ if (state.transfers.length === 0) return !sendValid.value;
+ else return false;
});
- function updateAmount(e: Event): void {
- state.transfer.amount = new BigNumber(e as unknown as number);
- }
-
function updateValue(e: { index: number, value: BigNumber }) {
state.transfers[e.index].amount = e.value;
}
- function createKey(transfer: Transfer): string {
- return `${transfer.to} ${transfer.asset} ${transfer.amount}`;
+ function createKey(transfer: SimpleTransfer): string {
+ return `${transfer.to?.toString()} ${transfer.asset} ${transfer.amount?.toString() ?? ''}`;
}
-
- //Format value to print in Hbar
+
function formatAmount(value: number): string {
- return `${value.toFixed(8)}ℏ`;
+ return Hbar.fromTinybars(value).toString() ?? '';
}
function edit(e: { index: number }): void {
@@ -298,45 +292,50 @@ export default defineComponent({
function remove(e: { index: number }): void {
state.transfers.splice(e.index, 1);
- if(state.transfers.length === 1) {
- state.transfer = state.transfers.shift() as Transfer;
- state.transfers = [] as Transfer[];
+ if (state.transfers.length === 1) {
+ state.transfer = state.transfers.shift() as SimpleTransfer;
+ state.transfers = [] as SimpleTransfer[];
}
}
function editSingleTransfer(): void {
- if(state.transfers.length === 0 && !sendValid.value){
+ if (state.transfers.length === 0 && !sendValid.value) {
openAddTransferModal();
return;
}
- if(!sendValid.value && !state.editTransfer) {
+
+ if (!sendValid.value && !state.editTransfer) {
openAddTransferModal();
return;
}
- const transfer = Object.assign({}, state.transfer) as Transfer;
- if(transfer.to && transfer.asset) {
+
+ if (state.transfer.to && state.transfer.asset) {
state.transfers.splice(state.indexToEdit, 1);
- state.transfers.splice(state.indexToEdit, 0, transfer);
+ state.transfers.splice(state.indexToEdit, 0, state.transfer);
}
+
clear();
}
- function addTransfer(e: { transfer: Transfer, edit: boolean }){
+ function addTransfer(e: { transfer: SimpleTransfer, edit: boolean }) {
const transfer = Object.assign({}, e.transfer);
- if(transfer.to && transfer.asset && validateTransfer(transfer) === true){
- if(e.edit) {
+
+ if (transfer.to && transfer.asset && validateTransfer(transfer) === true) {
+ if (e.edit) {
state.transfers.splice(state.indexToEdit, 1);
state.transfers.splice(state.indexToEdit, 0, transfer);
} else {
state.transfers.push(transfer);
}
}
+
clear();
}
- function validateTransfer(transfer: Transfer): boolean {
- for(let i in state.transfers) {
- if(state.transfers[i].to?.toString() === transfer.to?.toString() && state.transfers[i].asset.toString() === transfer.asset.toString()) {
+ function validateTransfer(transfer: SimpleTransfer): boolean {
+ // Not sure why we assumed people couldn't send multiple transfers of the same amount to the same account, but we did
+ for (const i in state.transfers) {
+ if (state.transfers[i].to?.toString() === transfer.to?.toString() && state.transfers[i].asset === transfer.asset) {
state.generalErrorText = i18n.t("InterfaceHomeSend.error.already.in.list");
return false;
}
@@ -344,24 +343,25 @@ export default defineComponent({
state.generalErrorText = "";
clear();
+
return true;
}
- function handleConfirm(): void{
+ function handleConfirm(): void {
closeConfirmTransferModal();
onSend();
}
function clear(): void {
state.transfer.to = undefined;
- state.transfer.asset = "HBAR",
- state.transfer.amount = undefined
+ state.transfer.asset = "HBAR";
+ state.transfer.amount = new BigNumber(0);
state.indexToEdit = 0;
state.editTransfer = false;
}
function openConfirmTransferModal(): void {
- if(sendValid.value === true && state.transfers.length === 0) state.transfers.push(state.transfer);
+ if (sendValid.value === true && state.transfers.length === 0) state.transfers.push(state.transfer);
state.showConfirmTransferModal = true;
}
@@ -392,7 +392,7 @@ export default defineComponent({
state.showIPModal = true;
state.sendBusyText = "Executing transaction …";
- state.generalErrorText = null;
+ state.generalErrorText = "";
try {
await store.client.transfer({
@@ -405,13 +405,13 @@ export default defineComponent({
});
void store.requestAccountBalance();
-
+
//get token information if asset is not Hbar, and only one transfer is going out
//Removed token info query to reduce invisible transactions, can put back if needed
- if(state.transfer.asset !== "HBAR" && state.transfers.length <= 1){
- state.decimals = store.balance?.tokens?.get(state.transfer.asset)?.decimals ?? 0;
+ if (state.transfer.asset !== "HBAR" && state.transfers.length <= 1) {
+ state.decimals = store.balance?.tokens?.get(state.transfer.asset ?? "")?.decimals ?? 0;
state.symbol = "";
- state.tokenType = state.transfer.asset;
+ state.tokenType = state.transfer.asset ?? "";
}
// go back to home
@@ -424,7 +424,7 @@ export default defineComponent({
state.confirmed = false;
state.transfer.amount = new BigNumber(0);
} finally {
- state.sendBusyText = null;
+ state.sendBusyText = "";
state.confirmed = false;
}
}
@@ -433,15 +433,6 @@ export default defineComponent({
router.back();
}
- function updateMaxFee(fee: Hbar): void {
- state.maxFee = fee;
- }
-
- //Removed token info queries to reduce invisible transactions, can replace if needed
- async function getTokenInfo(token: string | TokenId): Promise{
- return await store.client?.getTokenInfo({token: token});
- }
-
return {
state,
success,
@@ -451,7 +442,6 @@ export default defineComponent({
disableSave,
onSend,
onCancel,
- updateMaxFee,
closeAcceptModal,
closeAddTransferModal,
openConfirmTransferModal,
@@ -463,7 +453,6 @@ export default defineComponent({
createKey,
updateValue,
handleConfirm,
- updateAmount
};
},
});
diff --git a/src/pages/interface/Staking.vue b/src/pages/interface/Staking.vue
index 2da0e1fb..4c7b9bcc 100644
--- a/src/pages/interface/Staking.vue
+++ b/src/pages/interface/Staking.vue
@@ -44,12 +44,6 @@
:title="$t('Staking.estimatedRewardRate')"
:value="estimatedRewardRate.toString()"
/>
-
+
@@ -85,15 +88,18 @@
{{ $t("InterfaceSend.options") }}
-
-
-
+
@@ -115,23 +121,23 @@
color="green"
class="w-full py-3 mt-6"
:disabled="disableSend"
- :busy="state.sendBusyText != null"
+ :busy="state.sendBusyText.length > 0"
@click="openConfirmTransferModal"
>
- {{ state.sendBusyText ?? "Send" }}
+ {{ state.sendBusyText.length > 0 ? state.sendBusyText : "Send" }}
-
+
{{ $t("InterfaceSend.max.transaction.fee") }}
diff --git a/src/pages/interface/TokenDetails.vue b/src/pages/interface/TokenDetails.vue
deleted file mode 100644
index a33d8f23..00000000
--- a/src/pages/interface/TokenDetails.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/interface/Tokens.vue b/src/pages/interface/Tokens.vue
deleted file mode 100644
index 2256840c..00000000
--- a/src/pages/interface/Tokens.vue
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
- {{ $t("InterfaceTokenDetails.subheader") }}
-
-
-
-
-
-
-
-
-
- {{ $t("InterfaceTokenDetails.rank") }}
-
-
- {{ $t("InterfaceTokenDetails.address") }}
-
-
-
- {{ $t("InterfaceTokenDetails.quantity") }}
-
-
-
-
-
- #{{ i }}
-
-
- 0.0.{{ i }}
-
-
-
- 424,446,229
-
-
-
-
-
-
-
-
-
- {{ $t("InterfaceToken.tokensFound", { tokens: "500,000" }) }}
-
-
-
-
-
+
![green checkmark]()
- {{ formatType(state.transaction?.status) ?? notAvailable }}
-
+ {{ state.transaction?.result ?? notAvailable }}
+
-
-