From c1f7ad360c9eeff43402f088275d59c2ef3c31b3 Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Thu, 28 May 2015 11:57:18 -0300 Subject: [PATCH 1/2] spend proposal -> payment proposal --- lib/templates/new_tx_proposal.plain | 4 ++-- lib/templates/txp_finally_rejected.plain | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/templates/new_tx_proposal.plain b/lib/templates/new_tx_proposal.plain index b44b1de..e4a9fc9 100644 --- a/lib/templates/new_tx_proposal.plain +++ b/lib/templates/new_tx_proposal.plain @@ -1,2 +1,2 @@ -<%= subjectPrefix %>New spend proposal -A new spend proposal has been created in your wallet <%= walletName %> by <%= creatorName %>. +<%= subjectPrefix %>New payment proposal +A new payment proposal has been created in your wallet <%= walletName %> by <%= creatorName %>. diff --git a/lib/templates/txp_finally_rejected.plain b/lib/templates/txp_finally_rejected.plain index 60e4b76..80a3fb1 100644 --- a/lib/templates/txp_finally_rejected.plain +++ b/lib/templates/txp_finally_rejected.plain @@ -1,2 +1,2 @@ -<%= subjectPrefix %>Spend proposal rejected -A spend proposal in your wallet <%= walletName %> has been rejected by <%= creatorName %>. +<%= subjectPrefix %>Payment proposal rejected +A payment proposal in your wallet <%= walletName %> has been rejected by <%= creatorName %>. From c2fecb03aac7cfc8fdef667afc6b3add70f23032 Mon Sep 17 00:00:00 2001 From: Ivan Socolsky Date: Thu, 28 May 2015 11:58:50 -0300 Subject: [PATCH 2/2] fix test --- test/integration/server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/server.js b/test/integration/server.js index 22353e2..84dd4a7 100644 --- a/test/integration/server.js +++ b/test/integration/server.js @@ -3220,7 +3220,7 @@ describe('Wallet service', function() { _.difference(['copayer1@domain.com', 'copayer2@domain.com'], _.pluck(emails, 'to')).should.be.empty; var one = emails[0]; one.from.should.equal('bws@dummy.net'); - one.subject.should.contain('New spend proposal'); + one.subject.should.contain('New payment proposal'); one.text.should.contain(wallet.name); one.text.should.contain(wallet.copayers[0].name); server.storage.fetchUnsentEmails(function(err, unsent) {