diff --git a/src/components/Modal.vue b/src/components/Modal.vue index 92c7eec7..875ed227 100644 --- a/src/components/Modal.vue +++ b/src/components/Modal.vue @@ -10,6 +10,7 @@ import TransactionListModal from "./TransactionListModal.vue" import ConfirmPaymentModal from "./ConfirmPaymentModal.vue" import QrCodeModal from "./QrCodeModal.vue" + import MoneyRequestModal from "./MoneyRequestModal.vue" @Options({ name: "Modal", @@ -20,6 +21,7 @@ TransactionListModal, ConfirmPaymentModal, QrCodeModal, + MoneyRequestModal, }, data() { return { diff --git a/src/components/MoneyRequestModal.vue b/src/components/MoneyRequestModal.vue new file mode 100644 index 00000000..3bb646e3 --- /dev/null +++ b/src/components/MoneyRequestModal.vue @@ -0,0 +1,236 @@ + + + + + + + + {{ $gettext("Request money") }} - 1/2 + + + + + (amount = x)" + @update:message="(x) => (message = x)" + @update:isValid="(x) => (isValid = x)" + /> + + + + + + + + + + + + + + + + {{ $gettext("Request money") }} - 2/2 + + + + + + + + + {{ $gettext("Please scan the QR code above to proceed") }} + + + + + + + + + diff --git a/src/components/MoneyTransaction.vue b/src/components/MoneyTransaction.vue new file mode 100644 index 00000000..513b819f --- /dev/null +++ b/src/components/MoneyTransaction.vue @@ -0,0 +1,237 @@ + + + + + + {{ $gettext("From") }} + + + {{ $gettext("To") }} + + + {{ account.name() }} + + + + + {{ $gettext("To") }} + + + + + {{ $gettext("Amount") }} + + + + + {{ selectedRecipient?.curr }} + + + + {{ errors.amount }} + + + {{ parentErrors }} + + + + {{ errors.message }} + + + + + + diff --git a/src/components/MoneyTransferModal.vue b/src/components/MoneyTransferModal.vue index a46fa91f..399d7599 100644 --- a/src/components/MoneyTransferModal.vue +++ b/src/components/MoneyTransferModal.vue @@ -134,65 +134,16 @@ - - - - {{ $gettext("From") }} - - - {{ ownSelectedAccount.name() }} - - - {{ $gettext("To") }} - - - - {{ $gettext("Amount") }} - - - - - {{ selectedRecipient.currencySymbol }} - - - - {{ errors.balance }} - - - {{ errors.amount }} - - - - + (amount = x)" + @update:message="(x) => (message = x)" + @update:isValid="(x) => (isValid = x)" + />
+ {{ $gettext("Request money") }} - 1/2 +
+ {{ $gettext("Request money") }} - 2/2 +
+ {{ $gettext("Please scan the QR code above to proceed") }} +