Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename #2320

Merged
merged 16 commits into from
Jul 9, 2023
Merged

Rename #2320

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Please describe what you expected to happen.
**Operating Environment(s):**
- OS: [e.g. Windows/OSX/Linux. If Linux, include distro. ]
- OS version: [e.g. 7/10/11, 10.13/10.15, 18.04/20.04 ]
- AtomicDEX Version: [e.g. 0.5.8]
- Komodo Wallet Version: [e.g. 0.6.0]
- Build branch: [e.g. master/dev]


Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/atomicdex-desktop-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ on:
- temporary_disabled

env:
DEX_PROJECT_NAME: "atomicdex-desktop"
DEX_DISPLAY_NAME: "AtomicDex Desktop"
DEX_PROJECT_NAME: "komodo-wallet"
DEX_DISPLAY_NAME: "Komodo Wallet"
DEX_COMPANY: "KomodoPlatform"
DEX_VERSION: "0.5.8"
DEX_VERSION: "0.6.0"
DEX_WEBSITE: "https://atomicdex.io/"

jobs:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/atomicdex-desktop-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ env:
DEX_API: "mm2"
DEX_RPCPORT: 7762
DEX_RPC: "http://127.0.0.1:7762"
DEX_PROJECT_NAME: "atomicdex-desktop"
DEX_DISPLAY_NAME: "AtomicDex Desktop"
DEX_PROJECT_NAME: "komodo-wallet"
DEX_DISPLAY_NAME: "Komodo Wallet"
DEX_COMPANY: "KomodoPlatform"
DEX_VERSION: "0.5.8"
DEX_VERSION: "0.6.0"
DEX_WEBSITE: "https://atomicdex.io/"
VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/b/vcpkg_cache
VCPKG_BINARY_SOURCES: clear;x-gha,readwrite
Expand Down Expand Up @@ -215,7 +215,7 @@ jobs:



- name: Build AtomicDEX (MacOS)
- name: Build Komodo Wallet (MacOS)
if: runner.os == 'macOS'
run: |
xcrun --sdk macosx --show-sdk-path
Expand All @@ -239,7 +239,7 @@ jobs:



- name: Build AtomicDEX (Linux)
- name: Build Komodo Wallet (Linux)
if: runner.os == 'Linux'
run: |
export QT_INSTALL_CMAKE_PATH=${{ github.workspace }}/Qt/${{ matrix.qt }}/gcc_64/lib/cmake
Expand All @@ -257,7 +257,7 @@ jobs:
./ci_tools_atomic_dex bundle ${{ matrix.type }}


- name: Build AtomicDEX (Windows)
- name: Build Komodo Wallet (Windows)
if: runner.os == 'Windows'
shell: powershell
run: |
Expand Down
20 changes: 10 additions & 10 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ variables:
cache:
- key: $CI_COMMIT_REF_SLUG
paths:
- atomicdex-desktop-linux-${CI_COMMIT_SHA::9}.zip
- atomicdex-desktop-linux-${CI_COMMIT_SHA::9}.tar.zst
- atomicdex-desktop-${CI_COMMIT_SHA::9}-x86_64.AppImage
- komodo-wallet-linux-${CI_COMMIT_SHA::9}.zip
- komodo-wallet-linux-${CI_COMMIT_SHA::9}.tar.zst
- komodo-wallet-${CI_COMMIT_SHA::9}-x86_64.AppImage
- key: $CI_PROJECT_NAME
paths:
- "$CI_PROJECT_DIR/.cache/vcpkg"
Expand Down Expand Up @@ -68,12 +68,12 @@ linux:build:
- rm -rf build_ninja || echo "no build_ninja folder to rm"
- mkdir build_ninja && cd $_
- cmake -DCMAKE_BUILD_TYPE=Release -GNinja ../
- ninja atomicdex-desktop
- ninja install
- ninja komodo-wallet
- cd $CI_PROJECT_DIR
- cp $CI_PROJECT_DIR/bundled/linux/atomicdex-desktop-linux-${CI_COMMIT_SHA::9}.zip .
- cp $CI_PROJECT_DIR/bundled/linux/atomicdex-desktop-linux-${CI_COMMIT_SHA::9}.tar.zst .
- cp $CI_PROJECT_DIR/bundled/linux/atomicdex-desktop-${CI_COMMIT_SHA::9}-x86_64.AppImage .
- cp $CI_PROJECT_DIR/bundled/linux/komodo-wallet-linux-${CI_COMMIT_SHA::9}.zip .
- cp $CI_PROJECT_DIR/bundled/linux/komodo-wallet-linux-${CI_COMMIT_SHA::9}.tar.zst .
- cp $CI_PROJECT_DIR/bundled/linux/komodo-wallet-${CI_COMMIT_SHA::9}-x86_64.AppImage .

