diff --git a/scripts/password-hash.py b/scripts/password-hash.py index 3de9dd317d..d6830d72bc 100644 --- a/scripts/password-hash.py +++ b/scripts/password-hash.py @@ -6,7 +6,7 @@ password = input() hasher = sha3.keccak_256() hasher.update(password.encode()) -hash = '0x' + hasher.hexdigest().upper() +hash = '0x' + hasher.hexdigest() pyperclip.copy(hash) -print(f'Hash: {hash} is copied to clipboard') \ No newline at end of file +print(f'Hash: {hash} is copied to clipboard') diff --git a/src/app_service/service/ens/service.nim b/src/app_service/service/ens/service.nim index b370d8c282..906b1b721a 100644 --- a/src/app_service/service/ens/service.nim +++ b/src/app_service/service/ens/service.nim @@ -143,7 +143,11 @@ QtObject: var response: JsonNode try: - response = status_ens.getEnsUsernames().result + let rpcResponse = status_ens.getEnsUsernames() + if rpcResponse.error != nil: + error "failed to get ens usernames", procName="getAllMyEnsUsernames", error = $rpcResponse.error + return + response = rpcResponse.result except Exception as e: error "error occurred", procName="getAllMyEnsUsernames", msg = e.msg return diff --git a/ui/app/AppLayouts/Profile/ProfileLayout.qml b/ui/app/AppLayouts/Profile/ProfileLayout.qml index a160bc4180..4dd882cf5c 100644 --- a/ui/app/AppLayouts/Profile/ProfileLayout.qml +++ b/ui/app/AppLayouts/Profile/ProfileLayout.qml @@ -82,9 +82,7 @@ StatusSectionLayout { root.store.backButtonName = "" - if (currentIndex === Constants.settingsSubsection.ensUsernames) { - ensContainer.item.goToStart() - } else if (currentIndex === Constants.settingsSubsection.contacts) { + if (currentIndex === Constants.settingsSubsection.contacts) { root.store.backButtonName = root.store.getNameForSubsection(Constants.settingsSubsection.messaging) } else if (currentIndex === Constants.settingsSubsection.wallet) { walletView.item.resetStack() diff --git a/ui/app/AppLayouts/Profile/views/EnsListView.qml b/ui/app/AppLayouts/Profile/views/EnsListView.qml index 2b4f1a6b38..e5c337a062 100644 --- a/ui/app/AppLayouts/Profile/views/EnsListView.qml +++ b/ui/app/AppLayouts/Profile/views/EnsListView.qml @@ -230,6 +230,7 @@ Item { amISender: false sender.displayName: root.ensUsernamesStore.preferredUsername sender.profileImage.assetSettings.isImage: true + sender.profileImage.assetSettings.color: Utils.colorForPubkey(root.ensUsernamesStore.pubkey) sender.profileImage.name: root.ensUsernamesStore.icon } } diff --git a/ui/app/AppLayouts/Profile/views/EnsView.qml b/ui/app/AppLayouts/Profile/views/EnsView.qml index 8323ab2123..cea5d2e64b 100644 --- a/ui/app/AppLayouts/Profile/views/EnsView.qml +++ b/ui/app/AppLayouts/Profile/views/EnsView.qml @@ -31,26 +31,19 @@ Item { signal goToWelcome(); signal goToList(); - function goToStart(){ - if(ensView.ensUsernamesStore.ensUsernamesModel.count > 0){ - goToList(); - } else { - goToWelcome(); - } - } - Layout.fillHeight: true Layout.fillWidth: true clip: true DSM.StateMachine { id: stateMachine - initialState: welcomeState + initialState: ensView.ensUsernamesStore.ensUsernamesModel.count > 0 ? listState : welcomeState running: true DSM.State { id: welcomeState onEntered: loader.sourceComponent = welcome + DSM.SignalTransition { targetState: searchState signal: next diff --git a/ui/app/AppLayouts/Profile/views/EnsWelcomeView.qml b/ui/app/AppLayouts/Profile/views/EnsWelcomeView.qml index 025163f792..8e9fae8006 100644 --- a/ui/app/AppLayouts/Profile/views/EnsWelcomeView.qml +++ b/ui/app/AppLayouts/Profile/views/EnsWelcomeView.qml @@ -40,7 +40,7 @@ Item { anchors.top: parent.top anchors.horizontalCenter: parent.horizontalCenter fillMode: Image.PreserveAspectFit - source: Style.png("ens-header-" + Style.current.name + "@2x") + source: Style.png("ens/ens-header-" + Style.current.name + "@2x") cache: false } diff --git a/ui/imports/assets/png/ens/ens-header-dark@2x.png b/ui/imports/assets/png/ens/ens-header-dark@2x.png new file mode 100644 index 0000000000..e552a8343f Binary files /dev/null and b/ui/imports/assets/png/ens/ens-header-dark@2x.png differ diff --git a/ui/imports/assets/png/ens/ens-header-light@2x.png b/ui/imports/assets/png/ens/ens-header-light@2x.png new file mode 100644 index 0000000000..ab3a0ed13c Binary files /dev/null and b/ui/imports/assets/png/ens/ens-header-light@2x.png differ