@@ -154,7 +154,7 @@ Check out Komodo Wallet mobile, available for [Android and iOS](https://atomicde
## License
-For details please refer to our [license](https://github.com/KomodoPlatform/atomicDEX-Desktop/blob/master/LICENSE).
+For details please refer to our [license](https://github.com/KomodoPlatform/komodo-wallet-desktop/blob/master/LICENSE).
This is experimental alpha software - use at your own risk!
diff --git a/atomic_defi_design/Dex/Support/SupportModal.qml b/atomic_defi_design/Dex/Support/SupportModal.qml
index 01d756dcbc..0ea8c92c52 100644
--- a/atomic_defi_design/Dex/Support/SupportModal.qml
+++ b/atomic_defi_design/Dex/Support/SupportModal.qml
@@ -208,7 +208,7 @@ There is a toggle in settings where you can turn on/off the display of these tra
Layout.preferredHeight: column_layout.height
hoverEnabled: true
- onClicked: Qt.openUrlExternally("https://github.com/KomodoPlatform/atomicDEX-Desktop/pull/2296")
+ onClicked: Qt.openUrlExternally("https://github.com/KomodoPlatform/komodo-wallet-desktop/pull/2296")
ColumnLayout
{
diff --git a/ci_tools_atomic_dex/ci_scripts/GLEECDEXinstaller_script.iss b/ci_tools_atomic_dex/ci_scripts/GLEECDEXinstaller_script.iss
index 9620861cdb..a2db7159fe 100644
--- a/ci_tools_atomic_dex/ci_scripts/GLEECDEXinstaller_script.iss
+++ b/ci_tools_atomic_dex/ci_scripts/GLEECDEXinstaller_script.iss
@@ -4,7 +4,7 @@
#define MyAppName "GleecDEX-Desktop"
#define MyAppVersion "0.5.0"
#define MyAppPublisher "Komodo Platform"
-#define MyAppURL "https://github.com/KomodoPlatform/atomicDEX-Desktop"
+#define MyAppURL "https://github.com/KomodoPlatform/komodo-wallet-desktop"
#define MyAppExeName "GleecDEX.exe"
#define MyUserName "smk"
#define CommitHash "cc57ab3"
diff --git a/ci_tools_atomic_dex/util/compare_themes.py b/ci_tools_atomic_dex/util/compare_themes.py
index 40b5f097cd..714b833282 100755
--- a/ci_tools_atomic_dex/util/compare_themes.py
+++ b/ci_tools_atomic_dex/util/compare_themes.py
@@ -10,7 +10,7 @@
Usage: `./compare_themes.py`
'''
-REPO_URL = "https://raw.githubusercontent.com/KomodoPlatform/atomicDEX-Desktop"
+REPO_URL = "https://raw.githubusercontent.com/KomodoPlatform/komodo-wallet-desktop"
BRANCHES = ['smartdex', 'GleecDEX', 'shibadex']
diff --git a/cmake/cfg_hash.cmake b/cmake/cfg_hash.cmake
index 7179dc15d9..3c1c7af15c 100644
--- a/cmake/cfg_hash.cmake
+++ b/cmake/cfg_hash.cmake
@@ -1,5 +1,5 @@
#if (UNIX)
-# execute_process(COMMAND bash -c "git ls-remote https://github.com/KomodoPlatform/atomicdex-desktop-generics refs/heads/main | cut -f 1 | tr -d '\n'"
+# execute_process(COMMAND bash -c "git ls-remote https://github.com/KomodoPlatform/komodo-wallet-desktop-generics refs/heads/main | cut -f 1 | tr -d '\n'"
# OUTPUT_VARIABLE GENERICS_VERSION_ID
# )
# if (NOT EXISTS ${GENERICS_VERSION_ID}.cfg_hash)
diff --git a/cmake/install/macos/osx_post_install.cmake b/cmake/install/macos/osx_post_install.cmake
index bd42ae336c..51f1c6cc4d 100644
--- a/cmake/install/macos/osx_post_install.cmake
+++ b/cmake/install/macos/osx_post_install.cmake
@@ -99,8 +99,49 @@ endif ()
file(COPY ${CMAKE_SOURCE_DIR}/bin/${DEX_PROJECT_NAME}.dmg DESTINATION ${TARGET_APP_PATH})
get_filename_component(QT_ROOT_DIR $ENV{QT_ROOT} DIRECTORY)
-set(IFW_BINDIR ${QT_ROOT_DIR}/Tools/QtInstallerFramework/4.5/bin)
-message(STATUS "IFW_BIN PATH IS ${IFW_BINDIR}")
+set(IFW_ROOT ${QT_ROOT_DIR}/Tools/QtInstallerFramework)
+message(STATUS "IFW_ROOT PATH IS ${IFW_ROOT}")
+execute_process(COMMAND ls ${IFW_ROOT})
+
+# Find all subdirectories
+file(GLOB subdirs "${IFW_ROOT}/*")
+# Initialize variables to track the highest version and folder
+set(IFW_VERSION "")
+# Loop through the subdirectories
+foreach(subdir ${subdirs})
+ get_filename_component(folder_name ${subdir} NAME)
+ message(STATUS "scanning: ${subdir} [${folder_name}]")
+ # Use string manipulation to extract version from folder name
+ string(REGEX MATCH "([0-9]+\\.[0-9]+\\.[0-9]+)" version ${folder_name})
+ # Check if the extracted version is higher than the current highest
+ # TODO: For some reason this var fails to populate in windows
+ if(version STREQUAL "")
+ continue()
+ elseif(version STRGREATER IFW_VERSION)
+ set(IFW_VERSION ${version})
+ endif()
+endforeach()
+# Fallback to last scanned subfolder if variable empty. Usually there is only one folder.
+if(version STREQUAL "")
+ set(IFW_VERSION ${folder_name})
+endif()
+
+message(STATUS "===========================================")
+message(STATUS "Creating Installer")
+set(IFW_BINDIR ${IFW_ROOT}/${IFW_VERSION}/bin)
+message(STATUS ">>>> IFW_BIN PATH IS ${IFW_BINDIR}")
+execute_process(COMMAND ls "${IFW_BINDIR}")
+message(STATUS ">>>> IFW_BIN PATH IS ${PROJECT_APP_PATH}")
+execute_process(COMMAND ls "${PROJECT_APP_PATH}")
+message(STATUS ">>>> IFW_BIN PATH IS ${CMAKE_SOURCE_DIR}")
+execute_process(COMMAND ls "${CMAKE_SOURCE_DIR}")
+message(STATUS ">>>> IFW_BIN PATH IS ${TARGET_APP_PATH}")
+execute_process(COMMAND ls "${TARGET_APP_PATH}")
+message(STATUS ">>>> IFW_BIN PATH IS ${CMAKE_CURRENT_SOURCE_DIR}")
+execute_process(COMMAND ls "${CMAKE_CURRENT_SOURCE_DIR}")
+message(STATUS ">>>> IFW_BIN PATH IS ${CMAKE_CURRENT_SOURCE_DIR}/bin")
+execute_process(COMMAND ls "${CMAKE_CURRENT_SOURCE_DIR}/bin")
+message(STATUS "===========================================")
if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${DEX_PROJECT_NAME}.7z)
message(STATUS "command is: [${IFW_BINDIR}/archivegen ${DEX_PROJECT_NAME}.7z ${PROJECT_APP_PATH} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin]")
execute_process(COMMAND
@@ -111,7 +152,8 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${DEX_PROJECT_NAME}.7z)
else()
message(STATUS "${DEX_PROJECT_NAME}.7z already created - skipping")
endif()
-
+message(STATUS "===========================================")
+execute_process(COMMAND ls ${CMAKE_CURRENT_SOURCE_DIR}/bin )
message(STATUS "Copying ${CMAKE_CURRENT_SOURCE_DIR}/bin/${DEX_PROJECT_NAME}.7z TO ${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/installer/osx/packages/com.komodoplatform.atomicdex/data")
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/bin/${DEX_PROJECT_NAME}.7z DESTINATION ${PROJECT_ROOT_DIR}/ci_tools_atomic_dex/installer/osx/packages/com.komodoplatform.atomicdex/data)
diff --git a/cmake/install/windows/windows_post_install.cmake b/cmake/install/windows/windows_post_install.cmake
index 182391f249..a8c5731415 100644
--- a/cmake/install/windows/windows_post_install.cmake
+++ b/cmake/install/windows/windows_post_install.cmake
@@ -70,16 +70,59 @@ execute_process(COMMAND powershell.exe -File ${PROJECT_ROOT_DIR}/ci_tools_atomic
ERROR_VARIABLE MANIFEST_ERROR)
message(STATUS "manifest output: ${MANIFEST_RESULT} ${MANIFEST_OUTPUT} ${MANIFEST_ERROR}")
+# Set the path to the ifw root directory
+set(IFW_ROOT "$ENV{QT_ROOT}/Tools/QtInstallerFramework")
+message(STATUS "IFW_ROOT PATH IS ${IFW_ROOT}")
+execute_process(COMMAND ls "${IFW_ROOT}")
+# Find all subdirectories
+file(GLOB subdirs "${IFW_ROOT}/*")
+# Initialize variables to track the highest version and folder
+set(IFW_VERSION "")
+# Loop through the subdirectories
+foreach(subdir ${subdirs})
+ get_filename_component(folder_name ${subdir} NAME)
+ message(STATUS "scanning: ${subdir} [${folder_name}]")
+ # Use string manipulation to extract version from folder name
+ string(REGEX MATCH "([0-9]+\\.[0-9]+\\.[0-9]+)" version ${folder_name})
+ # Check if the extracted version is higher than the current highest
+ # TODO: For some reason this var fails to populate in windows
+ if(version STREQUAL "")
+ continue()
+ elseif(version STRGREATER IFW_VERSION)
+ set(IFW_VERSION ${version})
+ endif()
+endforeach()
+# Fallback to last scanned subfolder if variable empty. Usually there is only one folder.
+if(version STREQUAL "")
+ set(IFW_VERSION ${folder_name})
+endif()
+
+message(STATUS "===========================================")
message(STATUS "Creating Installer")
-set(IFW_BINDIR $ENV{QT_ROOT}/Tools/QtInstallerFramework/4.5/bin)
+set(IFW_BINDIR ${IFW_ROOT}/${IFW_VERSION}/bin)
+message(STATUS ">>>> IFW_BIN PATH IS ${IFW_BINDIR}")
+execute_process(COMMAND ls "${IFW_BINDIR}")
+message(STATUS ">>>> IFW_BIN PATH IS ${PROJECT_APP_PATH}")
+execute_process(COMMAND ls "${PROJECT_APP_PATH}")
+message(STATUS ">>>> IFW_BIN PATH IS ${CMAKE_SOURCE_DIR}")
+execute_process(COMMAND ls "${CMAKE_SOURCE_DIR}")
+message(STATUS ">>>> IFW_BIN PATH IS ${TARGET_APP_PATH}")
+execute_process(COMMAND ls "${TARGET_APP_PATH}")
+message(STATUS ">>>> IFW_BIN PATH IS ${CMAKE_CURRENT_SOURCE_DIR}")
+execute_process(COMMAND ls "${CMAKE_CURRENT_SOURCE_DIR}")
+message(STATUS ">>>> IFW_BIN PATH IS ${CMAKE_CURRENT_SOURCE_DIR}/bin")
+execute_process(COMMAND ls "${CMAKE_CURRENT_SOURCE_DIR}/bin")
+message(STATUS "===========================================")
+set(IFW_BINDIR ${IFW_ROOT}/${IFW_VERSION}/bin)
message(STATUS "IFW_BIN PATH IS ${IFW_BINDIR}")
+execute_process(COMMAND ls "${IFW_BINDIR}")
if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${DEX_PROJECT_NAME}.7z)
message(STATUS "Contents of folder: ls ${CMAKE_CURRENT_SOURCE_DIR}")
execute_process(COMMAND ls "${CMAKE_CURRENT_SOURCE_DIR}")
message(STATUS "Contents of folder: ls ${CMAKE_CURRENT_SOURCE_DIR}/bin")
execute_process(COMMAND ls "${CMAKE_CURRENT_SOURCE_DIR}/bin")
message(STATUS "Contents of folder: ls ${CMAKE_CURRENT_SOURCE_DIR}/bundled")
- execute_process(COMMAND ls "${CMAKE_CURRENT_SOURCE_DIR}/bundled")
+ execute_process(COMMAND ls "${PROJECT_ROOT_DIR}/bundled")
message(STATUS "command is: [${IFW_BINDIR}/archivegen.exe ${DEX_PROJECT_NAME}.7z ${PROJECT_APP_PATH} WORKING_DIRECTORY ${PROJECT_ROOT_DIR}/bundled]")
execute_process(COMMAND
${IFW_BINDIR}/archivegen.exe ${DEX_PROJECT_NAME}.7z ${PROJECT_APP_PATH}
diff --git a/cmake/project.metadata.cmake b/cmake/project.metadata.cmake
index e6b9adf429..664dbdfc7e 100644
--- a/cmake/project.metadata.cmake
+++ b/cmake/project.metadata.cmake
@@ -15,7 +15,7 @@ set(DEX_PRIMARY_COIN "LTC")
set(DEX_SECOND_PRIMARY_COIN "KMD") ## Second main coin of the DEX, will be enabled by default and will be the default right ticker for trading
option(DISABLE_GEOBLOCKING "Enable to disable geoblocking (for dev purpose)" OFF)
set(DEX_REPOSITORY_OWNER ${DEX_COMPANY})
-set(DEX_REPOSITORY_NAME "atomicDEX-Desktop")
+set(DEX_REPOSITORY_NAME "komodo-wallet-desktop")
set(DEX_CHECKSUM_API_URL "https://komodo.earth/static/checksum.json")
if (APPLE)
set(DEX_APPDATA_FOLDER "Komodo Wallet")
diff --git a/src/core/atomicdex/pages/qt.wallet.page.hpp b/src/core/atomicdex/pages/qt.wallet.page.hpp
index 8e52e47568..97b90f739f 100644
--- a/src/core/atomicdex/pages/qt.wallet.page.hpp
+++ b/src/core/atomicdex/pages/qt.wallet.page.hpp
@@ -79,8 +79,8 @@ namespace atomic_dex
// QML API
Q_INVOKABLE void validate_address(QString address);
Q_INVOKABLE void validate_address(QString address, QString ticker);
- Q_INVOKABLE void convert_address(QString from, QVariant to_address_format); // https://developers.atomicdex.io/basic-docs/atomicdex/atomicdex-api.html#convertaddress
- Q_INVOKABLE void convert_address(QString from, QString ticker, QVariant to_address_format); // https://developers.atomicdex.io/basic-docs/atomicdex/atomicdex-api.html#convertaddress
+ Q_INVOKABLE void convert_address(QString from, QVariant to_address_format); // https://developers.atomicdex.io/basic-docs/atomicdex/komodo-defi-framework.html#convertaddress
+ Q_INVOKABLE void convert_address(QString from, QString ticker, QVariant to_address_format); // https://developers.atomicdex.io/basic-docs/atomicdex/komodo-defi-framework.html#convertaddress
Q_INVOKABLE void claim_rewards();
Q_INVOKABLE void claim_faucet();
Q_INVOKABLE void broadcast(const QString& tx_hex, bool is_claiming, bool is_max, const QString& amount);
+ 
@@ -108,44 +108,44 @@ Check out Komodo Wallet mobile, available for [Android and iOS](https://atomicde
