fix(JoinCommunityView): Change Reveal Address button icon based on auth type
This commit is contained in:
parent
b72fff3f04
commit
5dc60f5782
|
@ -41,6 +41,7 @@ Nemo enim 😋 ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit,
|
||||||
property bool isInvitationPending: true
|
property bool isInvitationPending: true
|
||||||
property bool isJoinRequestRejected: false
|
property bool isJoinRequestRejected: false
|
||||||
property bool requiresRequest: false
|
property bool requiresRequest: false
|
||||||
|
property int loginType: Constants.LoginType.Biometrics
|
||||||
|
|
||||||
property var communityHoldingsModel: PermissionsModel.shortPermissionsModel
|
property var communityHoldingsModel: PermissionsModel.shortPermissionsModel
|
||||||
property var viewOnlyHoldingsModel: PermissionsModel.shortPermissionsModel
|
property var viewOnlyHoldingsModel: PermissionsModel.shortPermissionsModel
|
||||||
|
@ -116,6 +117,7 @@ Nemo enim 😋 ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit,
|
||||||
joinCommunity: d.joinCommunity
|
joinCommunity: d.joinCommunity
|
||||||
accessType: d.accessType
|
accessType: d.accessType
|
||||||
isInvitationPending: d.isInvitationPending
|
isInvitationPending: d.isInvitationPending
|
||||||
|
loginType: d.loginType
|
||||||
|
|
||||||
// Blur background properties:
|
// Blur background properties:
|
||||||
membersCount: d.membersCount
|
membersCount: d.membersCount
|
||||||
|
@ -280,6 +282,21 @@ Nemo enim 😋 ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit,
|
||||||
onViewAndPostHoldingsModelChanged: d.viewAndPostHoldingsModel = viewAndPostHoldingsModel
|
onViewAndPostHoldingsModelChanged: d.viewAndPostHoldingsModel = viewAndPostHoldingsModel
|
||||||
onModerateHoldingsModelChanged: d.moderateHoldingsModel = moderateHoldingsModel
|
onModerateHoldingsModelChanged: d.moderateHoldingsModel = moderateHoldingsModel
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ColumnLayout {
|
||||||
|
Label {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
text: "Login type"
|
||||||
|
}
|
||||||
|
|
||||||
|
ComboBox {
|
||||||
|
id: loginTypeComboBox
|
||||||
|
Layout.fillWidth: true
|
||||||
|
model: ["Password","Biometrics","Keycard"]
|
||||||
|
onActivated: d.loginType = currentIndex
|
||||||
|
Component.onCompleted: currentIndex = d.loginType
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -72,6 +72,7 @@ StackLayout {
|
||||||
notificationCount: activityCenterStore.unreadNotificationsCount
|
notificationCount: activityCenterStore.unreadNotificationsCount
|
||||||
hasUnseenNotifications: activityCenterStore.hasUnseenNotifications
|
hasUnseenNotifications: activityCenterStore.hasUnseenNotifications
|
||||||
openCreateChat: rootStore.openCreateChat
|
openCreateChat: rootStore.openCreateChat
|
||||||
|
loginType: root.rootStore.loginType
|
||||||
onNotificationButtonClicked: Global.openActivityCenterPopup()
|
onNotificationButtonClicked: Global.openActivityCenterPopup()
|
||||||
onAdHocChatButtonClicked: rootStore.openCloseCreateChatView()
|
onAdHocChatButtonClicked: rootStore.openCloseCreateChatView()
|
||||||
onRevealAddressClicked: {
|
onRevealAddressClicked: {
|
||||||
|
|
|
@ -11,6 +11,7 @@ import AppLayouts.Chat.helpers 1.0
|
||||||
import AppLayouts.Chat.controls.community 1.0
|
import AppLayouts.Chat.controls.community 1.0
|
||||||
|
|
||||||
import SortFilterProxyModel 0.2
|
import SortFilterProxyModel 0.2
|
||||||
|
import utils 1.0
|
||||||
|
|
||||||
|
|
||||||
Control {
|
Control {
|
||||||
|
@ -28,6 +29,7 @@ Control {
|
||||||
property var viewAndPostHoldingsModel
|
property var viewAndPostHoldingsModel
|
||||||
property var moderateHoldingsModel
|
property var moderateHoldingsModel
|
||||||
property bool showOnlyPanels: false
|
property bool showOnlyPanels: false
|
||||||
|
property int loginType: Constants.LoginType.Password
|
||||||
|
|
||||||
property var assetsModel
|
property var assetsModel
|
||||||
property var collectiblesModel
|
property var collectiblesModel
|
||||||
|
@ -58,6 +60,11 @@ Control {
|
||||||
function getRevealAddressText() {
|
function getRevealAddressText() {
|
||||||
return root.joinCommunity ? (root.requiresRequest ? d.communityRevealAddressWithRequestText : d.communityRevealAddressText) : d.channelRevealAddressText
|
return root.joinCommunity ? (root.requiresRequest ? d.communityRevealAddressWithRequestText : d.communityRevealAddressText) : d.channelRevealAddressText
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function getRevealAddressIcon() {
|
||||||
|
if(root.loginType == Constants.LoginType.Password) return "password"
|
||||||
|
return root.loginType == Constants.LoginType.Biometrics ? "touch-id" : "keycard"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
padding: 35 // default by design
|
padding: 35 // default by design
|
||||||
|
@ -106,6 +113,7 @@ Control {
|
||||||
Layout.alignment: Qt.AlignHCenter
|
Layout.alignment: Qt.AlignHCenter
|
||||||
visible: !root.showOnlyPanels && !root.isJoinRequestRejected
|
visible: !root.showOnlyPanels && !root.isJoinRequestRejected
|
||||||
text: root.isInvitationPending ? d.getInvitationPendingText() : d.getRevealAddressText()
|
text: root.isInvitationPending ? d.getInvitationPendingText() : d.getRevealAddressText()
|
||||||
|
icon.name: root.isInvitationPending ? "" : d.getRevealAddressIcon()
|
||||||
font.pixelSize: 13
|
font.pixelSize: 13
|
||||||
enabled: root.requirementsMet
|
enabled: root.requirementsMet
|
||||||
onClicked: root.isInvitationPending ? root.invitationPendingClicked() : root.revealAddressClicked()
|
onClicked: root.isInvitationPending ? root.invitationPendingClicked() : root.revealAddressClicked()
|
||||||
|
|
|
@ -234,6 +234,8 @@ QtObject {
|
||||||
|
|
||||||
property bool isDebugEnabled: advancedModule ? advancedModule.isDebugEnabled : false
|
property bool isDebugEnabled: advancedModule ? advancedModule.isDebugEnabled : false
|
||||||
|
|
||||||
|
readonly property int loginType: getLoginType()
|
||||||
|
|
||||||
property var stickersStore: StickersStore {
|
property var stickersStore: StickersStore {
|
||||||
stickersModule: stickersModuleInst
|
stickersModule: stickersModuleInst
|
||||||
}
|
}
|
||||||
|
@ -656,6 +658,17 @@ QtObject {
|
||||||
return globalUtilsInst.hex2Eth(value)
|
return globalUtilsInst.hex2Eth(value)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function getLoginType() {
|
||||||
|
if(!userProfileInst)
|
||||||
|
return Constants.LoginType.Password
|
||||||
|
|
||||||
|
if(userProfileInst.usingBiometricLogin)
|
||||||
|
return Constants.LoginType.Biometrics
|
||||||
|
else if(userProfileInst.isKeycardUser)
|
||||||
|
return Constants.LoginType.Keycard
|
||||||
|
else return Constants.LoginType.Password
|
||||||
|
}
|
||||||
|
|
||||||
readonly property Connections communitiesModuleConnections: Connections {
|
readonly property Connections communitiesModuleConnections: Connections {
|
||||||
target: communitiesModuleInst
|
target: communitiesModuleInst
|
||||||
function onImportingCommunityStateChanged(communityId, state, errorMsg) {
|
function onImportingCommunityStateChanged(communityId, state, errorMsg) {
|
||||||
|
|
|
@ -36,6 +36,7 @@ StatusSectionLayout {
|
||||||
property bool requirementsMet: true
|
property bool requirementsMet: true
|
||||||
property bool isJoinRequestRejected: false
|
property bool isJoinRequestRejected: false
|
||||||
property bool requiresRequest: false
|
property bool requiresRequest: false
|
||||||
|
property alias loginType: overlayPannel.loginType
|
||||||
|
|
||||||
property var communityHoldingsModel
|
property var communityHoldingsModel
|
||||||
property var viewOnlyHoldingsModel
|
property var viewOnlyHoldingsModel
|
||||||
|
|
|
@ -858,6 +858,12 @@ QtObject {
|
||||||
NoError
|
NoError
|
||||||
}
|
}
|
||||||
|
|
||||||
|
enum LoginType {
|
||||||
|
Password,
|
||||||
|
Biometrics,
|
||||||
|
Keycard
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
readonly property QtObject walletSection: QtObject {
|
readonly property QtObject walletSection: QtObject {
|
||||||
readonly property string cancelledMessage: "cancelled"
|
readonly property string cancelledMessage: "cancelled"
|
||||||
|
|
Loading…
Reference in New Issue