2020-06-17 19:18:31 +00:00
|
|
|
import QtQuick 2.13
|
2020-07-30 05:18:54 +00:00
|
|
|
import QtQuick.Controls 2.13
|
2020-06-25 19:31:30 +00:00
|
|
|
import QtQuick.Dialogs 1.3
|
2020-06-09 14:40:56 +00:00
|
|
|
import "../../../../imports"
|
|
|
|
import "../../../../shared"
|
2021-01-12 10:58:53 +00:00
|
|
|
import "../../../../shared/status"
|
2020-06-09 14:40:56 +00:00
|
|
|
|
|
|
|
ModalPopup {
|
|
|
|
id: popup
|
2020-07-06 20:39:55 +00:00
|
|
|
//% "Add account from private key"
|
|
|
|
title: qsTrId("add-private-key-account")
|
2020-06-09 14:40:56 +00:00
|
|
|
height: 600
|
|
|
|
|
|
|
|
property int marginBetweenInputs: 38
|
2020-06-22 17:26:47 +00:00
|
|
|
property string passwordValidationError: ""
|
|
|
|
property string privateKeyValidationError: ""
|
|
|
|
property string accountNameValidationError: ""
|
2020-06-25 19:31:30 +00:00
|
|
|
property bool loading: false
|
fix: loading of wallet history, display of tx datetime
Fixes: #2539.
Transaction history is now correctly being fetched from status-go as per mobile. Firstly, when accounts are added (ie as watch accounts), `wallet_checkRecentHistory` must be called first so that the status-go db is populated. After that, `wallet_getTransfersByAddress` can be called. On app load, when we run the `initBalance` logic, we are calling `wallet_getTransfersByAddress`, asking for the last 20 transactions with the `loadMore` parameter set to false. When the user navigates to the Wallet > History tab, they can then click “Load More” to fetch more transactions from status-go. Once the number of transactions returns false below the expected amount, the remaining transactions to fetch have been exhausted and the “Load More” button is disabled.
feat: add non-archival node warning to the UI to indicate to the user that they may not have complete results
feat: set active account to the added account
Once an account is added to the wallet, that newly added account is selected as the active account.
1. The “load more” button is active when new transactions that aren’t already displayed are returned from `wallet_getTransfersByAddress`. This is the only way to enable or disable the “Load more” button as status-go is not able to return information regarding whether or not there are more transactions to be fetched. The downside to this is that lets say the last page of transactions is returned, but there are no more pages left. These returned txs are not currently displayed, so the “load more” button will still be enabled. However, the next click of the button will return 0 results, thus disabling it. It’s effectively an extra click to get to the disabled state.
2. For more information on how the `toBlock` parameter operates for the `wallet_getTransfersForAddress` RPC call, see https://notes.status.im/XmENTrVRRaqhwE4gK0m8Mg?view.
2021-05-31 14:03:41 +00:00
|
|
|
property var onAfterAddAccount: function() {}
|
2020-06-22 17:26:47 +00:00
|
|
|
|
|
|
|
function validate() {
|
|
|
|
if (passwordInput.text === "") {
|
2020-07-06 20:39:55 +00:00
|
|
|
//% "You need to enter a password"
|
|
|
|
passwordValidationError = qsTrId("you-need-to-enter-a-password")
|
2020-12-03 22:26:05 +00:00
|
|
|
} else if (passwordInput.text.length < 6) {
|
2021-02-18 16:36:05 +00:00
|
|
|
//% "Password needs to be 6 characters or more"
|
|
|
|
passwordValidationError = qsTrId("password-needs-to-be-6-characters-or-more")
|
2020-06-22 17:26:47 +00:00
|
|
|
} else {
|
|
|
|
passwordValidationError = ""
|
|
|
|
}
|
|
|
|
|
|
|
|
if (accountNameInput.text === "") {
|
2020-07-06 20:39:55 +00:00
|
|
|
//% "You need to enter an account name"
|
|
|
|
accountNameValidationError = qsTrId("you-need-to-enter-an-account-name")
|
2020-06-22 17:26:47 +00:00
|
|
|
} else {
|
|
|
|
accountNameValidationError = ""
|
|
|
|
}
|
|
|
|
|
|
|
|
if (accountPKeyInput.text === "") {
|
2020-07-06 20:39:55 +00:00
|
|
|
//% "You need to enter a private key"
|
|
|
|
privateKeyValidationError = qsTrId("you-need-to-enter-a-private-key")
|
2020-06-22 17:26:47 +00:00
|
|
|
} else if (!Utils.isPrivateKey(accountPKeyInput.text)) {
|
2020-07-06 20:39:55 +00:00
|
|
|
//% "Enter a valid private key (64 characters hexadecimal string)"
|
|
|
|
privateKeyValidationError = qsTrId("enter-a-valid-private-key-(64-characters-hexadecimal-string)")
|
2020-06-22 17:26:47 +00:00
|
|
|
} else {
|
|
|
|
privateKeyValidationError = ""
|
|
|
|
}
|
|
|
|
|
|
|
|
return passwordValidationError === "" && privateKeyValidationError === "" && accountNameValidationError === ""
|
|
|
|
}
|
2020-06-09 14:40:56 +00:00
|
|
|
|
|
|
|
onOpened: {
|
|
|
|
passwordInput.text = ""
|
2020-12-02 18:51:56 +00:00
|
|
|
accountPKeyInput.text = ""
|
|
|
|
accountNameInput.text = ""
|
|
|
|
passwordValidationError = ""
|
|
|
|
privateKeyValidationError = ""
|
|
|
|
accountNameValidationError = ""
|
2021-03-16 19:19:48 +00:00
|
|
|
accountColorInput.selectedColor = Style.current.accountColors[Math.floor(Math.random() * Style.current.accountColors.length)]
|
2020-06-09 14:40:56 +00:00
|
|
|
passwordInput.forceActiveFocus(Qt.MouseFocusReason)
|
|
|
|
}
|
|
|
|
|
|
|
|
Input {
|
|
|
|
id: passwordInput
|
2020-07-06 20:39:55 +00:00
|
|
|
//% "Enter your password…"
|
|
|
|
placeholderText: qsTrId("enter-your-password…")
|
|
|
|
//% "Password"
|
|
|
|
label: qsTrId("password")
|
2020-06-09 14:40:56 +00:00
|
|
|
textField.echoMode: TextInput.Password
|
2020-06-22 17:26:47 +00:00
|
|
|
validationError: popup.passwordValidationError
|
2020-06-09 14:40:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-06-10 14:11:06 +00:00
|
|
|
StyledTextArea {
|
2020-06-09 14:40:56 +00:00
|
|
|
id: accountPKeyInput
|
|
|
|
anchors.top: passwordInput.bottom
|
|
|
|
anchors.topMargin: marginBetweenInputs
|
2020-07-06 20:39:55 +00:00
|
|
|
//% "Paste the contents of your private key"
|
|
|
|
placeholderText: qsTrId("paste-the-contents-of-your-private-key")
|
|
|
|
//% "Private key"
|
|
|
|
label: qsTrId("private-key")
|
2020-06-09 14:40:56 +00:00
|
|
|
customHeight: 88
|
2020-06-22 17:26:47 +00:00
|
|
|
validationError: popup.privateKeyValidationError
|
2020-06-09 14:40:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
Input {
|
|
|
|
id: accountNameInput
|
|
|
|
anchors.top: accountPKeyInput.bottom
|
|
|
|
anchors.topMargin: marginBetweenInputs
|
2020-07-06 20:39:55 +00:00
|
|
|
//% "Enter an account name..."
|
|
|
|
placeholderText: qsTrId("enter-an-account-name...")
|
|
|
|
//% "Account name"
|
|
|
|
label: qsTrId("account-name")
|
2020-06-22 17:26:47 +00:00
|
|
|
validationError: popup.accountNameValidationError
|
2020-06-09 14:40:56 +00:00
|
|
|
}
|
|
|
|
|
2021-01-20 16:24:21 +00:00
|
|
|
StatusWalletColorSelect {
|
2020-06-09 14:40:56 +00:00
|
|
|
id: accountColorInput
|
|
|
|
anchors.top: accountNameInput.bottom
|
|
|
|
anchors.topMargin: marginBetweenInputs
|
2020-07-30 05:18:54 +00:00
|
|
|
anchors.left: parent.left
|
|
|
|
anchors.right: parent.right
|
2020-06-09 14:40:56 +00:00
|
|
|
}
|
|
|
|
|
2021-01-12 10:58:53 +00:00
|
|
|
footer: StatusButton {
|
2020-06-09 14:40:56 +00:00
|
|
|
anchors.top: parent.top
|
|
|
|
anchors.right: parent.right
|
2021-01-12 10:58:53 +00:00
|
|
|
text: loading ?
|
2020-07-06 20:39:55 +00:00
|
|
|
//% "Loading..."
|
|
|
|
qsTrId("loading") :
|
2021-02-18 16:36:05 +00:00
|
|
|
//% "Add account"
|
|
|
|
qsTrId("add-account")
|
2020-06-09 14:40:56 +00:00
|
|
|
|
2021-01-12 10:58:53 +00:00
|
|
|
enabled: !loading && passwordInput.text !== "" && accountNameInput.text !== "" && accountPKeyInput.text !== ""
|
2020-06-25 19:31:30 +00:00
|
|
|
|
|
|
|
MessageDialog {
|
|
|
|
id: accountError
|
|
|
|
title: "Adding the account failed"
|
|
|
|
icon: StandardIcon.Critical
|
|
|
|
standardButtons: StandardButton.Ok
|
|
|
|
}
|
2020-06-09 14:40:56 +00:00
|
|
|
|
|
|
|
onClicked : {
|
2020-06-25 19:31:30 +00:00
|
|
|
// TODO the loaidng doesn't work because the function freezes th eview. Might need to use threads
|
|
|
|
loading = true
|
2020-06-22 17:26:47 +00:00
|
|
|
if (!validate()) {
|
2020-06-25 19:31:30 +00:00
|
|
|
return loading = false
|
|
|
|
}
|
|
|
|
|
2021-06-08 12:48:31 +00:00
|
|
|
const result = walletModel.accountsView.addAccountsFromPrivateKey(accountPKeyInput.text, passwordInput.text, accountNameInput.text, accountColorInput.selectedColor)
|
2020-12-02 18:51:56 +00:00
|
|
|
|
2020-06-25 19:31:30 +00:00
|
|
|
loading = false
|
fix: prevent crash on generate account wrong password
Fixes #2448.
Currently, if a wrong password is entered when generating a wallet account, the app will crash due to attempting to decode a `GeneratedAccount ` from an rpc response containing only an error.
With this PR, we are detecting if an error is returned in the response, and if so, raising a StatusGoException. This exception is caught in the call chain, and translated in to a `StatusGoError` which is serialised and sent to the QML view, where it is parsed and displayed as an invalid password error in the input box.
refactor: remove string return values as error messages in wallet model
In the wallet model, we were passing back empty strings for no error, or an error as a string. This is not only confusing, but does not benefit from leaning on the compiler and strong types. One has to read the entire code to understand if a string result is returned when there is no error instead of implicitly being able to understand there is no return type.
To alleviate this, account creation fundtions that do not need to return a value have been changed to a void return type, and raise `StatusGoException` if there is an error encountered. This can be caught in the call chain and used as necessary (ie to pass to QML).
refactor: move invalid password string detection to Utils
Currently, we are reading returned view model values and checking to see if they include a known string from Status Go that means there was an invalid password used. This string was placed in the codebased in mulitple locations.
This PR moves the string check to a Utils function and updates all the references to use the function in Utils.
2021-05-13 04:41:48 +00:00
|
|
|
if (result) {
|
|
|
|
let resultJson = JSON.parse(result);
|
|
|
|
errorSound.play();
|
|
|
|
if (Utils.isInvalidPasswordMessage(resultJson.error)) {
|
|
|
|
//% "Wrong password"
|
|
|
|
popup.passwordValidationError = qsTrId("wrong-password")
|
|
|
|
} else {
|
|
|
|
accountError.text = resultJson.error
|
|
|
|
accountError.open()
|
|
|
|
}
|
|
|
|
return
|
2020-06-22 17:26:47 +00:00
|
|
|
}
|
fix: loading of wallet history, display of tx datetime
Fixes: #2539.
Transaction history is now correctly being fetched from status-go as per mobile. Firstly, when accounts are added (ie as watch accounts), `wallet_checkRecentHistory` must be called first so that the status-go db is populated. After that, `wallet_getTransfersByAddress` can be called. On app load, when we run the `initBalance` logic, we are calling `wallet_getTransfersByAddress`, asking for the last 20 transactions with the `loadMore` parameter set to false. When the user navigates to the Wallet > History tab, they can then click “Load More” to fetch more transactions from status-go. Once the number of transactions returns false below the expected amount, the remaining transactions to fetch have been exhausted and the “Load More” button is disabled.
feat: add non-archival node warning to the UI to indicate to the user that they may not have complete results
feat: set active account to the added account
Once an account is added to the wallet, that newly added account is selected as the active account.
1. The “load more” button is active when new transactions that aren’t already displayed are returned from `wallet_getTransfersByAddress`. This is the only way to enable or disable the “Load more” button as status-go is not able to return information regarding whether or not there are more transactions to be fetched. The downside to this is that lets say the last page of transactions is returned, but there are no more pages left. These returned txs are not currently displayed, so the “load more” button will still be enabled. However, the next click of the button will return 0 results, thus disabling it. It’s effectively an extra click to get to the disabled state.
2. For more information on how the `toBlock` parameter operates for the `wallet_getTransfersForAddress` RPC call, see https://notes.status.im/XmENTrVRRaqhwE4gK0m8Mg?view.
2021-05-31 14:03:41 +00:00
|
|
|
popup.onAfterAddAccount()
|
2020-06-09 14:40:56 +00:00
|
|
|
popup.close();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*##^##
|
|
|
|
Designer {
|
|
|
|
D{i:0;formeditorColor:"#ffffff";height:500;width:400}
|
|
|
|
}
|
|
|
|
##^##*/
|