From 7dcc89ed3b7529d51c58996efd5ed870c6f5e821 Mon Sep 17 00:00:00 2001 From: Sale Djenic Date: Fri, 22 Mar 2024 10:48:58 +0100 Subject: [PATCH] fix(ui-tests): shared addresses popup page removed since we don't need it any more Since we merged editing revealed addresses into request to join community popup, cause it logically belongs there, the relevant qml file is removed from story book. --- storybook/pages/CommunityIntroDialogPage.qml | 8 +- storybook/pages/SharedAddressesPopupPage.qml | 185 ------------------- 2 files changed, 4 insertions(+), 189 deletions(-) delete mode 100644 storybook/pages/SharedAddressesPopupPage.qml diff --git a/storybook/pages/CommunityIntroDialogPage.qml b/storybook/pages/CommunityIntroDialogPage.qml index bd3ffc460c..c3ac2ffbb6 100644 --- a/storybook/pages/CommunityIntroDialogPage.qml +++ b/storybook/pages/CommunityIntroDialogPage.qml @@ -41,8 +41,8 @@ SplitView { CommunityIntroDialog { id: dialog anchors.centerIn: parent - name: "Status" - imageSrc: ModelsData.icons.status + communityName: "Status" + communityIcon: ModelsData.icons.status introMessage: "%1 sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. 1. Ut enim ad minim veniam @@ -52,7 +52,6 @@ SplitView { 5. 🚗 consectetur adipiscing elit Nemo enim 😋 ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt.".arg(dialog.name) - loginType: ctrlLoginType.currentIndex requirementsCheckPending: false walletAccountsModel: WalletAccountsModel {} @@ -66,7 +65,8 @@ Nemo enim 😋 ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, onPrepareForSigning: logs.logEvent("CommunityIntroDialog::onPrepareForSigning", ["airdropAddress", "sharedAddresses"], arguments) onJoinCommunity: logs.logEvent("CommunityIntroDialog::onJoinCommunity") - onSignSharedAddressesForAllNonKeycardKeypairs: logs.logEvent("CommunityIntroDialog::onSignSharedAddressesForAllNonKeycardKeypairs") + onEditRevealedAddresses: logs.logEvent("CommunityIntroDialog::editRevealedAddresses") + onSignProfileKeypairAndAllNonKeycardKeypairs: logs.logEvent("CommunityIntroDialog::editRevealedAddresses") onSignSharedAddressesForKeypair: logs.logEvent("CommunityIntroDialog::onSignSharedAddressesForKeypair", ["keyUid"], arguments) onSharedAddressesUpdated: logs.logEvent("CommunityIntroDialog::onSharedAddressesUpdated", ["sharedAddresses"], arguments) getCurrencyAmount: function (balance, symbol) { diff --git a/storybook/pages/SharedAddressesPopupPage.qml b/storybook/pages/SharedAddressesPopupPage.qml deleted file mode 100644 index 6bbbbb9719..0000000000 --- a/storybook/pages/SharedAddressesPopupPage.qml +++ /dev/null @@ -1,185 +0,0 @@ -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Layouts 1.15 -import QtQml 2.15 - -import Storybook 1.0 -import Models 1.0 - -import AppLayouts.Communities.popups 1.0 -import AppLayouts.Wallet.stores 1.0 - -SplitView { - id: root - Logs { id: logs } - - ListModel { - id: emptyModel - } - - readonly property WalletAssetsStore walletAssetStore: WalletAssetsStore { - assetsWithFilteredBalances: walletAssetStore.groupedAccountsAssetsModel - } - - Component { - id: dlgComponent - SharedAddressesPopup { - //anchors.centerIn: parent - isEditMode: ctrlEditMode.checked - communityName: "Decentraland" - communityIcon: ModelsData.assets.uni - loginType: ctrlLoginType.currentIndex - walletAccountsModel: WalletAccountsModel {} - permissionsModel: { - if (ctrlPermissions.checked && ctrlTokenGatedChannels.checked) { - return PermissionsModel.complexCombinedPermissionsModel - } - if (ctrlPermissions.checked) { - return PermissionsModel.complexPermissionsModel - } - if (ctrlTokenGatedChannels.checked) { - return PermissionsModel.channelsOnlyPermissionsModel - } - - console.warn("!!! EMPTY MODEL !!!") - return emptyModel - } - - walletAssetsModel: walletAssetStore.groupedAccountAssetsModel - - assetsModel: AssetsModel {} - collectiblesModel: CollectiblesModel {} - visible: true - - onShareSelectedAddressesClicked: logs.logEvent("::shareSelectedAddressesClicked", ["airdropAddress", "sharedAddresses"], arguments) - onSharedAddressesChanged: logs.logEvent("::sharedAddressesChanged", ["airdropAddress", "sharedAddresses"], arguments) - onPrepareForSigning: logs.logEvent("::onPrepareForSigning", ["airdropAddress", "sharedAddresses"], arguments) - onEditRevealedAddresses: logs.logEvent("::onEditRevealedAddresses") - onSignSharedAddressesForAllNonKeycardKeypairs: logs.logEvent("::onSignSharedAddressesForAllNonKeycardKeypairs") - onSignSharedAddressesForKeypair: logs.logEvent("::onSignSharedAddressesForKeypair", ["keyUid"], arguments) - onClosed: destroy() - getCurrencyAmount: function (balance, symbol) { - return ({ - amount: balance, - symbol: symbol.toUpperCase(), - displayDecimals: 2, - stripTrailingZeroes: false - }) - } - } - } - - property var dialog - - function createAndOpenDialog() { - dialog = dlgComponent.createObject(root) - dialog.open() - } - - Component.onCompleted: createAndOpenDialog() - - SplitView { - orientation: Qt.Vertical - SplitView.fillWidth: true - - Pane { - id: pane - - SplitView.fillWidth: true - SplitView.fillHeight: true - - PopupBackground { - anchors.fill: parent - } - - Button { - anchors.centerIn: parent - text: "Reopen" - - onClicked: createAndOpenDialog() - } - } - - LogsAndControlsPanel { - id: logsAndControlsPanel - - SplitView.minimumHeight: 100 - SplitView.preferredHeight: 150 - - logsView.logText: logs.logText - } - } - - Pane { - SplitView.minimumWidth: 300 - SplitView.preferredWidth: 300 - - ColumnLayout { - anchors.fill: parent - - Switch { - id: ctrlPermissions - text: "With permissions" - checked: true - } - - Switch { - id: ctrlTokenGatedChannels - text: "With token gated channels" - checked: true - } - - Switch { - id: ctrlEditMode - text: "Edit mode" - } - - ColumnLayout { - visible: ctrlEditMode.checked - Label { - Layout.fillWidth: true - text: "Login type" - } - - ComboBox { - id: ctrlLoginType - Layout.fillWidth: true - model: ["Password","Biometrics","Keycard"] - } - } - - Rectangle { - Layout.fillWidth: true - Layout.preferredHeight: 1 - color: "lightgray" - } - - Text { - text: "Info" - font.bold: true - } - - Text { - Layout.fillWidth: true - text: "Shared addresses: %1".arg(!!dialog ? dialog.selectedSharedAddresses.join(";") : "") - wrapMode: Text.WrapAtWordBoundaryOrAnywhere - } - - Text { - Layout.fillWidth: true - text: "Airdrop address: %1".arg(!!dialog ? dialog.selectedAirdropAddress : "") - wrapMode: Text.WrapAtWordBoundaryOrAnywhere - } - - Item { - Layout.fillHeight: true - } - } - } -} - -// category: Popups - -// https://www.figma.com/file/17fc13UBFvInrLgNUKJJg5/Kuba%E2%8E%9CDesktop?node-id=31461%3A564367&mode=dev -// https://www.figma.com/file/17fc13UBFvInrLgNUKJJg5/Kuba%E2%8E%9CDesktop?node-id=31461%3A563905&mode=dev -// https://www.figma.com/file/17fc13UBFvInrLgNUKJJg5/Kuba%E2%8E%9CDesktop?node-id=31461%3A579875&mode=dev