Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Transactions to 'yourself' are all seen as "account initialization" - Closes #1281 #1397

Merged
merged 8 commits into from
Oct 31, 2018
Merged

Transactions to 'yourself' are all seen as "account initialization" - Closes #1281 #1397

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e5321f6
:seedling: display address
bmaggi-lisk Oct 26, 2018
6a80641
:nail_care: remove unessesary case
bmaggi-lisk Oct 26, 2018
84e1cdb
:bug: set reference when accountInit
bmaggi-lisk Oct 29, 2018
7935f68
:nail_care: fix line exceeding max lenght
bmaggi-lisk Oct 29, 2018
b6794ae
:recycle: remove uneccesary variable
bmaggi-lisk Oct 29, 2018
57a0c9f
:white_check_mark: change initialization message selector
bmaggi-lisk Oct 29, 2018
96e2322
:white_check_mark: show self address
bmaggi-lisk Oct 29, 2018
8463eb1
:white_check_mark: remove transfer to myself test, add assertions to …
Oct 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/sendReadable/send.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class SendReadable extends React.Component {
amount: this.state.amount.value,
passphrase: this.props.passphrase.value,
secondPassphrase: this.props.secondPassphrase.value,
data: this.props.reference,
data: this.props.accountInit ? this.props.t('Account initialization') : this.props.reference,
});
}

Expand Down
3 changes: 0 additions & 3 deletions src/components/transactions/transactionType.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ const TransactionType = (props) => {
const { t } = props;
let type;
switch (props.type) {
case 0:
type = props.senderId === props.recipientId ? t('Account initialization') : false;
break;
case 1:
type = t('Second passphrase registration');
break;
Expand Down
2 changes: 1 addition & 1 deletion test/cypress/e2e/transfer.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ describe('Transfer', () => {
cy.get(ss.amountInput).click().type(randomAmount);
cy.get(ss.nextButton).click();
cy.get(ss.sendButton).click();
cy.get(ss.transactionRow).eq(0).find(ss.transactionAddress).should('have.text', msg.accountInitializatoinAddress);
cy.get(ss.transactionRow).eq(0).find(ss.transactionAddress).should('have.text', accounts.genesis.address);
});

it('Launch protocol link prefills recipient, amount and reference', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/integration/wallet.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ describe('@integration: Wallet', () => {
match.defined,
match.defined,
null,
undefined,
'Account initialization',
).returnsPromise().resolves({ data: [] });
});

Expand Down