Skip to content

Commit

Permalink
Merge pull request #5465 from LiskHQ/release/3.0.0
Browse files Browse the repository at this point in the history
Merge release branch into development
  • Loading branch information
ManuGowda authored Nov 21, 2023
2 parents 4a7a5bb + 5d81be5 commit 9230ea5
Show file tree
Hide file tree
Showing 66 changed files with 782 additions and 433 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ See [contributors section](https://github.com/LiskHQ/lisk-desktop/graphs/contrib

## License

Copyright © 2016-2023 Lisk Foundation
Copyright © 2016-2024 Lisk Foundation

This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.

Expand Down
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lisk-desktop",
"version": "3.0.0-rc.3",
"version": "3.0.0-rc.4",
"productName": "Lisk",
"description": "Lisk",
"main": "./build/main.js",
Expand Down
2 changes: 1 addition & 1 deletion app/src/validationSchema.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export const requestTokenSchema = {
reference: {
dataType: 'string',
minLength: 0,
maxLength: 20,
maxLength: 64,
},
},
};
4 changes: 2 additions & 2 deletions docs/CSS_GUIDE.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
1. Define class names in camel-case.
2. For the styling purpose, prefer class names to IDs.
3. Prefer defining variables for all CSS values describing a certain presentational behaviour and used in multiple places (We use ‘css-next’ variables. Read [this](http://cssnext.io/features/#custom-properties-var) for more information).
3. Prefer defining variables for all CSS values describing a certain presentational behavior and used in multiple places (We use ‘css-next’ variables. Read [this](http://cssnext.io/features/#custom-properties-var) for more information).
4. There is common css file in app component and if you use a class Name in more than one components, Add it to this file (don’t use this for child and depend components).
5. Vendor prefixes are not needed since autoprefixer performs this. Read [docs](https://github.com/postcss/autoprefixer) for more information.
6. Please ensure cross browser compatibility for all major browsers.
7. Use ‘:global’ before any global classes because we use css modules and it adds a hash to non global class names.
8. SVG is the preferred format for all the images.
9. Avoid storing images in directories other than [src/assets/images](/src/assets/images).
9. Avoid storing images in directories other than [setup/react/assets/images](/setup/react/assets/images).
10. Try restricting CSS nesting feature to no more than three levels.
11. Flexbox is the exploited layout and hence it’s preferred project wide (check [docs](https://css-tricks.com/snippets/css/a-guide-to-flexbox/) for more information).
12. Use kebab-case for naming the assets.
Expand Down
2 changes: 0 additions & 2 deletions docs/DEVELOPMENT_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ This is a live document, please expect updates and unfinished content.
1. [How Can I Contribute?](CONTRIBUTING_GUIDE.md)
1. [React](REACT_GUIDE.md)
1. [PostCSS](CSS_GUIDE.md)
1. [Testing](TEST_GUIDE.md)
1. [Epic Specification](EPIC_SPECIFICATION_GUIDE.md)
1. [Lisk URL Protocols](PROTOCOL_GUIDE.md)

## Code of Conduct

Expand Down
8 changes: 2 additions & 6 deletions docs/EPIC_SPECIFICATION_GUIDE.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
# Lisk Desktop Epic Specificaiton Guideline
# Lisk Desktop Epic Specification Guideline

Lisk Desktop team will gather community enhancement proposals in the backlog of the project.

Once a substantial ammount of proposals have been identified as belonging to the same type/category of enhancemnt, an epic will be created to handle the development journey towards it's implementation.
Once a substantial amount of proposals have been identified as belonging to the same type/category of enhancement, an epic will be created to handle the development journey towards it's implementation.

## Table Of Contents

1. [Requirements](#requirements)
1. [Epic creation best practices](#epic-creation-best-practices)
1. [Epic workflow](#epic-workflow)

## Requirements

Install [ZenHub](https://www.zenhub.com/) browser extension to your browser (Chrome and Firefox supported) to be able to access the Epic feature of ZenHub in Github

## Epic creation best practices

Please ensure you follow this practices when creating or working in an epic.
Expand Down
4 changes: 3 additions & 1 deletion docs/HARDWARE_WALLET_DEVELOPMENT.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# How to use the Ledger hardware wallet
# How to use the Ledger hardware wallet (Dev Mode)

Note: This guide is only for development purpose, for production usage please download the Lisk App from Ledger Live.

## Step 1: Manually add the Lisk ledger app to your Ledger hardware wallet

Expand Down
1 change: 0 additions & 1 deletion docs/PR-GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

- The PR has an issue.
- All conflicts are resolved.
- The PR follows our [Test guide](/docs/TEST_GUIDE.md).
- The PR follows our [CSS guide](/docs/CSS_GUIDE.md).

When you're done, submit a pull request and one of the maintainers will check it out. You will be informed if there are any problems or changes that may need to be considered.
Expand Down
47 changes: 0 additions & 47 deletions docs/PROTOCOL_GUIDE.md

This file was deleted.

161 changes: 0 additions & 161 deletions docs/TEST_GUIDE.md

This file was deleted.

21 changes: 21 additions & 0 deletions e2e/features/requestToken/RequestToken.feature
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
Feature: Request Token
Background: Add an account and navigate to wallet
Then I go to page "wallet"
And I click on exact text "Add account"
Given I add an account with passphrase "peanut hundred pen hawk invite exclude brain chunk gadget wait wrong ready" password "Password1$" name "test_acc"
And I go to page "wallet"
And I wait for "1 seconds"
Expand Down Expand Up @@ -35,3 +37,22 @@ Feature: Request Token
And I type "hello" in "reference-field"
And I click on a button with text "Copy link"
Then Clipboard should contain "lisk://wallet?modal=send&recipient=lskm9syv4wrjcjczpegz65zqxhk2cp9dkejs5wbjb&amount=10&reference=hello&token=0400000000000000&recipientChain=04000000"

Scenario: Request token should not generate a copy link if message exceeds 64 characters
Given I type "10" in "amount"
Then button with text "Copy link" should be enabled
And Element 'qrContainer' should not contain class 'disabled'
Given I click on a button with text "Add message (Optional)"
And I type "hello&(&*#(@))*!#@$^%#@&@)world!@&$^#message*@)#*)@$$@&^!(@#)~~@!@#" in "reference-field"
Then I should possibly see "-3 bytes left"
And Element 'qrContainer' should contain class 'disabled'

Scenario: Request token should generate a copy link if message is within 64 characters
Given I type "10" in "amount"
Then button with text "Copy link" should be enabled
And Element 'qrContainer' should not contain class 'disabled'
Given I click on a button with text "Add message (Optional)"
And I type "hello&(&*#(@))*!#@$^%#@&@)world!@&$^#message*@)#*)@$$@&^!(@#)~~@" in "reference-field"
Then I should possibly see "0 bytes left"
And I click on a button with text "Copy link"
Then Clipboard should contain "lisk://wallet?modal=send&recipient=lskm9syv4wrjcjczpegz65zqxhk2cp9dkejs5wbjb&amount=10&reference=hello%26(%26*%23(%40))*!%23%40%24%5E%25%23%40%26%40)world!%40%26%24%5E%23message*%40)%23*)%40%24%24%40%26%5E!(%40%23)~~%40&token=0400000000000000&recipientChain=04000000"
2 changes: 2 additions & 0 deletions e2e/features/staking/Staking.feature
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Feature: Staking
# Background: Add an account and navigate to validators
# Given I wait for "1 seconds"
# Then I go to page "wallet"
# And I click on exact text "Add account"
# Given I add an account with passphrase "attract squeeze option inflict dynamic end evoke love proof among random blanket table pumpkin general impose access toast undo extend fun employ agree dash" password "Password@1" name "genesis_60" custom derivation path "m/44'/134'/60'"
# And I go to page "validators"
# And I wait for "1 seconds"
Expand Down
Loading

0 comments on commit 9230ea5

Please sign in to comment.