diff --git a/.github/workflows/atomicdex-desktop-cd.yml b/.github/workflows/firodex-desktop-cd.yml similarity index 99% rename from .github/workflows/atomicdex-desktop-cd.yml rename to .github/workflows/firodex-desktop-cd.yml index afce755f88..661e6d78e0 100644 --- a/.github/workflows/atomicdex-desktop-cd.yml +++ b/.github/workflows/firodex-desktop-cd.yml @@ -1,4 +1,4 @@ -name: komodo-wallet-desktop CD releases +name: FiroDex-Desktop CD releases on: push: @@ -6,11 +6,11 @@ on: - temporary_disabled env: - DEX_PROJECT_NAME: "komodo-wallet" - DEX_DISPLAY_NAME: "Komodo Wallet" - DEX_COMPANY: "KomodoPlatform" + DEX_PROJECT_NAME: "firodex-desktop" + DEX_DISPLAY_NAME: "FiroDex Desktop" + DEX_COMPANY: "Firo Core Team" DEX_VERSION: "0.7.0" - DEX_WEBSITE: "https://atomicdex.io/" + DEX_WEBSITE: "https://firo.org/" jobs: diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/firodex-desktop-ci.yml similarity index 83% rename from .github/workflows/atomicdex-desktop-ci.yml rename to .github/workflows/firodex-desktop-ci.yml index b8d0c2985f..ac33ff714a 100644 --- a/.github/workflows/atomicdex-desktop-ci.yml +++ b/.github/workflows/firodex-desktop-ci.yml @@ -1,27 +1,28 @@ -name: komodo-wallet-desktop CI +name: FiroDex-Desktop CI on: pull_request: types: [ opened, synchronize, reopened ] push: branches: + - dev - master schedule: - cron: '0 0 * * 1' env: - DEX_API: "mm2_kmd" - DEX_RPCPORT: 7762 - DEX_RPC: "http://127.0.0.1:7762" - DEX_PROJECT_NAME: "komodo-wallet" - DEX_DISPLAY_NAME: "Komodo Wallet" - DEX_COMPANY: "KomodoPlatform" + DEX_API: "mm2_firo" + DEX_RPCPORT: 7653 + DEX_RPC: "http://127.0.0.1:7653" + DEX_PROJECT_NAME: "firodex" + DEX_DISPLAY_NAME: "Firo Dex" + DEX_COMPANY: "Firo" DEX_VERSION: "0.7.0" - DEX_WEBSITE: "https://atomicdex.io/" + DEX_WEBSITE: "https://firo.org/" VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/b/vcpkg_cache VCPKG_BINARY_SOURCES: clear;x-gha,readwrite - RUNVCPKG_VCPKG_ROOT: ${{ github.workspace }}\komodo-wallet-desktop\ci_tools_atomic_dex\vcpkg-repo - VCPKG_ROOT: ${{ github.workspace }}\komodo-wallet-desktop\ci_tools_atomic_dex\vcpkg-repo + RUNVCPKG_VCPKG_ROOT: ${{ github.workspace }}\firodex-desktop\ci_tools_atomic_dex\vcpkg-repo + VCPKG_ROOT: ${{ github.workspace }}\firodex-desktop\ci_tools_atomic_dex\vcpkg-repo jobs: @@ -84,9 +85,6 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} submodules: 'true' - - name: Expose GitHub Runtime Env - uses: crazy-max/ghaction-github-runtime@v2 - - name: Setup Python uses: actions/setup-python@v4 with: @@ -115,7 +113,7 @@ jobs: - name: Install QT (macOS) if: runner.os == 'macOS' - uses: jurplel/install-qt-action@v3.3.0 + uses: jurplel/install-qt-action@v3.0.0 with: version: ${{ matrix.qt }} host: ${{ matrix.host }} @@ -128,7 +126,7 @@ jobs: - name: Install QT (Linux) if: runner.os == 'Linux' - uses: jurplel/install-qt-action@v3.3.0 + uses: jurplel/install-qt-action@v3.0.0 with: version: ${{ matrix.qt }} host: ${{ matrix.host }} @@ -140,7 +138,7 @@ jobs: - name: Install QT (Windows) if: runner.os == 'Windows' - uses: jurplel/install-qt-action@v3.3.0 + uses: jurplel/install-qt-action@v3.0.0 with: version: ${{ matrix.qt }} host: ${{ matrix.host }} @@ -156,24 +154,13 @@ jobs: run: | export DEBIAN_FRONTEND=noninteractive export SHELL=/bin/bash - echo "CHOOSENIM_CHOOSE_VERSION=1.6.2" >> $GITHUB_ENV - export CHOOSENIM_CHOOSE_VERSION=1.6.2 + echo "CHOOSENIM_CHOOSE_VERSION=1.6.10" >> $GITHUB_ENV + export CHOOSENIM_CHOOSE_VERSION=1.6.10 curl https://nim-lang.org/choosenim/init.sh > choosenim.sh chmod +x choosenim.sh ./choosenim.sh -y export PATH=/home/runner/.nimble/bin:$PATH - chmod +x /home/runner/.choosenim/toolchains/nim-1.6.2/bin/* - - - name: Install nim (MacOS) - if: runner.os == 'macOS' - run: | - echo "CHOOSENIM_CHOOSE_VERSION=1.6.2" >> $GITHUB_ENV - export CHOOSENIM_CHOOSE_VERSION=1.6.2 - curl https://nim-lang.org/choosenim/init.sh > choosenim.sh - chmod +x choosenim.sh - ./choosenim.sh -y - export PATH=/Users/runner/.nimble/bin:$PATH - chmod +x /Users/runner/.choosenim/toolchains/nim-1.6.2/bin/* + chmod +x /home/runner/.choosenim/toolchains/nim-1.6.10/bin/* - name: Install deps (Linux) if: runner.os == 'Linux' @@ -200,33 +187,35 @@ jobs: echo "CC=clang-12" >> $GITHUB_ENV - name: vcpkg deps (All) - uses: lukka/run-vcpkg@v11 + uses: lukka/run-vcpkg@v10 with: vcpkgDirectory: '${{ github.workspace }}/ci_tools_atomic_dex/vcpkg-repo' + appendedCacheKey: ${{ hashFiles('vcpkg.json') }} vcpkgJsonGlob: 'vcpkg.json' - - name: import code signing certificates (macos) - if: runner.os == 'macOS' && 'KomodoPlatform/komodo-wallet-desktop' == github.repository - uses: Apple-Actions/import-codesign-certs@v1 - with: - keychain: ${{ github.run_id }} - keychain-password: ${{ github.run_id }} - p12-file-base64: ${{ secrets.CERTIFICATES_P12 }} - p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }} - - - name: import installer code signing certificates (macos) - if: runner.os == 'macOS' && 'KomodoPlatform/komodo-wallet-desktop' == github.repository - uses: apple-actions/import-codesign-certs@v1 - with: - keychain: ${{ github.run_id }} - keychain-password: ${{ github.run_id }} - create-keychain: false - p12-file-base64: ${{ secrets.CERTIFICATES_INSTALLER_P12 }} - p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }} + + # - name: import code signing certificates (macos) + # if: runner.os == 'macOS' && 'firoorg/FiroDEX-Desktop' == github.repository + # uses: Apple-Actions/import-codesign-certs@v1 + # with: + # keychain: ${{ github.run_id }} + # keychain-password: ${{ github.run_id }} + # p12-file-base64: ${{ secrets.CERTIFICATES_P12 }} + # p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }} + + # - name: import installer code signing certificates (macos) + # if: runner.os == 'macOS' && 'firoorg/FiroDEX-Desktop' == github.repository + # uses: apple-actions/import-codesign-certs@v1 + # with: + # keychain: ${{ github.run_id }} + # keychain-password: ${{ github.run_id }} + # create-keychain: false + # p12-file-base64: ${{ secrets.CERTIFICATES_INSTALLER_P12 }} + # p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }} - - name: Build Komodo Wallet (MacOS) + - name: Build AtomicDEX (MacOS) if: runner.os == 'macOS' run: | xcrun --sdk macosx --show-sdk-path @@ -241,7 +230,6 @@ jobs: export ASC_PUBLIC_ID="${{ secrets.ASC_PUBLIC_ID }}" export QT_INSTALL_CMAKE_PATH=${{ github.workspace }}/Qt/${{ matrix.qt }}/clang_64/lib/cmake export QT_ROOT=${{ github.workspace }}/Qt/${{ matrix.qt }} - export PATH=/Users/runner/.nimble/bin:$PATH export MACOSX_DEPLOYMENT_TARGET=10.15 export CC=clang export CXX=clang++ @@ -251,7 +239,7 @@ jobs: - - name: Build Komodo Wallet (Linux) + - name: Build AtomicDEX (Linux) if: runner.os == 'Linux' run: | export QT_INSTALL_CMAKE_PATH=${{ github.workspace }}/Qt/${{ matrix.qt }}/gcc_64/lib/cmake @@ -269,7 +257,7 @@ jobs: ./ci_tools_atomic_dex bundle ${{ matrix.type }} - - name: Build Komodo Wallet (Windows) + - name: Build FiroDEX (Windows) if: runner.os == 'Windows' shell: powershell run: | @@ -283,7 +271,6 @@ jobs: echo "artifact_name_zstd=${{ env.DEX_PROJECT_NAME }}-${{ matrix.name }}-$(git rev-parse --short HEAD).tar.zst" >> $GITHUB_ENV echo "artifact_name_zip=${{ env.DEX_PROJECT_NAME }}-${{ matrix.name }}-$(git rev-parse --short HEAD).zip" >> $GITHUB_ENV echo "artifact_name_appimage=${{ env.DEX_PROJECT_NAME }}-${{ matrix.name }}-$(git rev-parse --short HEAD)-x86_64.AppImage" >> $GITHUB_ENV - echo "target_name_zstd=${{ env.DEX_PROJECT_NAME }}-linux-$(git rev-parse --short HEAD).tar.zst" >> $GITHUB_ENV echo "target_name_zip=${{ env.DEX_PROJECT_NAME }}-linux-$(git rev-parse --short HEAD).zip" >> $GITHUB_ENV echo "target_name_appimage=${{ env.DEX_PROJECT_NAME }}-linux-$(git rev-parse --short HEAD)-x86_64.AppImage" >> $GITHUB_ENV @@ -363,7 +350,7 @@ jobs: - name: Running Tests (Linux) working-directory: ci_tools_atomic_dex continue-on-error: true - if: runner.os == 'Linux' && 'KomodoPlatform/komodo-wallet-desktop' == github.repository + if: runner.os == 'Linux' && 'firoorg/FiroDEX-Desktop' == github.repository run: | export REPORT_CI_TOKEN=${{ secrets.REPORT_CI_TOKEN_SECRET }} export ATOMICDEX_TEST_SEED=${{ secrets.ATOMICDEX_TEST_SEED }} @@ -382,7 +369,7 @@ jobs: - name: Running Tests (MacOS) working-directory: ci_tools_atomic_dex continue-on-error: true - if: runner.os == 'macOS' && 'KomodoPlatform/komodo-wallet-desktop' == github.repository + if: runner.os == 'macOS' && 'firoorg/FiroDEX-Desktop' == github.repository run: | export MAC_SIGN_IDENTITY="${{ secrets.MAC_SIGN_IDENTITY }}" export INSTALLER_MAC_SIGN_IDENTITY="${{ secrets.INSTALLER_MAC_SIGN_IDENTITY }}" @@ -395,7 +382,6 @@ jobs: export ATOMICDEX_PASSWORD=${{ secrets.ATOMICDEX_PASSWORD }} export QT_INSTALL_CMAKE_PATH=${{ github.workspace }}/Qt/${{ matrix.qt }}/clang_64/lib/cmake export QT_ROOT=${{ github.workspace }}/Qt/${{ matrix.qt }} - export PATH=/Users/runner/.nimble/bin:$PATH export CC=clang export CXX=clang++ #echo "Running tests" @@ -407,7 +393,7 @@ jobs: - name: Running Tests (Windows) shell: powershell continue-on-error: true - if: runner.os == 'Windows' && 'KomodoPlatform/komodo-wallet-desktop' == github.repository + if: runner.os == 'Windows' && 'firoorg/FiroDEX-Desktop' == github.repository run: | #echo "Running tests" $Env:REPORT_CI_TOKEN = "${{ secrets.REPORT_CI_TOKEN_SECRET }}" @@ -415,4 +401,4 @@ jobs: #cd b\bin #./${{ env.DEX_PROJECT_NAME }}_tests.exe --reporters=xml --out=${{ env.DEX_PROJECT_NAME }}-tests-result.xml -s #Invoke-WebRequest -Uri https://report.ci/upload.py -OutFile upload.py - #python upload.py --sha $(git rev-parse HEAD) -n "[Doctest Windows]" --include='${{ env.DEX_PROJECT_NAME }}-tests-result.xml' --framework=doctest --merge ".*" \ No newline at end of file + #python upload.py --sha $(git rev-parse HEAD) -n "[Doctest Windows]" --include='${{ env.DEX_PROJECT_NAME }}-tests-result.xml' --framework=doctest --merge ".*" diff --git a/.github/workflows/atomicdex-desktop-release-vt.yml b/.github/workflows/firodex-desktop-release-vt.yml similarity index 89% rename from .github/workflows/atomicdex-desktop-release-vt.yml rename to .github/workflows/firodex-desktop-release-vt.yml index c42a6507ac..9f4621b286 100644 --- a/.github/workflows/atomicdex-desktop-release-vt.yml +++ b/.github/workflows/firodex-desktop-release-vt.yml @@ -1,4 +1,4 @@ -name: komodo-wallet-desktop VirustTotal Release +name: FiroDex-Desktop VirustTotal Release on: release: diff --git a/.github/workflows/sync_mirror.yml b/.github/workflows/sync_mirror.yml deleted file mode 100644 index 57010e03dd..0000000000 --- a/.github/workflows/sync_mirror.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: GitlabSync - -on: - push: - branches: - - 'none' - pull_request: - branches: - - none - delete: - branches: - - '*' - -jobs: - sync: - runs-on: ubuntu-latest - name: Git Repo Sync - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - uses: wangchucheng/git-repo-sync@v0.1.0 - with: - target-url: ${{ secrets.GITLAB_URL }} - target-username: ${{ secrets.GITLAB_USERNAME }} - target-token: ${{ secrets.GITLAB_TOKEN }} diff --git a/README.md b/README.md index def816bccf..19b6dda9ea 100644 --- a/README.md +++ b/README.md @@ -47,9 +47,9 @@
-## What is Komodo Wallet? +## What is FiroDEX? -Komodo Wallet is a secure wallet and non-custodial decentralized exchange rolled into one application. Store your coins, +FiroDEX 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. Komodo Wallet has been tested on the following platforms: @@ -61,8 +61,8 @@ Komodo Wallet has been tested on the following platforms: ## Get Started -You can [download](https://github.com/KomodoPlatform/komodo-wallet-desktop/releases) the pre-built beta binaries on -our [GitHub release page](https://github.com/KomodoPlatform/komodo-wallet-desktop/releases). +You can [download](https://github.com/firoorg/FiroDEX-Desktop/releases) the pre-built beta binaries on +our [GitHub release page](https://github.com/firoorg/FiroDEX-Desktop/releases). Build instructions can be found [here](https://github.com/KomodoPlatform/komodo-wallet-desktop/wiki/Build-Instructions) diff --git a/assets/config/cfg.json b/assets/config/cfg.json index fef919e6a1..d6704a8f55 100644 --- a/assets/config/cfg.json +++ b/assets/config/cfg.json @@ -46,7 +46,8 @@ "ETH_ALT": "Ξ", "BTC": "₿", "BTC_ALT": "฿", - "LTC": "Ł" + "LTC": "Ł", + "FIRO": "FIRO" }, "available_fiat": [ "USD", @@ -96,6 +97,7 @@ "BTC", "KMD", "LTC", - "DOGE" + "DOGE", + "FIRO" ] } \ No newline at end of file diff --git a/assets/config/game.config.maker.json b/assets/config/game.config.maker.json index 390e7d0647..f75e0854ef 100644 --- a/assets/config/game.config.maker.json +++ b/assets/config/game.config.maker.json @@ -12,7 +12,7 @@ "native_desktop_mode": false, "scale_mode": "fit", "window_height": 900.0, - "window_title": "Komodo Wallet", + "window_title": "firoDEX Desktop", "window_width": 1280.0, "no_style": false, "mouse_grabbed": false, diff --git a/assets/logo/dex-logo-64.png b/assets/logo/dex-logo-64.png index c5f4335db9..de1f762aaa 100644 Binary files a/assets/logo/dex-logo-64.png and b/assets/logo/dex-logo-64.png differ diff --git a/assets/logo/dex-logo-big.png b/assets/logo/dex-logo-big.png old mode 100644 new mode 100755 index a153fcd0ea..7cd7609923 Binary files a/assets/logo/dex-logo-big.png and b/assets/logo/dex-logo-big.png differ diff --git a/assets/logo/dex-logo.icns b/assets/logo/dex-logo.icns index d092976d92..3bb461232d 100644 Binary files a/assets/logo/dex-logo.icns and b/assets/logo/dex-logo.icns differ diff --git a/assets/logo/dex-logo.ico b/assets/logo/dex-logo.ico index 8058cbb0fe..3f488fa6aa 100644 Binary files a/assets/logo/dex-logo.ico and b/assets/logo/dex-logo.ico differ diff --git a/assets/logo/dex-logo.png b/assets/logo/dex-logo.png index 23b7d83a5d..9f10a452b6 100644 Binary files a/assets/logo/dex-logo.png and b/assets/logo/dex-logo.png differ diff --git a/assets/logo/dex-tray-icon.png b/assets/logo/dex-tray-icon.png index 28334a05f7..938bf2b9b5 100644 Binary files a/assets/logo/dex-tray-icon.png and b/assets/logo/dex-tray-icon.png differ diff --git a/assets/themes/Binance - Dark/dex-logo-big.png b/assets/themes/Binance - Dark/dex-logo-big.png deleted file mode 100644 index 6daeafe8b5..0000000000 Binary files a/assets/themes/Binance - Dark/dex-logo-big.png and /dev/null differ diff --git a/assets/themes/Binance - Dark/dex-logo.png b/assets/themes/Binance - Dark/dex-logo.png deleted file mode 100644 index 987b58bd4b..0000000000 Binary files a/assets/themes/Binance - Dark/dex-logo.png and /dev/null differ diff --git a/assets/themes/Default - Dark/colors.json b/assets/themes/Default - Dark/colors.json index faee423f39..ca49b711c5 100644 --- a/assets/themes/Default - Dark/colors.json +++ b/assets/themes/Default - Dark/colors.json @@ -1,22 +1,25 @@ { - "accentColor": "#2C3D66FF", - "foregroundColor": "#FFFFFFFF", + "accentColor": "#212020", + "foregroundColor": "#ffffff", "foregroundColor2": "#7A8EA1FF", "foregroundColor3": "#ABC0D3FF", - "backgroundColor": "#202337FF", + "backgroundColor": "#1F1E1E", "secondBackgroundColor": "#24273DFF", - "backgroundColorDeep": "#171a2cFF", + "backgroundColorDeep": "#1F1E1E", + "floatingBackgroundColor": "#1F1E1E", + "innerBackgroundColor": "#1F1E1E", - "busyIndicatorColor": "#4986EAFF", - "buttonColorDisabled": "#28375AFF", - "buttonColorEnabled": "#293254FF", - "buttonColorHovered": "#4068B929", - "buttonColorPressed": "#2932546C", - "buttonTextDisabledColor": "#444444FF", - "buttonTextEnabledColor": "#FFFFFFFF", - "buttonTextHoveredColor": "#FFFFFFFF", - "buttonTextPressedColor": "#FFFFFFFF", + "busyIndicatorColor": "#EB1C2EAF", + + "buttonColorDisabled": "#3E34349A", + "buttonColorEnabled": "#3E3434", + "buttonColorHovered": "#3E34346A", + "buttonColorPressed": "#3E34342A", + "buttonTextDisabledColor": "#444444", + "buttonTextEnabledColor": "#ffffff", + "buttonTextHoveredColor": "#7A8EA1FF", + "buttonTextPressedColor": "#ABC0D3FF", "buttonSecondaryColorDisabled": "#28375AFF", "buttonSecondaryColorEnabled": "#293254FF", @@ -28,85 +31,82 @@ "buttonCancelColorHovered": "#4068B929", "buttonCancelColorPressed": "#2932546C", - "gradientButtonStartColor": "#4986EAAD", - "gradientButtonEndColor": "#5A68E6FF", - "gradientButtonDisabledStartColor": "#5A68E64D", - "gradientButtonDisabledEndColor": "#4986EA34", - "gradientButtonHoveredStartColor": "#4986EAAD", - "gradientButtonHoveredEndColor": "#4986EAAD", - "gradientButtonPressedStartColor": "#4986EAFF", - "gradientButtonPressedEndColor": "#4986EAFF", - "gradientButtonTextEnabledColor": "#FFFFFFFF", - "gradientButtonTextDisabledColor": "#FFFFFFFF", - "gradientButtonTextHoveredColor": "#FFFFFFFF", - "gradientButtonTextPressedColor": "#FFFFFFFF", + "gradientButtonStartColor": "#9B1C2EFF", + "gradientButtonEndColor": "#EE5C78FF", + "gradientButtonDisabledStartColor": "#9B1C2E4D", + "gradientButtonDisabledEndColor": "#EE5C7834", + "gradientButtonHoveredStartColor": "#CB1C2EAF", + "gradientButtonHoveredEndColor": "#CB1C2EAF", + "gradientButtonPressedStartColor": "#EB1C2EAF", + "gradientButtonPressedEndColor": "#EB1C2EAF", + "gradientButtonTextEnabledColor": "#FFF", + "gradientButtonTextDisabledColor": "#FFF", + "gradientButtonTextHoveredColor": "#FFF", + "gradientButtonTextPressedColor": "#FFF", "checkBoxTickColor": "#FFFFFFFF", "checkBoxGradientStartColor": "#6673E3FF", "checkBoxGradientEndColor": "#5EBBF0FF", - "switchGradientStartColor": "#1D80B0FF", - "switchGradientEndColor": "#5B69E6FF", - "switchGradientStartColor2": "#FFFFFFFF", - "switchGradientEndColor2": "#FFFFFFFF", + "switchGradientStartColor": "#BA2A45FF", + "switchGradientEndColor": "#ECB6BEFF", + "switchGradientStartColor2": "#FFF", + "switchGradientEndColor2": "#FFF", - "comboBoxBackgroundColor": "#303757FF", + "comboBoxBackgroundColor": "#161515FF", "comboBoxArrowsColor": "#FFFFFFFF", - "comboBoxDropdownItemHighlightedColor": "#4663E8FF", + "comboBoxDropdownItemHighlightedColor": "#BA2A45FF", - "modalPageCounterGradientStartColor": "#1D80B0FF", - "modalPageCounterGradientEndColor": "#5B69E6FF", + "modalPageCounterGradientStartColor": "#BA2A45FF", + "modalPageCounterGradientEndColor": "#BA2A45FF", - "notifPopupBackgroundColor": "#24273DFF", + "notifPopupBackgroundColor": "#1F1E1EFF", "notifPopupTextColor": "#FFFFFFFF", - "notifPopupTimerColor": "#8790B2FF", - "notifPopupTimerBackgroundColor": "#94A3B11F", - "notifPopupIconStartColor": "#FFFFFFFF", - "notifPopupIconEndColor": "#FFFFFFFF", + "notifPopupTimerColor": "#BA2A45FF", + "notifPopupTimerBackgroundColor": "#93A3B11F", + "notifPopupIconStartColor": "#F14263FF", + "notifPopupIconEndColor": "#F48EA1FF", - "scrollBarIndicatorColor": "#8790B2FF", - "scrollBarBackgroundColor": "#94A3B11F", + "scrollBarIndicatorColor": "#DBE0E4", + "scrollBarBackgroundColor": "#93A3B11F", - "tabSelectedColor": "#2C3D66FF", + "tabSelectedColor": "#BA2A45", - "textDisabledColor": "#444444FF", - "textSelectionColor": "#4986EAFF", - "textPlaceholderColor": "#91A8E8FF", - "textSelectedColor": "#0e1021FF", + "textDisabledColor": "#444444", + "textSelectionColor": "#14bca6", + "textPlaceholderColor": "#A9A9A9", + "textSelectedColor": "#0e1021", - "textFieldBackgroundColor": "#313555FF", - "textFieldActiveBackgroundColor": "#3b3f62FF", - "textFieldPrefixColor": "#8790B2FF", - "textFieldSuffixColor": "#8790B2FF", + "textFieldBackgroundColor": "#272727FF", + "textFieldActiveBackgroundColor": "#313555CC", + "textFieldPrefixColor": "#FFFFFFFF", + "textFieldSuffixColor": "#FFFFFFFF", "tickerBadgeBackgroundColor": "#202337FF", "chartTradingLineBackgroundColor": "#24283dFF", "chartTradingLineColor": "#74fbeeFF", - "innerBackgroundColor": "#1F263FFF", - - "floatingBackgroundColor": "#24273DFF", - - "rangeSliderBackgroundColor": "#5A68E6FF", - "rangeSliderDistanceColor": "#4986EA3B", - "rangeSliderIndicatorBackgroundStartColor": "#5A68E6FF", - "rangeSliderIndicatorBackgroundEndColor": "#4986EAFF", - - "userIconColorStart": "#5A68E6FF", - "userIconColorEnd": "#4986EAAD", - - "sidebarBgColor": "#202337FF", - "sidebarVersionTextColor": "#2F5688FF", - "sidebarCursorStartColor": "#31B1F0FF", - "sidebarCursorEndColor": "#5B69E600", - "sidebarLineTextHovered": "#2C87B9FF", - "sidebarLineTextSelected": "#FFFFFFFF", - - "tradeSellModeSelectorBackgroundColorStart": "#E52167FF", - "tradeSellModeSelectorBackgroundColorEnd": "#CD0F53FF", - "tradeBuyModeSelectorBackgroundColorStart": "#0F713CFF", - "tradeBuyModeSelectorBackgroundColorEnd": "#037B3AFF", + "rangeSliderBackgroundColor": "#EE5C78FF", + "rangeSliderDistanceColor": "#F9F5F5FF", + "rangeSliderIndicatorBackgroundStartColor": "#EE5C78FF", + "rangeSliderIndicatorBackgroundEndColor": "#EE5C78FF", + + "userIconColorStart": "#9B1C2E", + "userIconColorEnd": "#EE5C78", + + "sidebarBgColor": "#161515FF", + "sidebarVersionTextColor": "#878787FF", + "sidebarCursorStartColor": "#BA2A45", + "sidebarCursorEndColor": "#BA2A4500", + "sidebarLineTextHovered": "#BA2A45", + "sidebarLineTextSelected": "#FFFFFF", + + "tradeBuyModeSelectorBackgroundColorStart": "#00C3AAFF", + "tradeBuyModeSelectorBackgroundColorEnd": "#1FE7C3FF", + "tradeSellModeSelectorBackgroundColorStart": "#F14263FF", + "tradeSellModeSelectorBackgroundColorEnd": "#F48EA1FF", + "tradeMarketModeSelectorNotSelectedBackgroundColor": "#89B6FF21", "inputModifierBackgroundColor": "#89B6FF21", "inputFieldBackgroundColor": "#313555FF", @@ -133,5 +133,5 @@ "arrowUpColor": "#F85757FF", "arrowDownColor": "#845FEFFF", - "lineSeparatorColor": "#262941FF" + "lineSeparatorColor": "#65656542" } diff --git a/assets/themes/Default - Dark/dex-logo-big.png b/assets/themes/Default - Dark/dex-logo-big.png index 6daeafe8b5..7cd7609923 100644 Binary files a/assets/themes/Default - Dark/dex-logo-big.png and b/assets/themes/Default - Dark/dex-logo-big.png differ diff --git a/assets/themes/Default - Light/colors.json b/assets/themes/Default - Light/colors.json index de287782f6..ab7012c6c9 100644 --- a/assets/themes/Default - Light/colors.json +++ b/assets/themes/Default - Light/colors.json @@ -1,20 +1,20 @@ { - "accentColor": "#F0F2FFFF", - "foregroundColor": "#456078FF", - "backgroundColor": "#FCFCFCFF", + "accentColor": "#F0F0F0FF", + "foregroundColor": "#110202", + "backgroundColor": "#F9F5F5FF", "secondBackgroundColor": "#ECECECFF", - "backgroundColorDeep": "#ECECECFF", + "backgroundColorDeep": "#F9F5F5FF", - "busyIndicatorColor": "#5A68E6FF", + "busyIndicatorColor": "#CB1C2EAF", - "buttonColorDisabled": "#D8E3F8FF", - "buttonColorEnabled": "#DDE6F2FF", - "buttonColorHovered": "#CDE1FFFF", - "buttonColorPressed": "#B8D2F9FF", - "buttonTextDisabledColor": "#D1D4DCFF", - "buttonTextEnabledColor": "#456078FF", - "buttonTextHoveredColor": "#2F5678FF", - "buttonTextPressedColor": "#3A5B78FF", + "buttonColorDisabled": "#D8E3F8", + "buttonColorEnabled": "#F0F6F9", + "buttonColorHovered": "#F0F6F9AA", + "buttonColorPressed": "#F0F6F97A", + "buttonTextDisabledColor": "#444444", + "buttonTextEnabledColor": "#110202", + "buttonTextHoveredColor": "#878787FF", + "buttonTextPressedColor": "#8FA0B1B2", "buttonSecondaryColorDisabled": "#D8E3F8FF", "buttonSecondaryColorEnabled": "#F0F6FFFF", @@ -25,86 +25,86 @@ "buttonCancelColorEnabled": "#DDE6F2FF", "buttonCancelColorHovered": "#CDE1FFFF", "buttonCancelColorPressed": "#B8D2F9FF", - - "gradientButtonStartColor": "#5A68E6FF", - "gradientButtonEndColor": "#4986EAAB", - "gradientButtonDisabledStartColor": "#CDD0F6FF", - "gradientButtonDisabledEndColor": "#DAE5F9FF", - "gradientButtonHoveredStartColor": "#5A68E6FF", - "gradientButtonHoveredEndColor": "#5A68E6FF", - "gradientButtonPressedStartColor": "#6A4DE3FF", - "gradientButtonPressedEndColor": "#6A4DE3FF", - "gradientButtonTextEnabledColor": "#FFFFFFFF", - "gradientButtonTextDisabledColor": "#FFFFFFFF", - "gradientButtonTextHoveredColor": "#FFFFFFFF", - "gradientButtonTextPressedColor": "#FFFFFFFF", - - "checkBoxTickColor": "#456078FF", + + "gradientButtonStartColor": "#9B1C2EFF", + "gradientButtonEndColor": "#EE5C78FF", + "gradientButtonDisabledStartColor": "#9B1C2E4D", + "gradientButtonDisabledEndColor": "#EE5C7834", + "gradientButtonHoveredStartColor": "#CB1C2EAF", + "gradientButtonHoveredEndColor": "#CB1C2EAF", + "gradientButtonPressedStartColor": "#EB1C2EAF", + "gradientButtonPressedEndColor": "#EB1C2EAF", + "gradientButtonTextEnabledColor": "#EEF5FF", + "gradientButtonTextDisabledColor": "#EEF5FF", + "gradientButtonTextHoveredColor": "#EEF5FF", + "gradientButtonTextPressedColor": "#EEF5FF", + + "checkBoxTickColor": "#000000FF", "checkBoxGradientStartColor": "#8892EBFF", "checkBoxGradientEndColor": "#9DD4F3FF", - "switchGradientStartColor": "#8892EBFF", - "switchGradientEndColor": "#9DD4F3FF", - "switchGradientStartColor2": "#FFFFFFFF", - "switchGradientEndColor2": "#FFFFFFFF", + "switchGradientStartColor": "#BA2A45FF", + "switchGradientEndColor": "#ECB6BEFF", + "switchGradientStartColor2": "#FFF", + "switchGradientEndColor2": "#FFF", - "comboBoxBackgroundColor": "#DDE6F2FF", - "comboBoxArrowsColor": "#456078FF", - "comboBoxDropdownItemHighlightedColor": "#CDE1FFFF", + "comboBoxBackgroundColor": "#FFFFFFFF", + "comboBoxArrowsColor": "#000000FF", + "comboBoxDropdownItemHighlightedColor": "#BA2A45FF", - "modalPageCounterGradientStartColor": "#9DD4F3FF", - "modalPageCounterGradientEndColor": "#9DD4F3FF", + "modalPageCounterGradientStartColor": "#BA2A45FF", + "modalPageCounterGradientEndColor": "#BA2A45FF", - "notifPopupBackgroundColor": "#EDF4FFFF", - "notifPopupTextColor": "#456078FF", - "notifPopupTimerColor": "#DBE0E4FF", + "notifPopupBackgroundColor": "#F9F5F5FF", + "notifPopupTextColor": "#110202FF", + "notifPopupTimerColor": "#BA2A45FF", "notifPopupTimerBackgroundColor": "#93A3B1FF", - "notifPopupIconStartColor": "#000000FF", - "notifPopupIconEndColor": "#000000FF", + "notifPopupIconStartColor": "#F14263FF", + "notifPopupIconEndColor": "#F48EA1FF", - "scrollBarIndicatorColor": "#DBE0E4FF", - "scrollBarBackgroundColor": "#93A3B1FF", + "scrollBarIndicatorColor": "#DBE0E4", + "scrollBarBackgroundColor": "#93A3B11F", - "tabSelectedColor": "#DCE8FDFF", + "tabSelectedColor": "#FEC1CC", - "textDisabledColor": "#C5CFD8FF", - "textSelectionColor": "#5A68E6FF", - "textPlaceholderColor": "#91A8E8FF", - "textSelectedColor": "#F9F9FBFF", + "textDisabledColor": "#444444", + "textSelectionColor": "#14bca6", + "textPlaceholderColor": "#8FA0B1FF", + "textSelectedColor": "#0e1021", - "textFieldBackgroundColor": "#F3F5F6FF", + "textFieldBackgroundColor": "#FFFFFFFF", "textFieldActiveBackgroundColor": "#EDF4FFFF", - "textFieldPrefixColor": "#45607894", - "textFieldSuffixColor": "#456078FF", - - "tickerBadgeBackgroundColor": "#D5DCF8FF", + "textFieldPrefixColor": "#110202FF", + "textFieldSuffixColor": "#110202FF", - "chartTradingLineBackgroundColor": "#C5F2EFFF", - "chartTradingLineColor": "#53EBD7FF", + "tickerBadgeBackgroundColor": "#D5DCF8FF", + "chartTradingLineBackgroundColor": "#24283d", + "chartTradingLineColor": "#74fbee", - "innerBackgroundColor": "#DDE6F2FF", + "innerBackgroundColor": "#F9F5F5FF", - "floatingBackgroundColor": "#EDF4FFFF", + "floatingBackgroundColor": "#F9F5F5FF", - "rangeSliderBackgroundColor": "#5A68E6FF", - "rangeSliderDistanceColor": "#4986EA3B", - "rangeSliderIndicatorBackgroundStartColor": "#5A68E6FF", - "rangeSliderIndicatorBackgroundEndColor": "#4986EAFF", + "rangeSliderBackgroundColor": "#EE5C78FF", + "rangeSliderDistanceColor": "#F9F5F5FF", + "rangeSliderIndicatorBackgroundStartColor": "#EE5C78FF", + "rangeSliderIndicatorBackgroundEndColor": "#EE5C78FF", - "userIconColorStart": "#5A68E6FF", - "userIconColorEnd": "#4986EAAD", + "loginWalletIconColorStart": "#5A68E6FF", + "loginWalletIconColorEnd": "#4986EAAD", "sidebarBgColor": "#FCFCFCFF", - "sidebarVersionTextColor": "#456078FF", - "sidebarCursorStartColor": "#5A68E6FF", - "sidebarCursorEndColor": "#2CB9F000", - "sidebarLineTextHovered": "#2C87B9FF", - "sidebarLineTextSelected": "#FFFFFFFF", - - "tradeSellModeSelectorBackgroundColorStart": "#E52167FF", - "tradeSellModeSelectorBackgroundColorEnd": "#CD0F53FF", - "tradeBuyModeSelectorBackgroundColorStart": "#0F713CFF", - "tradeBuyModeSelectorBackgroundColorEnd": "#037B3AFF", + "sidebarVersionTextColor": "#110202FF", + "sidebarCursorStartColor": "#F6D7DBFF", + "sidebarCursorEndColor": "#FFFFFFFF", + "sidebarLineTextHovered": "#7C1624", + "sidebarLineTextSelected": "#7C1624", + + "tradeBuyModeSelectorBackgroundColorStart": "#00C3AAFF", + "tradeBuyModeSelectorBackgroundColorEnd": "#1FE7C3FF", + "tradeSellModeSelectorBackgroundColorStart": "#F14263FF", + "tradeSellModeSelectorBackgroundColorEnd": "#F48EA1FF", + "tradeMarketModeSelectorNotSelectedBackgroundColor": "#89B6FF21", "inputModifierBackgroundColor": "#89B6FF21", "inputFieldBackgroundColor": "#F3F5F6FF", @@ -131,5 +131,5 @@ "arrowUpColor": "#F85757FF", "arrowDownColor": "#845FEFFF", - "lineSeparatorColor": "#CDD3DC88" + "lineSeparatorColor": "#65656542" } diff --git a/assets/themes/Default - Light/dex-logo-big.png b/assets/themes/Default - Light/dex-logo-big.png old mode 100644 new mode 100755 index 0f42e5d05c..022eaf7cbf Binary files a/assets/themes/Default - Light/dex-logo-big.png and b/assets/themes/Default - Light/dex-logo-big.png differ diff --git a/atomic_defi_design/assets/languages/atomic_defi_de.ts b/atomic_defi_design/assets/languages/atomic_defi_de.ts index 0348200972..bc1f6fc053 100644 --- a/atomic_defi_design/assets/languages/atomic_defi_de.ts +++ b/atomic_defi_design/assets/languages/atomic_defi_de.ts @@ -3570,6 +3570,11 @@ Bitte wählen Sie eine neue Order aus.