status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore(Qt5.15): Fix qml warnings after qt 5.15 migration 

Fixing QML Connections warnings due to deprecated onFoo handlers. Now we're using function onFoo(params).
Fixing QML compilation error due to js filename format.
Fixing cyclic dependencies between qml components.
This commit is contained in:
Alex Jbanca 2023-01-18 11:25:36 +02:00 committed by Alexandra Betouni
parent db3b63e29d
commit 81a4d70932
43 changed files with 125 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/StatusQ/src/StatusQ/Controls/StatusSeedPhraseInput.qml
View File

@ -176,7 +176,7 @@ Item {
// Consider word inserted if input looses focus while a valid word is present ("user" clicks outside)
Connections {
target: seedWordInput.input.edit
onActiveFocusChanged: {
function onActiveFocusChanged() {
if (!seedWordInput.input.edit.activeFocus && d.isInputValidWord) {
// There are so many side effects regarding focus and doneInsertingWord that we need to reset this flag not to be processed again.
d.isInputValidWord = false

6
ui/app/AppLayouts/Browser/BrowserLayout.qml
View File

@ -596,7 +596,7 @@ StatusSectionLayout {
Connections {
target: _internal.currentWebView
onUrlChanged: {
function onUrlChanged() {
browserHeader.addressBar.text = Web3ProviderStore.obtainAddress(_internal.currentWebView.url)
RootStore.currentTabConnected = Web3ProviderStore.hasWalletConnected(Utils.getHostname(_internal.currentWebView.url))
}
@ -604,14 +604,14 @@ StatusSectionLayout {
Connections {
target: BookmarksStore.bookmarksModel
onModelChanged: {
function onModelChanged() {
browserHeader.currentFavorite = Qt.binding(function () {return BookmarksStore.getCurrentFavorite(_internal.currentWebView.url)})
}
}
Connections {
target: browserSection
onOpenUrl: {
function onOpenUrl(url: string) {
root.openUrlInNewTab(url);
}
}

2
ui/app/AppLayouts/Browser/panels/DownloadBar.qml
View File

@ -85,7 +85,7 @@ Rectangle {
}
Connections {
target: downloadsMenu
onCancelClicked: {
function onCancelClicked() {
isCanceled = true
}
}

2
ui/app/AppLayouts/Browser/panels/DownloadView.qml
View File

@ -61,7 +61,7 @@ import "../controls"
}
Connections {
target: downloadsMenu
onCancelClicked: {
function onCancelClicked() {
isCanceled = true
}
}

2
ui/app/AppLayouts/Browser/popups/BrowserWalletMenu.qml
View File

@ -102,7 +102,7 @@ Popup {
Connections {
target: WalletStore.dappBrowserAccount
onConnectedAccountDeleted: {
function onConnectedAccountDeleted() {
popup.reload()
// This is done because when an account is deleted and the account is updated to default one,
// only the properties are updated and we need to listen to those events and update the selected account

2
ui/app/AppLayouts/Browser/views/WebProviderObj.qml
View File

@ -30,7 +30,7 @@ QtObject {
property Connections conn: Connections {
target: Web3ProviderStore.web3ProviderInst
onPostMessageResult: {
function onPostMessageResult(payloadMethod: string, result: string, chainId: string) {
web3Response(result)
const isSign = ["eth_sign", "personal_sign", "eth_signTypedData", "eth_signTypedData_v3"].indexOf(payloadMethod) > -1
const isTx = payloadMethod === "eth_sendTransaction"

4
ui/app/AppLayouts/Chat/popups/community/CreateChannelPopup.qml
View File

@ -65,11 +65,11 @@ StatusDialog {
enabled: root.opened && root.emojiPopupOpened
target: emojiPopup
onEmojiSelected: function (emojiText, atCursor) {
function onEmojiSelected(emojiText: string, atCursor: bool) {
nameInput.input.asset.isLetterIdenticon = false;
nameInput.input.asset.emoji = emojiText
}
onClosed: {
function onClosed() {
root.emojiPopupOpened = false
}
}

4
ui/app/AppLayouts/Chat/views/CommunityColumnView.qml
View File

@ -124,7 +124,7 @@ Item {
Connections {
target: root.store.communitiesModuleInst
onCommunityAccessRequested: function (communityId) {
function onCommunityAccessRequested(communityId: string) {
if (communityId === communityData.id) {
joinCommunityButton.invitationPending = root.store.isCommunityRequestPending(communityData.id)
}
@ -608,7 +608,7 @@ Item {
Connections {
target: root.store.mainModuleInst
onOpenCommunityMembershipRequestsPopup:{
function onOpenCommunityMembershipRequestsPopup(sectionId: string) {
if(root.store.getMySectionId() != sectionId)
return

2
ui/app/AppLayouts/Chat/views/MembersSelectorView.qml
View File

@ -88,7 +88,7 @@ MembersSelectorBase {
Connections {
enabled: root.visible
target: root.rootStore.contactsStore.mainModuleInst
onResolvedENS: {
function onResolvedENS(resolvedPubKey: string, resolvedAddress: string, uuid: string) {
if (resolvedPubKey === "") {
root.suggestionsDialog.forceHide = false
return

6
ui/app/AppLayouts/Onboarding/OnboardingLayout.qml
View File

@ -138,7 +138,7 @@ OnboardingBasePage {
Connections {
target: root.startupStore.startupModuleInst
onStartupError: {
function onStartupError(error: string, errType: int) {
msgDialog.errType = errType
if (errType === Constants.startupErrorType.setupAccError) {
if (error === Constants.existingAccountError) {
@ -172,10 +172,10 @@ following the \"Add existing Status user\" flow, using your seed phrase.")
msgDialog.open()
}
onDisplayKeycardSharedModuleFlow: {
function onDisplayKeycardSharedModuleFlow() {
keycardPopup.active = true
}
onDestroyKeycardSharedModuleFlow: {
function onDestroyKeycardSharedModuleFlow() {
keycardPopup.active = false
}
}

2
ui/app/AppLayouts/Onboarding/views/ConfirmPasswordView.qml
View File

@ -142,7 +142,7 @@ Item {
Connections {
target: RootStore.privacyModule
onPasswordChanged: {
function onPasswordChanged(success: bool, errorMsg: string) {
if (success) {
submitBtn.loading = false
root.exit();

6
ui/app/AppLayouts/Onboarding/views/LoginView.qml
View File

@ -105,7 +105,7 @@ Item {
Connections{
target: root.startupStore.startupModuleInst
onObtainingPasswordError: {
function onObtainingPasswordError(errorDescription: string, errorType: string) {
if (errorType === Constants.keychain.errorType.authentication) {
// We are notifying user only about keychain errors.
return
@ -120,7 +120,7 @@ Item {
obtainingPasswordErrorNotification.open()
}
onObtainingPasswordSuccess: {
function onObtainingPasswordSuccess(password: string) {
if(localAccountSettings.storeToKeychainValue !== Constants.keychain.storedValue.store)
return
@ -132,7 +132,7 @@ Item {
}
}
onAccountLoginError: {
function onAccountLoginError(error: string) {
if (error) {
if (!root.startupStore.selectedLoginAccount.keycardCreatedAccount) {
// SQLITE_NOTADB: "file is not a database"

3
ui/app/AppLayouts/Profile/ProfileLayout.qml
View File

@ -5,6 +5,7 @@ import QtQuick.Layouts 1.13
import utils 1.0
import shared 1.0
import shared.panels 1.0
import shared.stores 1.0 as SharedStores
import "stores"
import "popups"
@ -193,7 +194,7 @@ StatusSectionLayout {
implicitHeight: parent.height
languageStore: root.store.languageStore
currencyStore: root.store.walletStore.currencyStore
currencyStore: SharedStores.RootStore.currencyStore
sectionTitle: root.store.getNameForSubsection(Constants.settingsSubsection.language)
contentWidth: d.contentWidth
}

4
ui/app/AppLayouts/Profile/popups/ChangePasswordModal.qml
View File

@ -55,7 +55,9 @@ StatusModal {
Connections {
target: root.privacyStore.privacyModule
onPasswordChanged: onChangePasswordResponse(success, errorMsg)
function onPasswordChanged(success: bool, errorMsg: string) {
onChangePasswordResponse(success, errorMsg)
}
}
width: 480

2
ui/app/AppLayouts/Profile/popups/RenameAccontModal.qml
View File

@ -34,7 +34,7 @@ StatusModal {
Connections {
enabled: popup.opened
target: emojiPopup
onEmojiSelected: function (emojiText, atCursor) {
function onEmojiSelected(emojiText: string, atCursor: bool) {
popup.contentItem.accountNameInput.input.asset.emoji = emojiText
}
}

2
ui/app/AppLayouts/Profile/popups/SendContactRequestModal.qml
View File

@ -65,7 +65,7 @@ StatusModal {
Connections {
target: contactsStore.mainModuleInst
onResolvedENS: {
function onResolvedENS(resolvedPubKey: string, resolvedAddress: string, uuid: string) {
if(!d.showChatKeyValidationIndicator){
d.showPasteButton = false
d.showChatKeyValidationIndicator = true

5
ui/app/AppLayouts/Profile/stores/WalletStore.qml
View File

@ -1,6 +1,5 @@
import QtQuick 2.13
import shared.stores 1.0 as SharedStore
import "../../Wallet/stores"
QtObject {
@ -21,9 +20,7 @@ QtObject {
property var importedAccounts: walletSectionAccounts.imported
property var generatedAccounts: walletSectionAccounts.generated
property var watchOnlyAccounts: walletSectionAccounts.watchOnly
property var currencyStore: SharedStore.RootStore.currencyStore
property var currentAccount: walletSectionCurrent
function switchAccountByAddress(address) {

6
ui/app/AppLayouts/Profile/views/EnsDetailsView.qml
View File

@ -57,7 +57,7 @@ Item {
Connections {
target: root.ensUsernamesStore.ensUsernamesModule
onDetailsObtained: {
function onDetailsObtained(ensName: string, address: string, pubkey: string, isStatus: bool, expirationTime: int) {
if(username != (isStatus ? ensName + ".stateofus.eth" : ensName))
return;
walletAddressLbl.subTitle = address;
@ -71,7 +71,7 @@ Item {
&& root.ensUsernamesStore.preferredUsername !== username
d.expirationTimestamp = expirationTime * 1000
}
onLoading: {
function onLoading(isLoading: bool) {
loadingImg.active = isLoading
if (!isLoading)
return;
@ -152,7 +152,7 @@ Item {
}
Connections {
target: root.ensUsernamesStore.ensUsernamesModule
onTransactionWasSent: {
function onTransactionWasSent(txResult: string) {
try {
let response = JSON.parse(txResult)
if (!response.success) {

2
ui/app/AppLayouts/Profile/views/EnsListView.qml
View File

@ -43,7 +43,7 @@ Item {
Connections {
target: root.ensUsernamesStore.ensUsernamesModule
onUsernameConfirmed: {
function onUsernameConfirmed(username: string) {
d.updateNumberOfPendingEnsUsernames()
chatSettingsLabel.visible = true
}

4
ui/app/AppLayouts/Profile/views/EnsSearchView.qml
View File

@ -98,7 +98,7 @@ Item {
}
Connections {
target: root.ensUsernamesStore.ensUsernamesModule
onTransactionWasSent: {
function onTransactionWasSent(txResult: string) {
try {
let response = JSON.parse(txResult)
if (!response.success) {
@ -189,7 +189,7 @@ Item {
Connections {
target: root.ensUsernamesStore.ensUsernamesModule
onUsernameAvailabilityChecked: {
function onUsernameAvailabilityChecked(availabilityStatus: string) {
if(!validate(ensUsername.text)) return;
valid = false;
loading = false;

2
ui/app/AppLayouts/Profile/views/EnsTermsAndConditionsView.qml
View File

@ -85,7 +85,7 @@ Item {
}
Connections {
target: root.ensUsernamesStore.ensUsernamesModule
onTransactionWasSent: {
function onTransactionWasSent(txResult: string) {
try {
let response = JSON.parse(txResult)
if (!response.success) {

4
ui/app/AppLayouts/Profile/views/EnsView.qml
View File

@ -315,14 +315,14 @@ Item {
Connections {
target: ensView
onConnect: {
function onConnect(ensUsername: string) {
addedUsername = ensUsername;
}
}
Connections {
target: ensView.ensUsernamesStore.ensUsernamesModule
onTransactionCompleted: {
function onTransactionCompleted(success: bool, txHash: string, username: string, trxType: string, revertReason: string) {
let title = ""
switch(trxType){
case "RegisterENS":

4
ui/app/AppLayouts/Profile/views/KeycardView.qml
View File

@ -89,10 +89,10 @@ SettingsContentBase {
Connections {
target: root.keycardStore.keycardModule
onDisplayKeycardSharedModuleFlow: {
function onDisplayKeycardSharedModuleFlow() {
keycardPopup.active = true
}
onDestroyKeycardSharedModuleFlow: {
function onDestroyKeycardSharedModuleFlow() {
keycardPopup.active = false
}
onSharedModuleBusy: {

4
ui/app/AppLayouts/Profile/views/MessagingView.qml
View File

@ -238,7 +238,9 @@ SettingsContentBase {
Connections {
target: localAccountSensitiveSettings
onWhitelistedUnfurlingSitesChanged: generalColumn.populatePreviewableSites()
function onWhitelistedUnfurlingSitesChanged() {
generalColumn.populatePreviewableSites()
}
}
// Manually add switch for the image unfurling

8
ui/app/AppLayouts/Wallet/panels/DerivedAddressesPanel.qml
View File

@ -15,7 +15,7 @@ import "../stores"
Item {
id: derivedAddresses
property int selectedAccountType: RootStore.defaultSelectedType
property int selectedAccountType: Constants.AddAccountType.GenerateNew
property string selectedKeyUid: RootStore.defaultSelectedKeyUid
property bool selectedKeyUidMigratedToKeycard: RootStore.defaultSelectedKeyUidMigratedToKeycard
property string selectedPath: ""
@ -52,8 +52,8 @@ Item {
id: _internal
readonly property bool showEnterPinPassButton: !RootStore.loggedInUserAuthenticated &&
derivedAddresses.selectedAccountType !== SelectGeneratedAccount.AddAccountType.ImportSeedPhrase &&
derivedAddresses.selectedAccountType !== SelectGeneratedAccount.AddAccountType.ImportPrivateKey
derivedAddresses.selectedAccountType !== Constants.AddAccountType.ImportSeedPhrase &&
derivedAddresses.selectedAccountType !== Constants.AddAccountType.ImportPrivateKey
property int pageSize: 6
property int noOfPages: Math.ceil(RootStore.derivedAddressesList.count/pageSize)
property int lastPageSize: RootStore.derivedAddressesList.count - ((noOfPages -1) * pageSize)
@ -85,7 +85,7 @@ Item {
Connections {
target: RootStore.derivedAddressesList
onModelReset: {
function onModelReset() {
_internal.pageSize = 0
_internal.pageSize = 6
_internal.nextSelectableAddressIndex = -1

20
ui/app/AppLayouts/Wallet/panels/SelectGeneratedAccount.qml
View File

@ -17,24 +17,16 @@ StatusSelect {
property string selectedKeyUid: userProfile.keyUid
property bool selectedKeyUidMigratedToKeycard: userProfile.isKeycardUser
enum AddAccountType {
GenerateNew,
ImportSeedPhrase,
ImportPrivateKey,
WatchOnly
}
function resetMe() {
_internal.getGeneratedAccountsModel()
selectAccountType.addAccountType = SelectGeneratedAccount.AddAccountType.GenerateNew
selectAccountType.addAccountType = Constants.AddAccountType.GenerateNew
selectAccountType.selectedKeyUid = userProfile.keyUid
selectAccountType.selectedKeyUidMigratedToKeycard = userProfile.isKeycardUser
}
Connections {
target: RootStore.generatedAccountsViewModel
onModelReset: {
function onModelReset() {
_internal.delegateModel.model = RootStore.generatedAccountsViewModel
_internal.getGeneratedAccountsModel()
}
@ -116,10 +108,10 @@ StatusSelect {
titleText.color: Theme.palette.indirectColor1
}
onClicked: {
selectAccountType.addAccountType = (model.name === _internal.importSeedPhraseString) ? SelectGeneratedAccount.AddAccountType.ImportSeedPhrase :
(model.name === _internal.importPrivateKeyString) ? SelectGeneratedAccount.AddAccountType.ImportPrivateKey :
(model.name === _internal.addWatchOnlyAccountString) ? SelectGeneratedAccount.AddAccountType.WatchOnly :
SelectGeneratedAccount.AddAccountType.GenerateNew
selectAccountType.addAccountType = (model.name === _internal.importSeedPhraseString) ? Constants.AddAccountType.ImportSeedPhrase :
(model.name === _internal.importPrivateKeyString) ? Constants.AddAccountType.ImportPrivateKey :
(model.name === _internal.addWatchOnlyAccountString) ? Constants.AddAccountType.WatchOnly :
Constants.AddAccountType.GenerateNew
selectedItem.title = model.name
selectedItem.asset.name = model.iconName
selectedItem.tagsModel = model.generatedModel

22
ui/app/AppLayouts/Wallet/popups/AddAccountModal.qml
View File

@ -42,11 +42,11 @@ StatusModal {
Connections {
target: walletSectionAccounts
onUserAuthenticationSuccess: {
function onUserAuthenticationSuccess(password: string) {
validationError.text = ""
d.password = password
RootStore.loggedInUserAuthenticated = true
if (d.selectedAccountType === SelectGeneratedAccount.AddAccountType.ImportPrivateKey) {
if (d.selectedAccountType === Constants.AddAccountType.ImportPrivateKey) {
d.generateNewAccount()
}
else {
@ -55,7 +55,7 @@ StatusModal {
}
}
}
onUserAuthentiactionFail: {
function onUserAuthentiactionFail() {
d.password = ""
RootStore.loggedInUserAuthenticated = false
validationError.text = qsTr("An authentication failed")
@ -70,7 +70,7 @@ StatusModal {
readonly property int pageNumber: 1
property string password: ""
property int selectedAccountType: RootStore.defaultSelectedType
property int selectedAccountType: Constants.AddAccountType.GenerateNew
property string selectedAccountDerivedFromAddress: ""
property string selectedKeyUid: RootStore.defaultSelectedKeyUid
property bool selectedKeyUidMigratedToKeycard: RootStore.defaultSelectedKeyUidMigratedToKeycard
@ -78,7 +78,7 @@ StatusModal {
property string selectedAddress: ""
property bool selectedAddressAvailable: true
readonly property bool authenticationNeeded: d.selectedAccountType !== SelectGeneratedAccount.AddAccountType.WatchOnly &&
readonly property bool authenticationNeeded: d.selectedAccountType !== Constants.AddAccountType.WatchOnly &&
d.password === ""
property string addAccountIcon: ""
@ -90,7 +90,7 @@ StatusModal {
}
function getDerivedAddressList() {
if(d.selectedAccountType === SelectGeneratedAccount.AddAccountType.ImportSeedPhrase
if(d.selectedAccountType === Constants.AddAccountType.ImportSeedPhrase
&& !!advancedSelection.expandableItem.path
&& !!advancedSelection.expandableItem.mnemonicText) {
RootStore.getDerivedAddressListForMnemonic(advancedSelection.expandableItem.mnemonicText,
@ -113,7 +113,7 @@ StatusModal {
let errMessage = ""
switch(d.selectedAccountType) {
case SelectGeneratedAccount.AddAccountType.GenerateNew:
case Constants.AddAccountType.GenerateNew:
if (d.selectedKeyUidMigratedToKeycard) {
errMessage = RootStore.addNewWalletAccountGeneratedFromKeycard(Constants.generatedWalletType,
accountNameInput.text,
@ -126,16 +126,16 @@ StatusModal {
advancedSelection.expandableItem.derivedFromAddress)
}
break
case SelectGeneratedAccount.AddAccountType.ImportSeedPhrase:
case Constants.AddAccountType.ImportSeedPhrase:
errMessage = RootStore.addAccountsFromSeed(advancedSelection.expandableItem.mnemonicText, d.password,
accountNameInput.text, colorSelectionGrid.selectedColor, accountNameInput.input.asset.emoji,
advancedSelection.expandableItem.completePath)
break
case SelectGeneratedAccount.AddAccountType.ImportPrivateKey:
case Constants.AddAccountType.ImportPrivateKey:
errMessage = RootStore.addAccountsFromPrivateKey(advancedSelection.expandableItem.privateKey, d.password,
accountNameInput.text, colorSelectionGrid.selectedColor, accountNameInput.input.asset.emoji)
break
case SelectGeneratedAccount.AddAccountType.WatchOnly:
case Constants.AddAccountType.WatchOnly:
errMessage = RootStore.addWatchOnlyAccount(advancedSelection.expandableItem.watchAddress, accountNameInput.text,
colorSelectionGrid.selectedColor, accountNameInput.input.asset.emoji)
break
@ -156,7 +156,7 @@ StatusModal {
if (d.authenticationNeeded) {
d.password = ""
if (d.selectedKeyUidMigratedToKeycard &&
d.selectedAccountType === SelectGeneratedAccount.AddAccountType.GenerateNew) {
d.selectedAccountType === Constants.AddAccountType.GenerateNew) {
RootStore.authenticateUserAndDeriveAddressOnKeycardForPath(d.selectedKeyUid, d.selectedPath)
}
else {

5
ui/app/AppLayouts/Wallet/stores/RootStore.qml
View File

@ -3,14 +3,11 @@ pragma Singleton
import QtQuick 2.13
import utils 1.0
import shared.stores 1.0 as SharedStore
import "../panels"
QtObject {
id: root
readonly property int defaultSelectedType: SelectGeneratedAccount.AddAccountType.GenerateNew
readonly property string defaultSelectedKeyUid: userProfile.keyUid
readonly property bool defaultSelectedKeyUidMigratedToKeycard: userProfile.isKeycardUser
@ -24,8 +21,6 @@ QtObject {
property var accountSensitiveSettings: localAccountSensitiveSettings
property bool hideSignPhraseModal: accountSensitiveSettings.hideSignPhraseModal
property var currencyStore: SharedStore.RootStore.currencyStore
property string currentCurrency: currencyStore.currentCurrency
property var totalCurrencyBalance: walletSection.totalCurrencyBalance
property bool tokensLoading: walletSection.tokensLoading
property string signingPhrase: walletSection.signingPhrase

2
ui/app/AppLayouts/Wallet/views/AssetsDetailView.qml
View File

@ -36,7 +36,7 @@ Item {
Connections {
target: walletSectionAllTokens
onTokenHistoricalDataReady: {
function onTokenHistoricalDataReady(tokenDetails: string) {
let response = JSON.parse(tokenDetails)
if (response === null) {
console.debug("error parsing json message for tokenHistoricalDataReady")

61
ui/app/mainui/AppMain.qml
View File

@ -58,29 +58,31 @@ Item {
Connections {
target: rootStore.mainModuleInst
onDisplayUserProfile: Global.openProfilePopup(publicKey)
function onDisplayUserProfile(publicKey: string) {
Global.openProfilePopup(publicKey)
}
onDisplayKeycardSharedModuleFlow: {
function onDisplayKeycardSharedModuleFlow() {
keycardPopup.active = true
}
onDestroyKeycardSharedModuleFlow: {
function onDestroyKeycardSharedModuleFlow() {
keycardPopup.active = false
}
onMailserverWorking: {
function onMailserverWorking() {
mailserverConnectionBanner.hide()
}
onMailserverNotWorking: {
function onMailserverNotWorking() {
mailserverConnectionBanner.show()
}
onActiveSectionChanged: {
function onActiveSectionChanged() {
createChatView.opened = false
}
onOpenActivityCenter: {
function onOpenActivityCenter() {
Global.openPopup(activityCenterPopupComponent)
}
}
@ -99,14 +101,14 @@ Item {
Connections {
target: Global
onOpenLinkInBrowser: {
function onOpenLinkInBrowser(link: string) {
changeAppSectionBySectionId(Constants.appSection.browser)
Qt.callLater(() => browserLayoutContainer.item.openUrlInNewTab(link));
}
onOpenChooseBrowserPopup: {
function onOpenChooseBrowserPopup(link: string) {
Global.openPopup(chooseBrowserPopupComponent, {link: link});
}
onOpenDownloadModalRequested: {
function onOpenDownloadModalRequested(available: bool, version: string, url: string) {
const downloadPage = downloadPageComponent.createObject(appMain,
{
newVersionAvailable: available,
@ -117,52 +119,57 @@ Item {
return downloadPage
}
onOpenImagePopup: {
function onOpenImagePopup(image, contextMenu) {
var popup = imagePopupComponent.createObject(appMain)
popup.contextMenu = contextMenu
popup.openPopup(image)
}
onOpenCreateChatView: {
function onOpenCreateChatView() {
createChatView.opened = true
}
onCloseCreateChatView: {
function onCloseCreateChatView() {
createChatView.opened = false
}
onOpenProfilePopupRequested: {
function onOpenProfilePopupRequested(publicKey: string, parentPopup) {
if (Global.profilePopupOpened) {
appMain.closeProfilePopup()
}
Global.openPopup(profilePopupComponent, {publicKey: publicKey, parentPopup: parentPopup})
Global.profilePopupOpened = true
}
onOpenNicknamePopupRequested: {
function onOpenNicknamePopupRequested(publicKey: string,nickname: string, subtitle: string) {
Global.openPopup(nicknamePopupComponent, {publicKey: publicKey, nickname: nickname, "header.subTitle": subtitle})
}
onBlockContactRequested: {
function onBlockContactRequested(publicKey: string, contactName: string) {
Global.openPopup(blockContactConfirmationComponent, {contactName: contactName, contactAddress: publicKey})
}
onUnblockContactRequested: {
function onUnblockContactRequested(publicKey: string, contactName: string) {
Global.openPopup(unblockContactConfirmationComponent, {contactName: contactName, contactAddress: publicKey})
}
onOpenActivityCenterPopupRequested: {
function onOpenActivityCenterPopupRequested(publicKey: string, contactName: string) {
Global.openPopup(activityCenterPopupComponent)
}
onOpenChangeProfilePicPopup: {
function onOpenChangeProfilePicPopup(cb) {
var popup = changeProfilePicComponent.createObject(appMain, {callback: cb});
popup.chooseImageToCrop();
}
onOpenBackUpSeedPopup: Global.openPopup(backupSeedModalComponent)
onDisplayToastMessage: {
function onOpenBackUpSeedPopup() {
Global.openPopup(backupSeedModalComponent)
}
function onDisplayToastMessage(title: string, subTitle: string, icon: string, loading: bool, ephNotifType: int, url: string) {
appMain.rootStore.mainModuleInst.displayEphemeralNotification(title, subTitle, icon, loading, ephNotifType, url);
}
onOpenEditDisplayNamePopup: Global.openPopup(displayNamePopupComponent)
function onOpenEditDisplayNamePopup() {
Global.openPopup(displayNamePopupComponent)
}
function onOpenPopupRequested(popupComponent, params) {
onOpenPopupRequested: {
if (activePopupComponents.includes(popupComponent)) {
return;
}
@ -181,7 +188,7 @@ Item {
return popup;
}
onOpenLink: {
function onOpenLink(link: string) {
// Qt sometimes inserts random HTML tags; and this will break on invalid URL inside QDesktopServices::openUrl(link)
link = appMain.rootStore.plainText(link);
if (appMain.rootStore.showBrowserSelector) {
@ -196,13 +203,13 @@ Item {
}
}
onSetNthEnabledSectionActive: {
function onSetNthEnabledSectionActive(nthSection: int) {
if(!appMain.rootStore.mainModuleInst)
return
appMain.rootStore.mainModuleInst.setNthEnabledSectionActive(nthSection)
}
onAppSectionBySectionTypeChanged: {
function onAppSectionBySectionTypeChanged(sectionType: int, subsection: int) {
if(!appMain.rootStore.mainModuleInst)
return
@ -598,7 +605,7 @@ Item {
Connections {
target: rootStore.aboutModuleInst
onAppVersionFetched: {
function onAppVersionFetched(available: bool, version: string, url: string) {
rootStore.setLatestVersionInfo(available, version, url);
bannersLayout.processUpdateAvailable()
}

6
ui/app/mainui/AppSearch.qml
View File

@ -28,7 +28,7 @@ Item {
Connections {
target: appSearch.store.locationMenuModel
onModelAboutToBeReset: {
function onModelAboutToBeReset() {
while (searchPopupMenu.takeItem(searchPopupMenu.numDefaultItems)) {
// Delete the item right after the default items
// If takeItem returns null, it means there was nothing to remove
@ -38,7 +38,9 @@ Item {
Connections {
target: appSearch.store.appSearchModule
onAppSearchCompleted: searchPopup.loading = false
function onAppSearchCompleted() {
searchPopup.loading = false
}
}
StatusSearchLocationMenu {

1
ui/imports/shared/polyfill.number.toLocaleString.js → ui/imports/shared/PolyfillNumberToLocaleString.js
View File

@ -1,3 +1,4 @@
.pragma library
// polyfill.number.toLocaleDateString
// Copied from: https://github.com/willsp/polyfill-Number.toLocaleString-with-Locales
// Got this from MDN:

2
ui/imports/shared/controls/ContactsListAndSearch.qml
View File

@ -115,7 +115,7 @@ Item {
Connections {
target: mainModule
onResolvedENS: {
function onResolvedENS(resolvedPubKey: string, resolvedAddress: string, uuid: string) {
chatKey.hasValidSearchResult = false
if (chatKey.text == "") {
ensUsername.text = "";

8
ui/imports/shared/popups/SendModal.qml
View File

@ -48,7 +48,7 @@ StatusDialog {
Connections {
target: store.currentAccount.assets
onModelReset: {
function onModelReset() {
popup.selectedAccount = null
popup.selectedAccount = store.currentAccount
}
@ -393,7 +393,7 @@ StatusDialog {
Connections {
target: store.mainModuleInst
onResolvedENS: {
function onResolvedENS(resolvedPubKey: string, resolvedAddress: string, uuid: string) {
recipientSelector.isPending = false
if(Utils.isValidAddress(resolvedAddress)) {
d.resolvedENSAddress = resolvedAddress
@ -474,7 +474,7 @@ StatusDialog {
Connections {
target: popup.store.walletSectionTransactionsInst
onSuggestedRoutesReady: {
function onSuggestedRoutesReady(suggestedRoutes: string) {
let response = JSON.parse(suggestedRoutes)
if(!!response.error) {
popup.isLoading = false
@ -495,7 +495,7 @@ StatusDialog {
Connections {
target: popup.store.walletSectionTransactionsInst
onTransactionSent: {
function onTransactionSent(txResult: string) {
d.isPendingTx = false
try {
let response = JSON.parse(txResult)

2
ui/imports/shared/qmldir
View File

@ -3,4 +3,4 @@ module shared
DelegateModelGeneralized 1.0 DelegateModelGeneralized.qml
LoadingAnimation 1.0 LoadingAnimation.qml
MacTrafficLights 1.0 MacTrafficLights.qml
NumberPolyFill 1.0 polyfill.number.toLocaleString.js
NumberPolyFill 1.0 PolyfillNumberToLocaleString.js

4
ui/imports/shared/status/StatusChatInput.qml
View File

@ -293,7 +293,7 @@ Rectangle {
enabled: control.emojiPopupOpened
target: emojiPopup
function onEmojiSelected(text, atCursor) {
function onEmojiSelected(text: string, atCursor: bool) {
insertInTextInput(atCursor ? messageInputField.cursorPosition : messageInputField.length, text)
emojiBtn.highlighted = false
messageInputField.forceActiveFocus();
@ -308,7 +308,7 @@ Rectangle {
enabled: control.stickersPopupOpened
target: control.stickersPopup
function onStickerSelected(hashId, packId, url) {
function onStickerSelected(hashId: string, packId: string, url: string ) {
control.stickerSelected(hashId, packId, url)
control.hideExtendedArea();
messageInputField.forceActiveFocus();

2
ui/imports/shared/status/StatusStickerMarket.qml
View File

@ -187,7 +187,7 @@ Item {
}
Connections {
target: root.store.stickersStore.stickersModule
onTransactionWasSent: {
function onTransactionWasSent(txResult: string) {
try {
let response = JSON.parse(txResult)
if (!response.success) {

2
ui/imports/shared/status/StatusStickerPackClickPopup.qml
View File

@ -102,7 +102,7 @@ ModalPopup {
}
Connections {
target: stickerPackDetailsPopup.store.stickersStore.stickersModule
onTransactionWasSent: {
function onTransactionWasSent(txResult: string) {
try {
let response = JSON.parse(txResult)
if (!response.success) {

2
ui/imports/shared/stores/TokenBalanceHistoryStore.qml
View File

@ -51,7 +51,7 @@ ChartStoreBase {
Connections {
target: walletSectionAllTokens
onTokenBalanceHistoryDataReady: (balanceHistory) => {
function onTokenBalanceHistoryDataReady(balanceHistory: string) {
// chainId, address, symbol, timeInterval
let response = JSON.parse(balanceHistory)
if (response === null) {

2
ui/imports/shared/views/EnsResolver.qml
View File

@ -44,7 +44,7 @@ Item {
Connections {
target: mainModule
onResolvedENS: {
function onResolvedENS(resolvedPubKey: string, resolvedAddress: string, uuid: string) {
if (uuid !== root.uuid) {
return
}

2
ui/imports/shared/views/HistoryView.qml
View File

@ -33,7 +33,7 @@ ColumnLayout {
Connections {
target: RootStore.history
onLoadingTrxHistoryChanged: function(isLoading, address) {
function onLoadingTrxHistoryChanged(isLoading: bool, address: string) {
if (historyView.account.address.toLowerCase() === address.toLowerCase()) {
historyView.isLoading = isLoading
}

4
ui/imports/shared/views/chat/LinksMessageView.qml
View File

@ -70,7 +70,7 @@ Column {
id: linkFetchConnections
enabled: false
target: root.messageStore.messageModule
onLinkPreviewDataWasReceived: {
function onLinkPreviewDataWasReceived(previewData: string) {
let response = {}
try {
response = JSON.parse(previewData)
@ -106,7 +106,7 @@ Column {
id: linkCommunityFetchConnections
enabled: false
target: root.store.communitiesModuleInst
function onCommunityAdded(communityId) {
function onCommunityAdded(communityId: string) {
if (communityId !== linkData.communityId) {
return
}

7
ui/imports/utils/Constants.qml
View File

@ -779,6 +779,13 @@ QtObject {
NoError
}
enum AddAccountType {
GenerateNew,
ImportSeedPhrase,
ImportPrivateKey,
WatchOnly
}
readonly property QtObject walletSection: QtObject {
readonly property string cancelledMessage: "cancelled"
}