From 5c267cfc143e0ed6ce38508c3832bbc7cc56c30c Mon Sep 17 00:00:00 2001 From: alihaghighatkhah Date: Thu, 4 May 2017 13:26:06 +0200 Subject: [PATCH 1/5] Change the style of Send modal to make it similar to other modals --- src/app/components/send/send.less | 14 +++++ src/app/components/send/send.pug | 57 +++++++++++---------- src/app/components/send/sendModalService.js | 2 +- 3 files changed, 45 insertions(+), 28 deletions(-) diff --git a/src/app/components/send/send.less b/src/app/components/send/send.less index 9ca3c019e..5a55aae45 100644 --- a/src/app/components/send/send.less +++ b/src/app/components/send/send.less @@ -28,4 +28,18 @@ send { md-card-title md-menu { margin: -8px -14px; } + md-dialog-actions .md-button { + margin-left: -8px; + } + md-menu.max-funds { + &:after { + content: ''; + display: inline-block; + vertical-align: middle; + height: 100%; + } + button { + vertical-align: middle; + } + } } diff --git a/src/app/components/send/send.pug b/src/app/components/send/send.pug index c1b848882..fde51cbde 100644 --- a/src/app/components/send/send.pug +++ b/src/app/components/send/send.pug @@ -1,33 +1,36 @@ -md-dialog.dialog-send(aria-label='Transfering', style='width: 700px; max-width: 700px') - md-card.offline-hide - md-card-title - md-card-title-text - span.md-title Send - md-menu(md-position-mode='target-right target') - md-button.md-icon-button(ng-click='$mdOpenMenu()') - i.material-icons more_vert - md-menu-content(width='4') - md-menu-item - md-button(ng-click='$ctrl.setMaxAmount()') - div(layout='row', flex='') - p(flex='') Set maximum amount - md-card-content - form(name='$ctrl.sendForm') - md-content(flex='100', flex-gt-sm='70', flex-offset-gt-sm='15') +div.dialog-send(aria-label='Send funds') + form(name='$ctrl.sendForm') + md-toolbar + .md-toolbar-tools + h2 Send + md-dialog-content + .md-dialog-content + div md-input-container.md-block label Recipient Address input(type='text', name='recipient', ng-model='$ctrl.recipient.value', required, ng-pattern='$ctrl.recipient.regexp', ng-disabled='$ctrl.loading') div(ng-messages='$ctrl.sendForm.recipient.$error') div(ng-message='required') Required div(ng-message='pattern') Invalid - md-input-container.md-block - label Transaction Amount - input(type='text', name='amount', ng-model='$ctrl.amount.value', required, ng-pattern='$ctrl.amount.regexp', ng-disabled='$ctrl.loading', ng-max='$ctrl.amount.max') - div.fee(ng-show='$ctrl.amount.value') Fee: 0.1 LSK - div(ng-messages='$ctrl.sendForm.amount.$error') - div(ng-message='required') Required - div(ng-message='pattern') Invalid - div(ng-message='max') Insufficient funds - md-content(layout='row', layout-align='center center') - md-button.md-raised.md-secondary(ng-disabled='$ctrl.loading', ng-click='$ctrl.cancel()') {{ 'Cancel' }} - md-button.md-raised.md-primary(ng-disabled='!$ctrl.sendForm.$valid || $ctrl.loading', ng-click='$ctrl.go()') {{ $ctrl.loading ? 'Sending...' : 'Send' }} +
+ md-input-container.md-block.flex-95 + label Transaction Amount + input(type='text', name='amount', ng-model='$ctrl.amount.value', required, ng-pattern='$ctrl.amount.regexp', ng-disabled='$ctrl.loading', ng-max='$ctrl.amount.max') + div.fee(ng-show='$ctrl.amount.value') Fee: 0.1 LSK + div(ng-messages='$ctrl.sendForm.amount.$error') + div(ng-message='required') Required + div(ng-message='pattern') Invalid + div(ng-message='max') Insufficient funds + md-menu.flex-5.max-funds(md-position-mode='target-right target') + md-button.md-icon-button(ng-click='$mdOpenMenu()') + i.material-icons more_vert + md-menu-content(width='4') + md-menu-item + md-button(ng-click='$ctrl.setMaxAmount()') + div(layout='row', flex='') + p(flex='') Set maximum amount + + md-dialog-actions(layout='row') + md-button.md-raised.md-secondary(ng-disabled='$ctrl.loading', ng-click='$ctrl.cancel()') {{ 'Cancel' }} + span(flex) + md-button.md-raised.md-primary(ng-disabled='!$ctrl.sendForm.$valid || $ctrl.loading', ng-click='$ctrl.go()') {{ $ctrl.loading ? 'Sending...' : 'Send' }} \ No newline at end of file diff --git a/src/app/components/send/sendModalService.js b/src/app/components/send/sendModalService.js index cbab39f67..dc8281e55 100644 --- a/src/app/components/send/sendModalService.js +++ b/src/app/components/send/sendModalService.js @@ -6,7 +6,7 @@ app.factory('SendModal', ($mdDialog) => { }; const show = (recipientId, amount) => ($mdDialog.show({ - template: '', + template: '', parent: angular.element('#main'), locals: { recipientId, amount, From 55c3611d2ebf2ce72ed0ee4f7710473a1cea63c2 Mon Sep 17 00:00:00 2001 From: alihaghighatkhah Date: Thu, 4 May 2017 13:48:26 +0200 Subject: [PATCH 2/5] Adapt tests according to changes in the template --- src/test/components/send/send.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/components/send/send.spec.js b/src/test/components/send/send.spec.js index 2825c9089..9deee7488 100644 --- a/src/test/components/send/send.spec.js +++ b/src/test/components/send/send.spec.js @@ -35,7 +35,7 @@ describe('Send component', () => { const HEADER_TEXT = 'Send'; it(`should contain header saying "${HEADER_TEXT}"`, () => { - expect(element.find('.md-title').text()).to.equal(HEADER_TEXT); + expect(element.find('form md-toolbar .md-toolbar-tools h2').text()).to.equal(HEADER_TEXT); }); const RECIPIENT_LABEL_TEXT = 'Recipient Address'; From 57352571a11867bb8a057b5d2a40b4148de5fa2f Mon Sep 17 00:00:00 2001 From: alihaghighatkhah Date: Mon, 8 May 2017 12:26:31 +0200 Subject: [PATCH 3/5] Fix the issue in testing forging component related to account.network --- src/test/components/forging/forging.spec.js | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/test/components/forging/forging.spec.js b/src/test/components/forging/forging.spec.js index 2ed1b7ff5..83d5cb2e0 100644 --- a/src/test/components/forging/forging.spec.js +++ b/src/test/components/forging/forging.spec.js @@ -41,10 +41,23 @@ describe('Forging component', () => { vote: '9999982470000000', }; - account.set({ + const network = { + address: "http://localhost:4000", + custom: true, + name: "Custom Node", + nethash: "198f2b61a8eb95fbeed58b8216780b68f697f26b849acf00c8c93bb9b24f783d", + node: "localhost", + port: "4000", + ssl: false, + testnet: true, + }; + const testAcount = { passphrase: delegate.passphrase, balance: lsk.from(100), - }); + network, + }; + + account.set(testAcount); $scope = $rootScope.$new(); element = $compile('')($scope); @@ -70,7 +83,7 @@ describe('Forging component', () => { forgingServiceMock.expects('getForgedStats').returns(deferred.promise).exactly(5); deferred.resolve({ }); - controller.$scope.$emit('onAccountChange'); + controller.$scope.$emit('onAccountChange', testAcount); $scope.$digest(); }); From 6c8f786f9b0b5c833c718adde390748d388de1c6 Mon Sep 17 00:00:00 2001 From: alihaghighatkhah Date: Mon, 8 May 2017 12:31:07 +0200 Subject: [PATCH 4/5] Fixing regaring eslint erros --- src/test/components/forging/forging.spec.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/components/forging/forging.spec.js b/src/test/components/forging/forging.spec.js index 83d5cb2e0..1f880ac45 100644 --- a/src/test/components/forging/forging.spec.js +++ b/src/test/components/forging/forging.spec.js @@ -42,12 +42,12 @@ describe('Forging component', () => { }; const network = { - address: "http://localhost:4000", + address: 'http://localhost:4000', custom: true, - name: "Custom Node", - nethash: "198f2b61a8eb95fbeed58b8216780b68f697f26b849acf00c8c93bb9b24f783d", - node: "localhost", - port: "4000", + name: 'Custom Node', + nethash: '198f2b61a8eb95fbeed58b8216780b68f697f26b849acf00c8c93bb9b24f783d', + node: 'localhost', + port: '4000', ssl: false, testnet: true, }; From 397782a44819369b8bd047f0964e794cc7b0b0a0 Mon Sep 17 00:00:00 2001 From: Oliver Beddows Date: Mon, 8 May 2017 12:35:20 +0200 Subject: [PATCH 5/5] Normalising space --- src/app/components/send/send.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/components/send/send.less b/src/app/components/send/send.less index e5be5d30b..be540fd7a 100644 --- a/src/app/components/send/send.less +++ b/src/app/components/send/send.less @@ -33,9 +33,11 @@ send { md-card-title md-menu { margin: -8px -14px; } + md-dialog-actions .md-button { margin-left: -8px; } + md-menu.max-funds { &:after { content: '';