diff --git a/raiden-dapp/src/components/AmountDisplay.vue b/raiden-dapp/src/components/AmountDisplay.vue index 7d104dfa46..de3d07f792 100644 --- a/raiden-dapp/src/components/AmountDisplay.vue +++ b/raiden-dapp/src/components/AmountDisplay.vue @@ -8,30 +8,35 @@ @mouseover="exactAmount ? (displayExactAmount = true) : null" @mouseleave="exactAmount ? (displayExactAmount = false) : null" > - {{ label }} - - {{ sign }}{{ amount | toUnits(token.decimals) }} {{ token.symbol || '' }} - - - {{ sign }}{{ amount | displayFormat(token.decimals) }} - {{ token.symbol || '' }} + + {{ label }} + + + + {{ formattedAmount }} + + diff --git a/raiden-dapp/src/components/channels/ChannelActionForm.vue b/raiden-dapp/src/components/channels/ChannelActionForm.vue index f280200459..ab3e338d47 100644 --- a/raiden-dapp/src/components/channels/ChannelActionForm.vue +++ b/raiden-dapp/src/components/channels/ChannelActionForm.vue @@ -168,6 +168,9 @@ export default class ChannelActionForm extends Vue { @Prop({ type: Boolean, default: false }) readonly stickyButton!: boolean; + @Prop({ type: Boolean, default: false }) + readonly autofocusDisabled!: boolean; + @Prop({ required: true }) readonly runAction!: (options: unknown) => Promise; @@ -203,15 +206,18 @@ export default class ChannelActionForm extends Vue { } get tokenAddressInputFocused(): boolean { - return this.tokenAddressEditable; + return !this.autofocusDisabled && this.tokenAddressEditable; } get partnerAddressInputFocused(): boolean { - return !this.tokenAddressInputFocused && this.partnerAddressEditable; + return ( + !this.autofocusDisabled && !this.tokenAddressInputFocused && this.partnerAddressEditable + ); } get tokenAmountInputFocused(): boolean { return ( + !this.autofocusDisabled && !this.tokenAddressInputFocused && !this.partnerAddressInputFocused && this.tokenAmountEditable diff --git a/raiden-dapp/src/components/channels/ChannelDepositAndTransferAction.vue b/raiden-dapp/src/components/channels/ChannelDepositAndTransferAction.vue index 6a1627f091..978ddedc2b 100644 --- a/raiden-dapp/src/components/channels/ChannelDepositAndTransferAction.vue +++ b/raiden-dapp/src/components/channels/ChannelDepositAndTransferAction.vue @@ -1,10 +1,15 @@ diff --git a/raiden-dapp/src/components/transfer/TransferAction.vue b/raiden-dapp/src/components/transfer/MediatedTransferAction.vue similarity index 51% rename from raiden-dapp/src/components/transfer/TransferAction.vue rename to raiden-dapp/src/components/transfer/MediatedTransferAction.vue index 76b651dfdd..024e745a7a 100644 --- a/raiden-dapp/src/components/transfer/TransferAction.vue +++ b/raiden-dapp/src/components/transfer/MediatedTransferAction.vue @@ -1,30 +1,32 @@