AtomicDex-linux-zip:
stage: upload_linux_zip
Expand All @@ -83,7 +83,7 @@ AtomicDex-linux-zip:
artifacts:
name: "AtomicDex-linux-${CI_COMMIT_SHA::9}.zip"
paths:
- $CI_PROJECT_DIR/atomicdex-desktop-linux-${CI_COMMIT_SHA::9}.zip
- $CI_PROJECT_DIR/komodo-wallet-linux-${CI_COMMIT_SHA::9}.zip
when: always
expire_in: 3 days

Expand All @@ -95,7 +95,7 @@ AtomicDex-linux-AppImage:
artifacts:
name: "AtomicDex-linux-${CI_COMMIT_SHA::9}-AppImage"
paths:
- $CI_PROJECT_DIR/atomicdex-desktop-${CI_COMMIT_SHA::9}-x86_64.AppImage
- $CI_PROJECT_DIR/komodo-wallet-${CI_COMMIT_SHA::9}-x86_64.AppImage
when: always
expire_in: 3 days

Expand All @@ -107,6 +107,6 @@ AtomicDex-linux-tar:
artifacts:
name: "AtomicDex-linux-${CI_COMMIT_SHA::9}.tar.zst"
paths:
- $CI_PROJECT_DIR/atomicdex-desktop-linux-${CI_COMMIT_SHA::9}.tar.zst
- $CI_PROJECT_DIR/komodo-wallet-linux-${CI_COMMIT_SHA::9}.tar.zst
when: always
expire_in: 3 days
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ include(vcpkg_prerequisites)
include(qt_prerequisites)
include(cfg_hash)

project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.5.8)
project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.6.0)
message(STATUS "${PROJECT_NAME} is version ${PROJECT_VERSION}")

include(cmake_default_options)
Expand Down
12 changes: 6 additions & 6 deletions CMakeLists.txt.user
Original file line number Diff line number Diff line change
Expand Up @@ -215,9 +215,9 @@
<valuelist type="QVariantList" key="CustomOutputParsers"/>
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">atomicdex-desktop</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.atomicdex-desktop</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">atomicdex-desktop</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">komodo-wallet</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.komodo-wallet</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">komodo-wallet</value>
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
Expand Down Expand Up @@ -286,9 +286,9 @@
<valuelist type="QVariantList" key="CustomOutputParsers"/>
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">atomicdex-desktop_tests</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.atomicdex-desktop_tests</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">atomicdex-desktop_tests</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">komodo-wallet_tests</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.komodo-wallet_tests</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">komodo-wallet_tests</value>
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<p align="center">
<a href="https://atomicdex.io" alt="AtomicDEX">
<a href="https://atomicdex.io" alt="Komodo Wallet">
<img src="https://user-images.githubusercontent.com/35845239/147651230-827e8c0f-baf0-4f28-8be0-e08624baad37.png" />
</a>
</p>
Expand Down Expand Up @@ -47,12 +47,12 @@
</p>


## What is AtomicDEX?
## What is Komodo Wallet?

AtomicDEX is a secure wallet and non-custodial decentralized exchange rolled into one application. Store your coins,
Komodo Wallet is a secure wallet and non-custodial decentralized exchange rolled into one application. Store your coins,
trade peer-to-peer with minimal fees and never give up control over your digital assets.

AtomicDEX Desktop has been tested on the following platforms:
Komodo Wallet has been tested on the following platforms:

- Windows 10
- Linux (Ubuntu 18.04+)
Expand All @@ -72,16 +72,16 @@ feedback.

## Useful links

