diff --git a/apps/amm/config/LogosWallet.qmldir b/apps/amm/config/LogosWallet.qmldir new file mode 100644 index 0000000..d13b8dc --- /dev/null +++ b/apps/amm/config/LogosWallet.qmldir @@ -0,0 +1,10 @@ +module Logos.Wallet +WalletControl 1.0 WalletControl.qml +TransactionConfirmationDialog 1.0 TransactionConfirmationDialog.qml +SubmittedTransaction 1.0 SubmittedTransaction.qml +CopyButton 1.0 CopyButton.qml +WalletIconButton 1.0 WalletIconButton.qml +AccountDelegate 1.0 AccountDelegate.qml +CreateAccountDialog 1.0 CreateAccountDialog.qml +CreateWalletDialog 1.0 CreateWalletDialog.qml +WalletMessageDialog 1.0 WalletMessageDialog.qml diff --git a/apps/amm/flake.nix b/apps/amm/flake.nix index 8d6c712..2d8e8b4 100644 --- a/apps/amm/flake.nix +++ b/apps/amm/flake.nix @@ -90,9 +90,11 @@ }; }; postInstall = '' - # The builder installs the view under lib/qml after this hook. Its - # import descriptor points back to this compiled shared QML module. - test -f ${./qml}/Logos/Wallet/qmldir + # Basecamp sandboxes a ui_qml view and deliberately blocks native QML + # plugins. The wallet controls are QML-only, so package their source + # files with a plain qmldir rather than the generated descriptor that + # points at logos_wallet_qmlplugin. + test -f ${./config/LogosWallet.qmldir} walletQmlDir="shared-wallet/qml/Logos/Wallet" if [ ! -d "$walletQmlDir" ]; then @@ -101,8 +103,9 @@ fi walletQmlInstallDir="$out/lib/Logos/Wallet" mkdir -p "$walletQmlInstallDir" - cp -r "$walletQmlDir/." "$walletQmlInstallDir/" - test -f "$walletQmlInstallDir/qmldir" + cp "$walletQmlDir"/*.qml "$walletQmlInstallDir/" + cp -r "$walletQmlDir/icons" "$walletQmlInstallDir/" + install -m 0644 ${./config/LogosWallet.qmldir} "$walletQmlInstallDir/qmldir" ''; }; diff --git a/apps/amm/qml/Logos/Wallet/qmldir b/apps/amm/qml/Logos/Wallet/qmldir deleted file mode 100644 index 866351b..0000000 --- a/apps/amm/qml/Logos/Wallet/qmldir +++ /dev/null @@ -1,5 +0,0 @@ -module Logos.Wallet -optional plugin logos_wallet_qmlplugin ../../../Logos/Wallet -classname Logos_WalletPlugin -prefer :/qt/qml/Logos/Wallet/ -depends QtQuick diff --git a/apps/amm/qml/components/liquidity/TokenSelectorModal.qml b/apps/amm/qml/components/liquidity/TokenSelectorModal.qml index 91a9f37..0453bcb 100644 --- a/apps/amm/qml/components/liquidity/TokenSelectorModal.qml +++ b/apps/amm/qml/components/liquidity/TokenSelectorModal.qml @@ -32,7 +32,6 @@ Popup { signal tokenSelected(var token) signal tokenEntered(string value) - parent: Overlay.overlay x: parent ? Math.round((parent.width - width) / 2) : 0 y: parent ? Math.round((parent.height - height) / 2) : 0 width: parent && parent.width > 32 diff --git a/apps/amm/qml/pages/LiquidityPage.qml b/apps/amm/qml/pages/LiquidityPage.qml index 3d0229a..12387ac 100644 --- a/apps/amm/qml/pages/LiquidityPage.qml +++ b/apps/amm/qml/pages/LiquidityPage.qml @@ -299,7 +299,7 @@ Item { id: liquidityActivityNotice objectName: "liquidityActivityNotice" - parent: Overlay.overlay + parent: root anchors.top: parent.top anchors.right: parent.right anchors.topMargin: 16