- :book: [AtomicDEX Documentation](https://developers.komodoplatform.com/basic-docs/atomicdex/atomicdex-tutorials/introduction-to-atomicdex.html)
- :link: [AtomicDEX Website](https://atomicdex.io/)
- :speech_balloon: [AtomicDEX Discord](https://discord.gg/tvp96Gf)
- :hammer_and_wrench: [AtomicDEX Development Boards](https://github.com/KomodoPlatform/atomicDEX-Desktop/projects)
- :notebook_with_decorative_cover: [AtomicDex Wiki](https://github.com/KomodoPlatform/atomicDEX-Desktop/wiki/)
- :book: [Komodo Wallet Documentation](https://developers.komodoplatform.com/basic-docs/atomicdex/atomicdex-tutorials/introduction-to-atomicdex.html)
- :link: [Komodo Wallet Website](https://atomicdex.io/)
- :speech_balloon: [Komodo Wallet Discord](https://discord.gg/tvp96Gf)
- :hammer_and_wrench: [Komodo Wallet Development Boards](https://github.com/KomodoPlatform/atomicDEX-Desktop/projects)
- :notebook_with_decorative_cover: [Komodo Wallet Wiki](https://github.com/KomodoPlatform/atomicDEX-Desktop/wiki/)


## AtomicDEX mobile
## Komodo Wallet mobile

Check out AtomicDEX mobile, available for [Android and iOS](https://atomicdex.io)
Check out Komodo Wallet mobile, available for [Android and iOS](https://atomicdex.io)


## Self-Hosted Dependencies
Expand Down
2 changes: 1 addition & 1 deletion assets/config/game.config.maker.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"native_desktop_mode": false,
"scale_mode": "fit",
"window_height": 900.0,
"window_title": "atomicDEX Desktop",
"window_title": "Komodo Wallet",
"window_width": 1280.0,
"no_style": false,
"mouse_grabbed": false,
Expand Down
Binary file modified assets/logo/dex-logo-64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/logo/dex-logo-big.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/logo/dex-logo.icns
Binary file not shown.
Binary file modified assets/logo/dex-logo.ico
Binary file not shown.
Binary file modified assets/logo/dex-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/logo/dex-tray-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/themes/Binance - Dark/dex-logo-big.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/themes/Binance - Dark/dex-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/themes/Default - Dark/dex-logo-big.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/themes/Default - Dark/dex-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/themes/Default - Light/dex-logo-big.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/themes/Default - Light/dex-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions ci_tools_atomic_dex/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# AtomicDEX Pro alpha build instructions
# Komodo Wallet Pro alpha build instructions

## Prerequisites

Expand Down Expand Up @@ -140,7 +140,7 @@ mv packages_commandline.json packages_official.json
cd -
```

## Build AtomicDEX Pro
## Build Komodo Wallet Pro

Please clone with submodules initialization : `git clone --recurse-submodules --remote-submodules https://github.com/KomodoPlatform/atomicDEX-Pro.git`

Expand Down Expand Up @@ -176,7 +176,7 @@ nimble build
./ci_tools_atomic_dex build release
```

## Bundle AtomicDEX Pro
## Bundle Komodo Wallet Pro

### Windows

Expand All @@ -202,7 +202,7 @@ nimble build



## Create AtomicDEX Pro Installer
## Create Komodo Wallet Pro Installer

### Windows

Expand All @@ -229,7 +229,7 @@ chmod +x QtInstallerFramework-linux-x64.run

e.g.: In `.bashrc` add: `export QT_IFW_PATH=~/Qt/QtIFW-3.2.2`

- Build AtomicDex Pro `./ci_tools_atomic_dex build release`
- Build Komodo Wallet Pro `./ci_tools_atomic_dex build release`

- Run `ci_tools_atomic_dex\create_installer_linux.sh` script, pass build type as argument to script

Expand Down
12 changes: 6 additions & 6 deletions ci_tools_atomic_dex/ci_scripts/ATOMICDEXinstaller_script.iss
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "AtomicDEX-Desktop"
#define MyAppName "Komodo-Wallet"
#define MyAppVersion "0.5.0"
#define MyAppPublisher "Komodo Platform"
#define MyAppURL "https://www.komodoplatform.com/"
#define MyAppExeName "atomicdex-desktop.exe"
#define MyAppExeName "komodo-wallet.exe"
#define MyUserName "smk"
#define CommitHash "b2ce1cc"

Expand All @@ -27,8 +27,8 @@ DisableProgramGroupPage=yes
;PrivilegesRequired=lowest
;PrivilegesRequiredOverridesAllowed=dialog
OutputDir=C:\Users\{#MyUserName}\Documents\temp
OutputBaseFilename=atomicdex-desktop-{#MyAppVersion}-windows-installer
SetupIconFile=C:\Users\{#MyUserName}\Downloads\atomicdex-desktop-windows-10-qt-5-15-2-{#CommitHash}.zip\bin\assets\logo\dex-logo.ico
OutputBaseFilename=komodo-wallet-{#MyAppVersion}-windows-installer
SetupIconFile=C:\Users\{#MyUserName}\Downloads\komodo-wallet-windows-10-qt-5-15-2-{#CommitHash}.zip\bin\assets\logo\dex-logo.ico
Compression=lzma
SolidCompression=yes
WizardStyle=modern
Expand All @@ -43,8 +43,8 @@ Name: "turkish"; MessagesFile: "compiler:Languages\Turkish.isl"
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked

[Files]
Source: "C:\Users\{#MyUserName}\Downloads\atomicdex-desktop-windows-10-qt-5-15-2-{#CommitHash}.zip\bin\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
Source: "C:\Users\{#MyUserName}\Downloads\atomicdex-desktop-windows-10-qt-5-15-2-{#CommitHash}.zip\bin\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
Source: "C:\Users\{#MyUserName}\Downloads\komodo-wallet-windows-10-qt-5-15-2-{#CommitHash}.zip\bin\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
Source: "C:\Users\{#MyUserName}\Downloads\komodo-wallet-windows-10-qt-5-15-2-{#CommitHash}.zip\bin\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
; NOTE: Don't use "Flags: ignoreversion" on any shared system files

[Icons]
Expand Down
2 changes: 1 addition & 1 deletion ci_tools_atomic_dex/ci_tools_atomic_dex.nimble
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

version = "0.1.0"
author = "romanszterg"
description = "AtomicDex CI utilities"
description = "Komodo Wallet CI utilities"
license = "MIT"
srcDir = "src"
bin = @["ci_tools_atomic_dex"]
Expand Down
6 changes: 3 additions & 3 deletions ci_tools_atomic_dex/src/tests.nim
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,20 @@ proc run_tests*(build_type: string, osx_sdk_path: string, compiler_path: string)
echo os.getCurrentDir()
discard osproc.execCmd("ls")
# os.setCurrentDir(os.getCurrentDir().joinPath("bin").joinPath(os.getEnv("DEX_PROJECT_NAME") & "_tests.app").joinPath("Contents").joinPath("MacOS"))
echo "Running AtomicDex Pro Unit tests"
echo "Running Komodo Wallet Pro Unit tests"
discard osproc.execCmd("./" & os.getEnv("DEX_PROJECT_NAME") & "_tests --reporters=xml --out=" & os.getEnv("DEX_PROJECT_NAME") & "-tests-result.xml -s")
echo "Successfully Generated", os.getEnv("DEX_PROJECT_NAME"), "-tests-result.xml"

when defined(linux):
echo os.getCurrentDir()
os.setCurrentDir(os.getCurrentDir().joinPath("bin").joinPath("AntaraAtomicDexTestsAppDir").joinPath("usr").joinPath("bin"))
echo "Running AtomicDex Pro Unit tests"
echo "Running Komodo Wallet Pro Unit tests"
discard osproc.execCmd("./" & os.getEnv("DEX_PROJECT_NAME") & "_tests --reporters=xml --out=" & os.getEnv("DEX_PROJECT_NAME") & "-tests-result.xml -s")
echo "Successfully Generated", os.getEnv("DEX_PROJECT_NAME"), "-tests-result.xml"

when defined(windows):
echo os.getCurrentDir()
os.setCurrentDir(os.getCurrentDir().joinPath("bin"))
echo "Running AtomicDex Pro Unit tests"
echo "Running Komodo Wallet Pro Unit tests"
discard osproc.execCmd(".\\" & os.getEnv("DEX_PROJECT_NAME") & "_tests --reporters=xml --out=" & os.getEnv("DEX_PROJECT_NAME") & "-tests-result.xml -s")
echo "Successfully Generated", os.getEnv("DEX_PROJECT_NAME"), "-tests-result.xml"
2 changes: 1 addition & 1 deletion cmake/install/macos/Packaging_CMakeDMGSetup.scpt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ on run argv
set statusbar visible to false
set toolbar visible to false
set the bounds to { 400, 100, 900, 465 }
set position of item "atomicdex-desktop.app" to { 133, 200 }
set position of item "komodo-wallet.app" to { 133, 200 }
set position of item "Applications" to { 378, 200 }
end tell
update without registering applications
Expand Down
10 changes: 5 additions & 5 deletions cmake/project.metadata.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
set(DEX_API "mm2")
set(DEX_RPCPORT 7762)
set(DEX_RPC "http://127.0.0.1:7762")
set(DEX_PROJECT_NAME "atomicdex-desktop")
set(DEX_DISPLAY_NAME "AtomicDEX Desktop")
set(DEX_MAINTENANCE_TOOL_NAME "AtomicDEX Maintenance Tool")
set(DEX_PROJECT_NAME "komodo-wallet")
set(DEX_DISPLAY_NAME "Komodo Wallet")
set(DEX_MAINTENANCE_TOOL_NAME "Komodo Wallet Maintenance Tool")
set(DEX_COMPANY "KomodoPlatform")
set(DEX_WEBSITE "https://atomicdex.io/")
set(DEX_VERSION "0.5.8")
set(DEX_VERSION "0.6.0")
set(DEX_SUPPORT_PAGE "https://support.komodoplatform.com/support/home")
set(DEX_DISCORD "https://komodoplatform.com/discord")
set(DEX_TWITTER "https://twitter.com/AtomicDEX")
Expand All @@ -18,7 +18,7 @@ set(DEX_REPOSITORY_OWNER ${DEX_COMPANY})
set(DEX_REPOSITORY_NAME "atomicDEX-Desktop")
set(DEX_CHECKSUM_API_URL "https://komodo.earth/static/checksum.json")
if (APPLE)
set(DEX_APPDATA_FOLDER "AtomicDex Desktop")
set(DEX_APPDATA_FOLDER "Komodo Wallet")
else ()
set(DEX_APPDATA_FOLDER "atomic_qt")
endif ()
Expand Down
2 changes: 1 addition & 1 deletion src/core/atomicdex/api/mm2/my_tx_history_rpc.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// atomicdex-desktop
// komodo-wallet
// Author(s): syl

#include <nlohmann/json.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/core/atomicdex/api/mm2/my_tx_history_rpc.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// atomicdex-desktop
// komodo-wallet
// Author(s): syl

#include <string>
Expand Down
2 changes: 1 addition & 1 deletion src/core/atomicdex/api/mm2/my_tx_history_v1_rpc.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// atomicdex-desktop
// komodo-wallet
// Author(s): syl

#pragma once
Expand Down
2 changes: 1 addition & 1 deletion src/core/atomicdex/api/mm2/paging_options.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// atomicdex-desktop
// komodo-wallet
// Author(s): syl

#include <nlohmann/json.hpp>
Expand Down
2 changes: 1 addition & 1 deletion src/core/atomicdex/api/mm2/paging_options.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// atomicdex-desktop
// komodo-wallet
// Author(s): syl

#pragma once
Expand Down
4 changes: 2 additions & 2 deletions src/core/atomicdex/pages/qt.settings.page.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ namespace atomic_dex

auto path = QString{":/assets/languages/atomic_defi_" + new_lang};

SPDLOG_INFO("Locale before parsing AtomicDEX settings: {}", QLocale().name().toStdString());
SPDLOG_INFO("Locale before parsing Komodo Wallet settings: {}", QLocale().name().toStdString());
QLocale::setDefault(get_locale(new_lang.toStdString()));
SPDLOG_INFO("Locale after parsing AtomicDEX settings: {}", QLocale().name().toStdString());
SPDLOG_INFO("Locale after parsing Komodo Wallet settings: {}", QLocale().name().toStdString());
if (!this->m_translator.load(path))
{
SPDLOG_ERROR("Failed to load {} translation in {}.qm", new_lang.toStdString(), path.toStdString());
Expand Down
Loading