Merge pull request #3248

2e81ea2 build: prepare v0.17.1.5 (selsta)
Merge pull request #3247
2020-11-25 17:24:18 -06:00 · 2020-11-25 17:23:24 -06:00 · 2020-11-25 17:22:38 -06:00 · 2020-11-25 17:21:41 -06:00 · 2020-11-25 16:36:37 +01:00 · 2020-11-25 13:27:59 +00:00
41 changed files with 1272 additions and 1813 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -49,7 +49,7 @@ jobs:
    - uses: actions/checkout@v1
      with:
        submodules: recursive
-    - uses: eine/setup-msys2@v1
+    - uses: eine/setup-msys2@v2
      with:
        update: true
        install: mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb git mingw-w64-x86_64-qt5 mingw-w64-x86_64-libgcrypt
@@ -58,6 +58,35 @@ jobs:
    - name: test qml
      run: build/release/bin/monero-wallet-gui --test-qml

+  macos-bundle:
+    runs-on: macOS-latest
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        submodules: recursive
+    - name: install dependencies
+      run: HOMEBREW_NO_AUTO_UPDATE=1 brew install boost hidapi zmq libpgm miniupnpc ldns expat libunwind-headers protobuf pkg-config python3 p7zip
+    - name: install dependencies
+      run: pip3 install requests semantic_version lxml
+    - name: download qt
+      run: |
+          curl -O https://raw.githubusercontent.com/engnr/qt-downloader/master/qt-downloader
+          chmod +x qt-downloader
+          ./qt-downloader macos desktop 5.15.2 clang_64
+      working-directory: ../
+    - name: build
+      run: CMAKE_PREFIX_PATH=/Users/runner/work/monero-gui/5.15.2/clang_64 make release -j3
+    - name: deploy
+      run: make deploy
+      working-directory: build/release
+    - name: create .tar
+      run: tar -cf monero-wallet-gui.tar monero-wallet-gui.app
+      working-directory: build/release/bin
+    - uses: actions/upload-artifact@v2
+      with:
+        name: ${{ github.job }}
+        path: build/release/bin/monero-wallet-gui.tar
+
  docker-linux-static:
    runs-on: ubuntu-20.04
    steps:
@@ -74,6 +103,12 @@ jobs:
      run: docker build --tag monero:build-env-linux --build-arg THREADS=3 --file Dockerfile.linux .
    - name: build
      run: docker run --rm -v /home/runner/work/monero-gui/monero-gui:/monero-gui -w /monero-gui monero:build-env-linux sh -c 'make release-static -j3'
+    - uses: actions/upload-artifact@v2
+      with:
+        name: ${{ github.job }}
+        path: |
+          /home/runner/work/monero-gui/monero-gui/build/release/bin/monero-wallet-gui
+          /home/runner/work/monero-gui/monero-gui/build/release/bin/monerod

  docker-windows-static:
    runs-on: ubuntu-20.04
@@ -91,3 +126,42 @@ jobs:
      run: docker build --tag monero:build-env-windows --build-arg THREADS=3 --file Dockerfile.windows .
    - name: build
      run: docker run --rm -v /home/runner/work/monero-gui/monero-gui:/monero-gui -w /monero-gui monero:build-env-windows sh -c 'make depends root=/depends target=x86_64-w64-mingw32 tag=win-x64 -j3'
+    - uses: actions/upload-artifact@v2
+      with:
+        name: ${{ github.job }}
+        path: |
+          /home/runner/work/monero-gui/monero-gui/build/x86_64-w64-mingw32/release/bin/monero-wallet-gui.exe
+          /home/runner/work/monero-gui/monero-gui/build/x86_64-w64-mingw32/release/bin/monerod.exe
+
+  docker-android:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        submodules: recursive
+    - name: preprare build enviroment
+      run: docker build --tag monero:build-env-android --build-arg THREADS=3 --file Dockerfile.android .
+    - name: build
+      run: docker run --rm -v /home/runner/work/monero-gui/monero-gui:/monero-gui -e THREADS=3 monero:build-env-android
+    - uses: actions/upload-artifact@v2
+      with:
+        name: ${{ github.job }}
+        path: /home/runner/work/monero-gui/monero-gui/build/Android/release/android-build/monero-gui.apk
+
+  source-archive:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        submodules: recursive
+    - name: archive
+      run: |
+        pip install git-archive-all
+        export VERSION="monero-gui-$(git describe)"
+        export OUTPUT="$VERSION.tar"
+        echo "OUTPUT=$OUTPUT" >> $GITHUB_ENV
+        /home/runner/.local/bin/git-archive-all --prefix "$VERSION/" --force-submodules "$OUTPUT"
+    - uses: actions/upload-artifact@v2
+      with:
+        name: ${{ env.OUTPUT }}
+        path: /home/runner/work/monero-gui/monero-gui/${{ env.OUTPUT }}
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,11 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
 project(monero-gui)

 message(STATUS "Initiating compile using CMake ${CMAKE_VERSION}")

 set(VERSION_MAJOR "17")
 set(VERSION_MINOR "1")
-set(VERSION_REVISION "1")
+set(VERSION_REVISION "5")
 set(VERSION "0.${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")

 option(STATIC "Link libraries statically, requires static Qt")
@@ -76,7 +76,7 @@ if(STATIC)
  message(STATUS "Initiating static build")
  set(Boost_USE_STATIC_LIBS ON)
  set(Boost_USE_STATIC_RUNTIME ON)
-  set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+  set(CMAKE_FIND_LIBRARY_SUFFIXES ".a" ${CMAKE_FIND_LIBRARY_SUFFIXES})
  add_definitions(-DMONERO_GUI_STATIC)
 endif()

@@ -134,7 +134,7 @@ message(STATUS "OpenSSL: libraries at ${OPENSSL_LIBRARIES} ${OPENSSL_SSL_LIBRARI
 # Zbar (for QR scanner)
 if(WITH_SCANNER)
    add_definitions(-DWITH_SCANNER)
-    find_package(ZBar0)
+    find_package(ZBar0 REQUIRED)
    message(STATUS "libzbar: include dir at ${ZBAR_INCLUDE_DIR}")
    message(STATUS "libzbar: libraries at ${ZBAR_LIBRARIES}")
 endif()
@@ -149,9 +149,11 @@ message(STATUS "libusb: include dir at ${LibUSB_INCLUDE_DIRS}")
 message(STATUS "libusb: libraries at ${LibUSB_LIBRARIES}")

 # HIDApi
-find_package(HIDAPI REQUIRED)
-message(STATUS "libhidapi: include dir at ${HIDAPI_INCLUDE_DIRS}")
-message(STATUS "libhidapi: libraries at ${HIDAPI_LIBRARIES}")
+if(NOT ANDROID)
+  find_package(HIDAPI REQUIRED)
+  message(STATUS "libhidapi: include dir at ${HIDAPI_INCLUDE_DIRS}")
+  message(STATUS "libhidapi: libraries at ${HIDAPI_LIBRARIES}")
+endif()

 # Boost
 if(DEBUG)
@@ -174,9 +176,12 @@ find_package(Boost 1.58 REQUIRED COMPONENTS
 		program_options
 		locale)

-if(UNIX AND NOT APPLE)
+if(UNIX AND NOT APPLE AND NOT ANDROID)
    set(CMAKE_SKIP_RPATH ON)
+    set(CMAKE_FIND_LIBRARY_SUFFIXES_PREV ${CMAKE_FIND_LIBRARY_SUFFIXES})
+    set(CMAKE_FIND_LIBRARY_SUFFIXES ".so")
    find_package(X11 REQUIRED)
+    set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_PREV})
    message(STATUS "X11_FOUND = ${X11_FOUND}")
    message(STATUS "X11_INCLUDE_DIR = ${X11_INCLUDE_DIR}")
    message(STATUS "X11_LIBRARIES = ${X11_LIBRARIES}")
@@ -204,9 +209,7 @@ endif()
 set(QT5_LIBRARIES
  Qt5Core
  Qt5Quick
-  Qt5Widgets
  Qt5Gui
-  Qt5Network
  Qt5Qml
  Qt5Svg
  Qt5Xml
@@ -218,20 +221,17 @@ endif()

 if(APPLE)
  list(APPEND QT5_LIBRARIES Qt5MacExtras)
+endif()

+if(UNIX)
  if(NOT CMAKE_PREFIX_PATH AND DEFINED ENV{CMAKE_PREFIX_PATH})
    message(STATUS "Using CMAKE_PREFIX_PATH environment variable: '$ENV{CMAKE_PREFIX_PATH}'")
    set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH})
  endif()
-  if(NOT CMAKE_PREFIX_PATH)
+  if(APPLE AND NOT CMAKE_PREFIX_PATH)
    execute_process(COMMAND brew --prefix qt5 OUTPUT_VARIABLE QT5_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
    list(APPEND CMAKE_PREFIX_PATH ${QT5_DIR})
  endif()
-
-  if(CMAKE_PREFIX_PATH)
-    include_directories(${CMAKE_PREFIX_PATH}/include)
-    set(CMAKE_BUILD_RPATH "${CMAKE_PREFIX_PATH}/lib")
-  endif()
 endif()

 find_package(PkgConfig REQUIRED)
@@ -253,7 +253,22 @@ foreach(QT5_MODULE ${QT5_LIBRARIES})
  include_directories(${${QT5_MODULE}_INCLUDE_DIRS})
 endforeach()

-pkg_check_modules(QT5_PKG_CONFIG REQUIRED ${QT5_LIBRARIES})
+if(NOT (CMAKE_CROSSCOMPILING AND ANDROID))
+  pkg_check_modules(QT5_PKG_CONFIG REQUIRED ${QT5_LIBRARIES})
+else()
+  set(QT5_LIBRARIES_ABI)
+  foreach(QT5_MODULE ${QT5_LIBRARIES})
+    list(APPEND QT5_LIBRARIES_ABI "${QT5_MODULE}_${CMAKE_ANDROID_ARCH_ABI}")
+  endforeach()
+  pkg_check_modules(QT5_PKG_CONFIG REQUIRED ${QT5_LIBRARIES_ABI})
+endif()
+
+get_target_property(QMAKE_IMPORTED_LOCATION Qt5::qmake IMPORTED_LOCATION)
+get_filename_component(QT_INSTALL_PREFIX "${QMAKE_IMPORTED_LOCATION}/../.." ABSOLUTE)
+
+if(APPLE AND NOT STATIC)
+  set(CMAKE_BUILD_RPATH "${QT_INSTALL_PREFIX}/lib")
+endif()

 if(QT5_PKG_CONFIG_FOUND)
  set(QT5_PKG_CONFIG "QT5_PKG_CONFIG")
@@ -261,15 +276,15 @@ if(QT5_PKG_CONFIG_FOUND)
    set(QT5_PKG_CONFIG "${QT5_PKG_CONFIG}_STATIC")
  endif()

-  if(APPLE)
-    list(JOIN ${QT5_PKG_CONFIG}_LDFLAGS_OTHER " " ${QT5_PKG_CONFIG}_LDFLAGS_OTHER)
-    list(JOIN ${QT5_PKG_CONFIG}_LIBRARIES " " ${QT5_PKG_CONFIG}_LIBRARIES)
-    list(JOIN ${QT5_PKG_CONFIG}_INCLUDE_DIRS " " ${QT5_PKG_CONFIG}_INCLUDE_DIRS)
-
+  if(UNIX AND CMAKE_PREFIX_PATH)
+    if(APPLE)
+      list(JOIN ${QT5_PKG_CONFIG}_LDFLAGS_OTHER " " ${QT5_PKG_CONFIG}_LDFLAGS_OTHER)
+    endif()
    # temporal workaround for https://bugreports.qt.io/browse/QTBUG-80922
-    STRING(REPLACE "${QT5_PKG_CONFIG_Qt5Core_PREFIX}" "${CMAKE_PREFIX_PATH}" ${QT5_PKG_CONFIG}_LDFLAGS_OTHER "${${QT5_PKG_CONFIG}_LDFLAGS_OTHER}")
-    STRING(REPLACE "${QT5_PKG_CONFIG_Qt5Core_PREFIX}" "${CMAKE_PREFIX_PATH}" ${QT5_PKG_CONFIG}_LIBRARIES "${${QT5_PKG_CONFIG}_LIBRARIES}")
-    STRING(REPLACE "${QT5_PKG_CONFIG_Qt5Core_PREFIX}" "${CMAKE_PREFIX_PATH}" ${QT5_PKG_CONFIG}_INCLUDE_DIRS "${${QT5_PKG_CONFIG}_INCLUDE_DIRS}")
+    STRING(REPLACE "${QT5_PKG_CONFIG_Qt5Core_PREFIX}" "${QT_INSTALL_PREFIX}" ${QT5_PKG_CONFIG}_LDFLAGS_OTHER "${${QT5_PKG_CONFIG}_LDFLAGS_OTHER}")
+    STRING(REPLACE "${QT5_PKG_CONFIG_Qt5Core_PREFIX}" "${QT_INSTALL_PREFIX}" ${QT5_PKG_CONFIG}_LIBRARIES "${${QT5_PKG_CONFIG}_LIBRARIES}")
+    STRING(REPLACE "${QT5_PKG_CONFIG_Qt5Core_PREFIX}" "${QT_INSTALL_PREFIX}" ${QT5_PKG_CONFIG}_INCLUDE_DIRS "${${QT5_PKG_CONFIG}_INCLUDE_DIRS}")
+    STRING(REPLACE "${QT5_PKG_CONFIG_Qt5Core_PREFIX}" "${QT_INSTALL_PREFIX}" ${QT5_PKG_CONFIG}_LIBRARY_DIRS "${${QT5_PKG_CONFIG}_LIBRARY_DIRS}")
  endif()

  set(QT5_LIBRARIES ${${QT5_PKG_CONFIG}_LIBRARIES} ${${QT5_PKG_CONFIG}_LDFLAGS_OTHER})
@@ -290,6 +305,7 @@ if(STATIC)
  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtGraphicalEffects)
  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtGraphicalEffects/private)
  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtMultimedia)
+  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQml)
  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQuick.2)
  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQuick/Controls)
  list(APPEND QT5_EXTRA_PATHS ${QT5_PKG_CONFIG_Qt5Qml_PREFIX}/qml/QtQuick/Controls.2)
@@ -330,6 +346,10 @@ if(STATIC)
    windowplugin
  )

+  if(NOT ${Qt5Core_VERSION} VERSION_LESS 5.14)
+     list(APPEND QT5_EXTRA_LIBRARIES_LIST qmlplugin)
+  endif()
+
  set(QT5_EXTRA_LIBRARIES)
  foreach(LIBRARY ${QT5_EXTRA_LIBRARIES_LIST})
    find_library(${LIBRARY}_LIBRARY ${LIBRARY} PATHS ${QT5_EXTRA_PATHS} REQUIRED)
@@ -357,7 +377,6 @@ if(STATIC)
  if(UNIX AND NOT APPLE)
    list(APPEND QT5_INTEGRATION_LIBRARIES_LIST
      Qt5XcbQpa
-      xcb-static
      Qt5ServiceSupport
      Qt5GlxSupport
    )
@@ -371,11 +390,30 @@ if(STATIC)
  endforeach()

  if(UNIX AND NOT APPLE)
-    pkg_check_modules(X11XCB_XCBGLX_FONTCONFIG REQUIRED x11-xcb xcb-glx fontconfig)
-    list(APPEND QT5_LIBRARIES ${X11XCB_XCBGLX_FONTCONFIG_STATIC_LIBRARIES})
+    pkg_check_modules(X11XCB_XCBGLX REQUIRED x11-xcb xcb-glx)
+    list(APPEND QT5_LIBRARIES ${X11XCB_XCBGLX_LIBRARIES})
+    pkg_check_modules(FONTCONFIG REQUIRED fontconfig)
+    list(APPEND QT5_LIBRARIES ${FONTCONFIG_STATIC_LIBRARIES})
  endif()
 endif()

+if(ANDROID)
+  set(QT5_EXTRA_LIBRARIES_LIST
+    GLESv2
+    log
+    z
+    jnigraphics
+    android
+    EGL
+    Qt5VirtualKeyboard_${CMAKE_ANDROID_ARCH_ABI}
+    c++_shared
+  )
+  foreach(LIBRARY ${QT5_EXTRA_LIBRARIES_LIST})
+    find_library(${LIBRARY}_LIBRARY ${LIBRARY} PATHS "${ANDROID_TOOLCHAIN_ROOT}/sysroot/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/${ANDROID_PLATFORM_LEVEL}" REQUIRED)
+    list(APPEND QT5_LIBRARIES ${${LIBRARY}_LIBRARY})
+  endforeach()
+endif()
+
 message(STATUS "Using Boost include dir at ${Boost_INCLUDE_DIRS}")
 message(STATUS "Using Boost libraries at ${Boost_LIBRARIES}")

--- a/DEPLOY.md
+++ b/DEPLOY.md
@@ -2,19 +2,17 @@

 Use macOS 10.12 - 10.13 for better backwards compability.

-1. `HOMEBREW_OPTFLAGS="-march=core2" HOMEBREW_OPTIMIZATION_LEVEL="O0" brew install boost zmq libpgm miniupnpc libsodium expat libunwind-headers protobuf libgcrypt`
+1. `HOMEBREW_OPTFLAGS="-march=core2" HOMEBREW_OPTIMIZATION_LEVEL="O0" brew install boost zmq libpgm miniupnpc libsodium expat libunwind-headers protobuf libgcrypt hidapi`

-2. `HOMEBREW_OPTFLAGS="-march=core2" HOMEBREW_OPTIMIZATION_LEVEL="O0" brew install --HEAD hidapi`
+2. Get the latest LTS from here: https://www.qt.io/offline-installers and install

-3. Get the latest LTS from here: https://www.qt.io/offline-installers and install
+3. `git clone --recursive -b v0.X.Y.Z --depth 1 https://github.com/monero-project/monero-gui` 

-4. `git clone --recursive -b v0.X.Y.Z --depth 1 https://github.com/monero-project/monero-gui` 
+4. `CMAKE_PREFIX_PATH=~/Qt5.12.8/5.12.8/clang_64 make release`

-5. `CMAKE_PREFIX_PATH=~/Qt5.12.8/5.12.8/clang_64 make release`
+5. `cd build/release && make deploy`

-6. `cd build/release && make deploy`
-
-7. Replace the `monerod` binary inside `monero-wallet-gui.app/Contents/MacOS/` with one built using deterministic builds / gitian.
+6. Replace the `monerod` binary inside `monero-wallet-gui.app/Contents/MacOS/` with one built using deterministic builds / gitian.

 ## Codesigning and notarizing

--- a/Dockerfile.android
+++ b/Dockerfile.android
@@ -0,0 +1,217 @@
+FROM debian:unstable
+
+ARG THREADS=1
+ARG ANDROID_NDK_REVISION=21d
+ARG ANDROID_NDK_HASH=bcf4023eb8cb6976a4c7cff0a8a8f145f162bf4d
+ARG ANDROID_SDK_REVISION=4333796
+ARG ANDROID_SDK_HASH=92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9
+ARG QT_VERSION=5.15.2
+
+WORKDIR /opt/android
+ENV WORKDIR=/opt/android
+
+ENV ANDROID_NATIVE_API_LEVEL=28
+ENV ANDROID_API=android-${ANDROID_NATIVE_API_LEVEL}
+ENV ANDROID_CLANG=aarch64-linux-android${ANDROID_NATIVE_API_LEVEL}-clang
+ENV ANDROID_CLANGPP=aarch64-linux-android${ANDROID_NATIVE_API_LEVEL}-clang++
+ENV ANDROID_NDK_ROOT=${WORKDIR}/android-ndk-r${ANDROID_NDK_REVISION}
+ENV ANDROID_SDK_ROOT=${WORKDIR}/tools
+ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
+ENV PATH=${JAVA_HOME}/bin:${PATH}
+ENV PREFIX=${WORKDIR}/prefix
+ENV TOOLCHAIN_DIR=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64
+
+RUN apt-get update \
+    && apt-get install -y ant automake build-essential ca-certificates-java cmake file gettext git libc6 libncurses5 \
+    libstdc++6 libtinfo5 libtool libz1 openjdk-8-jdk-headless openjdk-8-jre-headless pkg-config python3 unzip wget
+
+RUN wget -q https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_REVISION}.zip \
+    && unzip -q sdk-tools-linux-${ANDROID_SDK_REVISION}.zip \
+    && rm -f sdk-tools-linux-${ANDROID_SDK_REVISION}.zip
+
+RUN wget -q https://dl.google.com/android/repository/android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip \
+    && unzip -q android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip \
+    && rm -f android-ndk-r${ANDROID_NDK_REVISION}-linux-x86_64.zip
+
+RUN cd ${ANDROID_SDK_ROOT} && echo y | ./bin/sdkmanager "platform-tools" "platforms;${ANDROID_API}" "tools" > /dev/null
+RUN cp -r ${WORKDIR}/platforms ${WORKDIR}/platform-tools ${ANDROID_SDK_ROOT}
+
+ENV HOST_PATH=${PATH}
+ENV PATH=${TOOLCHAIN_DIR}/aarch64-linux-android/bin:${TOOLCHAIN_DIR}/bin:${PATH}
+
+ARG ZLIB_VERSION=1.2.11
+ARG ZLIB_HASH=c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
+RUN wget -q https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz \
+    && tar -xzf zlib-${ZLIB_VERSION}.tar.gz \
+    && rm zlib-${ZLIB_VERSION}.tar.gz \
+    && cd zlib-${ZLIB_VERSION} \
+    && CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --prefix=${PREFIX} --static \
+    && make -j${THREADS} \
+    && make -j${THREADS} install \
+    && rm -rf $(pwd)
+
+RUN git clone git://code.qt.io/qt/qt5.git -b ${QT_VERSION} --depth 1 \
+    && cd qt5 \
+    && perl init-repository --module-subset=default,-qtwebengine \
+    && PATH=${HOST_PATH} ./configure -v -developer-build -release \
+    -xplatform android-clang \
+    -android-ndk-platform ${ANDROID_API} \
+    -android-ndk ${ANDROID_NDK_ROOT} \
+    -android-sdk ${ANDROID_SDK_ROOT} \
+    -android-ndk-host linux-x86_64 \
+    -no-dbus \
+    -opengl es2 \
+    -no-use-gold-linker \
+    -no-sql-mysql \
+    -opensource -confirm-license \
+    -android-arch arm64-v8a \
+    -prefix ${PREFIX} \
+    -nomake tools -nomake tests -nomake examples \
+    -skip qtwebengine \
+    -skip qtserialport \
+    -skip qtconnectivity \
+    -skip qttranslations \
+    -skip qtpurchasing \
+    -skip qtgamepad -skip qtscript -skip qtdoc \
+    -no-warnings-are-errors \
+    && sed -i '213,215d' qtbase/src/3rdparty/pcre2/src/sljit/sljitConfigInternal.h \
+    && PATH=${HOST_PATH} make -j${THREADS} \
+    && PATH=${HOST_PATH} make -j${THREADS} install \
+    && cd qttools/src/linguist/lrelease && \
+    ../../../../qtbase/bin/qmake && \
+    PATH=${HOST_PATH} make -j$THREADS install && \
+    cd ../../../.. && \
+    rm -rf $(pwd)
+
+ARG ICONV_VERSION=1.16
+ARG ICONV_HASH=e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04
+RUN wget -q http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${ICONV_VERSION}.tar.gz \
+    && echo "${ICONV_HASH}  libiconv-${ICONV_VERSION}.tar.gz" | sha256sum -c \
+    && tar -xzf libiconv-${ICONV_VERSION}.tar.gz \
+    && rm -f libiconv-${ICONV_VERSION}.tar.gz \
+    && cd libiconv-${ICONV_VERSION} \
+    && CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --build=x86_64-linux-gnu --host=aarch64 --prefix=${PREFIX} --disable-rpath \
+    && make -j${THREADS} \
+    && make -j${THREADS} install
+
+ARG BOOST_VERSION=1_74_0
+ARG BOOST_VERSION_DOT=1.74.0
+ARG BOOST_HASH=83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1
+RUN wget -q https://dl.bintray.com/boostorg/release/${BOOST_VERSION_DOT}/source/boost_${BOOST_VERSION}.tar.bz2 \
+    && echo "${BOOST_HASH}  boost_${BOOST_VERSION}.tar.bz2" | sha256sum -c \
+    && tar -xf boost_${BOOST_VERSION}.tar.bz2 \
+    && rm -f boost_${BOOST_VERSION}.tar.bz2 \
+    && cd boost_${BOOST_VERSION} \
+    && PATH=${HOST_PATH} ./bootstrap.sh --prefix=${PREFIX} \
+    && PATH=${TOOLCHAIN_DIR}/bin:${HOST_PATH} ./b2 --build-type=minimal link=static runtime-link=static \
+    --with-chrono --with-date_time --with-filesystem --with-program_options --with-regex --with-serialization \
+    --with-system --with-thread --with-locale --build-dir=android --stagedir=android toolset=clang threading=multi \
+    threadapi=pthread target-os=android -sICONV_PATH=${PREFIX} \
+    cflags='--target=aarch64-linux-android' \
+    cxxflags='--target=aarch64-linux-android' \
+    linkflags='--target=aarch64-linux-android --sysroot=${ANDROID_NDK_ROOT}/platforms/${ANDROID_API}/arch-arm64 ${ANDROID_NDK_ROOT}/sources/cxx-stl/llvm-libc++/libs/arm64-v8a/libc++_shared.so -nostdlib++' \
+    install -j${THREADS} \
+    && rm -rf $(pwd)
+
+ARG OPENSSL_VERSION=1.1.1g
+ARG OPENSSL_HASH=ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46
+RUN wget -q https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz \
+    && tar -xzf openssl-${OPENSSL_VERSION}.tar.gz \
+    && rm openssl-${OPENSSL_VERSION}.tar.gz \
+    && cd openssl-${OPENSSL_VERSION} \
+    && ANDROID_NDK_HOME=${ANDROID_NDK_ROOT} ./Configure CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} \
+    android-arm64 no-asm no-shared --static \
+    --with-zlib-include=${PREFIX}/include --with-zlib-lib=${PREFIX}/lib \
+    --prefix=${PREFIX} --openssldir=${PREFIX} \
+    && sed -i 's/CNF_EX_LIBS=-ldl -pthread//g;s/BIN_CFLAGS=-pie $(CNF_CFLAGS) $(CFLAGS)//g' Makefile \
+    && ANDROID_NDK_HOME=${ANDROID_NDK_ROOT} make -j${THREADS} \
+    && make -j${THREADS} install \
+    && rm -rf $(pwd)
+
+ARG ZMQ_VERSION=v4.3.3
+ARG ZMQ_HASH=04f5bbedee58c538934374dc45182d8fc5926fa3
+RUN git clone https://github.com/zeromq/libzmq.git -b ${ZMQ_VERSION} --depth 1 \
+    && cd libzmq \
+    && git checkout ${ZMQ_HASH} \
+    && ./autogen.sh \
+    && CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --prefix=${PREFIX} --host=aarch64-linux-android \
+    --enable-static --disable-shared \
+    && make -j${THREADS} \
+    && make -j${THREADS} install \
+    && rm -rf $(pwd)
+
+ARG SODIUM_VERSION=1.0.18
+ARG SODIUM_HASH=4f5e89fa84ce1d178a6765b8b46f2b6f91216677
+RUN set -ex \
+    && git clone https://github.com/jedisct1/libsodium.git -b ${SODIUM_VERSION} --depth 1 \
+    && cd libsodium \
+    && test `git rev-parse HEAD` = ${SODIUM_HASH} || exit 1 \
+    && ./autogen.sh \
+    && CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --prefix=${PREFIX} --host=aarch64-linux-android --enable-static --disable-shared \
+    && make -j${THREADS} install \
+    && rm -rf $(pwd)
+
+RUN git clone https://github.com/ZBar/ZBar.git --depth 1 \
+    && cd ZBar \
+    && git reset --hard 854a5d97059e395807091ac4d80c53f7968abb8f \
+    && sed -i 's/SHARED/STATIC/' android/jni/Android.mk \
+    && sed -i -E 's/(.*BUILD_STATIC_LIBRARY.*)/LOCAL_CPP_FEATURES := exceptions rtti features\n\0/' android/jni/Android.mk \
+    && sed -i -E 's/(.*BUILD_STATIC_LIBRARY.*)/LOCAL_CFLAGS := -Wno-multichar\n\0/' android/jni/Android.mk \
+    && sed -i -E 's/(.*BUILD_STATIC_LIBRARY.*)/LOCAL_CFLAGS += -D_ANDROID\n\0/' android/jni/Android.mk \
+    && sed -i -E 's/(.*BUILD_STATIC_LIBRARY.*)/LOCAL_CFLAGS += -DLIBDIR="\\".\\""\n\0/' android/jni/Android.mk \
+    && sed -i -E 's/(.*BUILD_STATIC_LIBRARY.*)/LOCAL_CFLAGS += -DBUILDING_LIBICONV\n\0/' android/jni/Android.mk \
+    && sed -i -E 's/(.*BUILD_STATIC_LIBRARY.*)/LOCAL_CFLAGS += -DBUILDING_LIBCHARSET\n\0/' android/jni/Android.mk \
+    && sed -i -E 's/(.*BUILD_STATIC_LIBRARY.*)/LOCAL_CFLAGS += -DIN_LIBRARY\n\0/' android/jni/Android.mk \
+    && sed -i -E 's/(.*BUILD_STATIC_LIBRARY.*)/LOCAL_CFLAGS += -fno-stack-protector\n\0/' android/jni/Android.mk \
+    && echo "APP_ABI := arm64-v8a \nAPP_STL := c++_shared \nTARGET_PLATFORM := ${ANDROID_API} \nTARGET_ARCH_ABI := arm64-v8a \nAPP_CFLAGS +=  -target aarch64-none-linux-android -fexceptions -fstack-protector-strong -fno-limit-debug-info -mfloat-abi=softfp -fno-builtin-memmove -fno-omit-frame-pointer -fno-stack-protector\n" \
+       >> android/jni/Application.mk \
+    && cd android \
+    && CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ${ANDROID_NDK_ROOT}/ndk-build ICONV_SRC=${WORKDIR}/libiconv-${ICONV_VERSION} -B V=1 NDK_APPLICATION_MK=jni/Application.mk \
+    && cp obj/local/arm64-v8a/lib* ${PREFIX}/lib \
+    && cp -r ../include/* ${PREFIX}/include
+
+RUN git clone -b libgpg-error-1.38 --depth 1 git://git.gnupg.org/libgpg-error.git \
+    && cd libgpg-error \
+    && git reset --hard 71d278824c5fe61865f7927a2ed1aa3115f9e439 \
+    && ./autogen.sh \
+    && CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --host=aarch64-linux-android --prefix=${PREFIX} --disable-rpath --disable-shared --enable-static --disable-doc --disable-tests \
+    && PATH=${TOOLCHAIN_DIR}/bin:${HOST_PATH} make -j${THREADS} \
+    && make -j${THREADS} install \
+    && rm -rf $(pwd)
+
+RUN git clone -b libgcrypt-1.8.5 --depth 1 git://git.gnupg.org/libgcrypt.git \
+    && cd libgcrypt \
+    && git reset --hard 56606331bc2a80536db9fc11ad53695126007298 \
+    && ./autogen.sh \
+    && CC=${ANDROID_CLANG} CXX=${ANDROID_CLANGPP} ./configure --host=aarch64-linux-android --prefix=${PREFIX} --with-gpg-error-prefix=${PREFIX} --disable-shared --enable-static --disable-doc --disable-tests \
+    && PATH=${TOOLCHAIN_DIR}/bin:${HOST_PATH} make -j${THREADS} \
+    && make -j${THREADS} install \
+    && rm -rf $(pwd)
+
+RUN cd tools \
+    && wget -q http://dl-ssl.google.com/android/repository/tools_r25.2.5-linux.zip \
+    && unzip -q tools_r25.2.5-linux.zip \
+    && rm -f tools_r25.2.5-linux.zip \
+    && echo y | ${ANDROID_SDK_ROOT}/tools/android update sdk --no-ui --all --filter build-tools-28.0.3
+
+CMD set -ex \
+    && cd /monero-gui \
+    && mkdir -p build/Android/release \
+    && cd build/Android/release \
+    && cmake \
+    -DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake" \
+    -DCMAKE_PREFIX_PATH="${PREFIX}" \
+    -DCMAKE_FIND_ROOT_PATH="${PREFIX}" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DARCH="armv8-a" \
+    -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} \
+    -DANDROID_ABI="arm64-v8a" \
+    -DANDROID_TOOLCHAIN=clang \
+    -DBoost_USE_STATIC_RUNTIME=ON \
+    -DLRELEASE_PATH="${PREFIX}/bin" \
+    -DQT_ANDROID_APPLICATION_BINARY="monero-wallet-gui" \
+    -DWITH_SCANNER=ON \
+    ../../.. \
+    && PATH=${HOST_PATH} make generate_translations_header \
+    && make -j${THREADS} -C src \
+    && make -j${THREADS} apk
--- a/Dockerfile.linux
+++ b/Dockerfile.linux
@@ -1,6 +1,12 @@
 FROM ubuntu:16.04

 ARG THREADS=1
+ARG QT_VERSION=5.15.2
+
+ENV CFLAGS="-fPIC"
+ENV CPPFLAGS="-fPIC"
+ENV CXXFLAGS="-fPIC"
+ENV SOURCE_DATE_EPOCH=1397818193

 RUN apt update

@@ -8,7 +14,7 @@ RUN apt install -y automake git pkg-config python xutils-dev && \
    git clone -b xorgproto-2020.1 --depth 1 https://gitlab.freedesktop.org/xorg/proto/xorgproto && \
    cd xorgproto && \
    git reset --hard c62e8203402cafafa5ba0357b6d1c019156c9f36 && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
+    ./autogen.sh && \
    make -j$THREADS && \
    make -j$THREADS install && \
    rm -rf $(pwd)
@@ -16,7 +22,7 @@ RUN apt install -y automake git pkg-config python xutils-dev && \
 RUN git clone -b 1.12 --depth 1 https://gitlab.freedesktop.org/xorg/proto/xcbproto && \
    cd xcbproto && \
    git reset --hard 6398e42131eedddde0d98759067dde933191f049 && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
+    ./autogen.sh && \
    make -j$THREADS && \
    make -j$THREADS install && \
    rm -rf $(pwd)
@@ -25,7 +31,7 @@ RUN apt install -y libtool-bin && \
    git clone -b libXau-1.0.9 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxau && \
    cd libxau && \
    git reset --hard d9443b2c57b512cfb250b35707378654d86c7dea && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
+    ./autogen.sh --enable-shared --disable-static && \
    make -j$THREADS && \
    make -j$THREADS install && \
    rm -rf $(pwd)
@@ -34,7 +40,76 @@ RUN apt install -y libpthread-stubs0-dev && \
    git clone -b 1.12 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb && \
    cd libxcb && \
    git reset --hard d34785a34f28fa6a00f8ce00d87e3132ff0f6467 && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
+    ./autogen.sh --enable-shared --disable-static && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    make -j$THREADS clean && \
+    rm /usr/local/lib/libxcb-xinerama.so && \
+    ./autogen.sh --disable-shared --enable-static && \
+    make -j$THREADS && \
+    cp src/.libs/libxcb-xinerama.a /usr/local/lib/ && \
+    rm -rf $(pwd)
+
+RUN git clone -b 0.4.0 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb-util && \
+    cd libxcb-util && \
+    git reset --hard acf790d7752f36e450d476ad79807d4012ec863b && \
+    git submodule init && \
+    git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \
+    git -C m4 reset --hard f662e3a93ebdec3d1c9374382dcc070093a42fed && \
+    ./autogen.sh --enable-shared --disable-static && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+RUN git clone -b 0.4.0 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb-image && \
+    cd libxcb-image && \
+    git reset --hard d882052fb2ce439c6483fce944ba8f16f7294639 && \
+    git submodule init && \
+    git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \
+    git -C m4 reset --hard f662e3a93ebdec3d1c9374382dcc070093a42fed && \
+    ./autogen.sh --enable-shared --disable-static && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+RUN git clone -b 0.4.0 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb-keysyms && \
+    cd libxcb-keysyms && \
+    git reset --hard 0e51ee5570a6a80bdf98770b975dfe8a57f4eeb1 && \
+    git submodule init && \
+    git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \
+    git -C m4 reset --hard f662e3a93ebdec3d1c9374382dcc070093a42fed && \
+    ./autogen.sh --enable-shared --disable-static && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+RUN git clone -b 0.3.9 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb-render-util && \
+    cd libxcb-render-util && \
+    git reset --hard 0317caf63de532fd7a0493ed6afa871a67253747 && \
+    git submodule init && \
+    git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \
+    git -C m4 reset --hard f662e3a93ebdec3d1c9374382dcc070093a42fed && \
+    ./autogen.sh --enable-shared --disable-static && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+RUN git clone -b 0.4.1 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxcb-wm && \
+    cd libxcb-wm && \
+    git reset --hard 24eb17df2e1245885e72c9d4bbb0a0f69f0700f2 && \
+    git submodule init && \
+    git clone --depth 1 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 m4 && \
+    git -C m4 reset --hard f662e3a93ebdec3d1c9374382dcc070093a42fed && \
+    ./autogen.sh --enable-shared --disable-static && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+RUN apt install -y bison && \
+    git clone -b xkbcommon-0.5.0 --depth 1 https://github.com/xkbcommon/libxkbcommon && \
+    cd libxkbcommon && \
+    git reset --hard c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28 && \
+    ./autogen.sh --prefix=/usr --enable-shared --disable-static --enable-x11 --disable-docs && \
    make -j$THREADS && \
    make -j$THREADS install && \
    rm -rf $(pwd)
@@ -42,7 +117,7 @@ RUN apt install -y libpthread-stubs0-dev && \
 RUN git clone -b v1.2.11 --depth 1 https://github.com/madler/zlib && \
    cd zlib && \
    git reset --hard cacf7f1d4e3d44d871b605da3b647f07d718623f && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --static && \
+    ./configure --static && \
    make -j$THREADS && \
    make -j$THREADS install && \
    rm -rf $(pwd)
@@ -51,7 +126,7 @@ RUN git clone -b VER-2-10-2 --depth 1 https://git.savannah.gnu.org/git/freetype/
    cd freetype2 && \
    git reset --hard 132f19b779828b194b3fede187cee719785db4d8 && \
    ./autogen.sh && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --disable-shared --enable-static --with-zlib=no && \
+    ./configure --disable-shared --enable-static --with-zlib=no && \
    make -j$THREADS && \
    make -j$THREADS install && \
    rm -rf $(pwd)
@@ -60,7 +135,7 @@ RUN git clone -b R_2_2_9 --depth 1 https://github.com/libexpat/libexpat && \
    cd libexpat/expat && \
    git reset --hard a7bc26b69768f7fb24f0c7976fae24b157b85b13 && \
    ./buildconf.sh && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --disable-shared --enable-static && \
+    ./configure --disable-shared --enable-static && \
    make -j$THREADS && \
    make -j$THREADS install && \
    rm -rf $(pwd)
@@ -69,7 +144,7 @@ RUN apt install -y autopoint gettext gperf libpng12-dev && \
    git clone -b 2.13.92 --depth 1 https://gitlab.freedesktop.org/fontconfig/fontconfig && \
    cd fontconfig && \
    git reset --hard b1df1101a643ae16cdfa1d83b939de2497b1bf27 && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static --sysconfdir=/etc --localstatedir=/var && \
+    ./autogen.sh --disable-shared --enable-static --sysconfdir=/etc --localstatedir=/var && \
    make -j$THREADS && \
    make -j$THREADS install && \
    rm -rf $(pwd)
@@ -77,46 +152,56 @@ RUN apt install -y autopoint gettext gperf libpng12-dev && \
 RUN git clone -b release-64-2 --depth 1 https://github.com/unicode-org/icu && \
    cd icu/icu4c/source && \
    git reset --hard e2d85306162d3a0691b070b4f0a73e4012433444 && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --disable-shared --enable-static --disable-tests --disable-samples && \
+    ./configure --disable-shared --enable-static --disable-tests --disable-samples && \
    make -j$THREADS && \
    make -j$THREADS install && \
    rm -rf $(pwd)

 RUN apt install -y wget && \
    wget https://dl.bintray.com/boostorg/release/1.73.0/source/boost_1_73_0.tar.gz && \
-    echo "9995e192e68528793755692917f9eb6422f3052a53c5e13ba278a228af6c7acf boost_1_73_0.tar.gz" > hashsum.txt && \
-    sha256sum -c hashsum.txt && \
+    echo "9995e192e68528793755692917f9eb6422f3052a53c5e13ba278a228af6c7acf boost_1_73_0.tar.gz" | sha256sum -c && \
    tar -xzf boost_1_73_0.tar.gz && \
    rm boost_1_73_0.tar.gz && \
    cd boost_1_73_0 && \
    ./bootstrap.sh && \
-    ./b2 --with-atomic --with-system --with-filesystem --with-thread --with-date_time --with-chrono --with-regex --with-serialization --with-program_options --with-locale variant=release link=static runtime-link=static cflags='-fPIC' cxxflags='-fPIC' install -a --prefix=/usr && \
+    ./b2 --with-atomic --with-system --with-filesystem --with-thread --with-date_time --with-chrono --with-regex --with-serialization --with-program_options --with-locale variant=release link=static runtime-link=static cflags="${CFLAGS}" cxxflags="${CXXFLAGS}" install -a --prefix=/usr && \
    rm -rf $(pwd)

 RUN wget https://www.openssl.org/source/openssl-1.1.1g.tar.gz && \
-    echo "ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46 openssl-1.1.1g.tar.gz" > hashsum.txt && \
-    sha256sum -c hashsum.txt && \
+    echo "ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46 openssl-1.1.1g.tar.gz" | sha256sum -c && \
    tar -xzf openssl-1.1.1g.tar.gz && \
    rm openssl-1.1.1g.tar.gz && \
    cd openssl-1.1.1g && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./config no-asm no-shared no-zlib-dynamic --openssldir=/usr && \
+    ./config no-asm no-shared no-zlib-dynamic --openssldir=/usr && \
    make -j$THREADS && \
    make -j$THREADS install && \
    rm -rf $(pwd)

-RUN apt install -y libgl1-mesa-dev libglib2.0-dev libxkbcommon-dev && \
-    wget https://download.qt.io/archive/qt/5.9/5.9.9/single/qt-everywhere-opensource-src-5.9.9.tar.xz && \
-    echo "5ce285209290a157d7f42ec8eb22bf3f1d76f2e03a95fc0b99b553391be01642 qt-everywhere-opensource-src-5.9.9.tar.xz"  > hashsum.txt && \
-    sha256sum -c hashsum.txt && \
-    tar -xf qt-everywhere-opensource-src-5.9.9.tar.xz && \
-    rm qt-everywhere-opensource-src-5.9.9.tar.xz && \
-    cd qt-everywhere-opensource-src-5.9.9 && \
+RUN apt install -y libgl1-mesa-dev libglib2.0-dev mesa-common-dev && \
+    rm /usr/lib/x86_64-linux-gnu/libX11.a && \
+    rm /usr/lib/x86_64-linux-gnu/libXext.a && \
+    rm /usr/lib/x86_64-linux-gnu/libX11-xcb.a && \
+    git clone git://code.qt.io/qt/qt5.git -b ${QT_VERSION} --depth 1 && \
+    cd qt5 && \
+    git clone git://code.qt.io/qt/qtbase.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtdeclarative.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtgraphicaleffects.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtimageformats.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtmultimedia.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtquickcontrols.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtquickcontrols2.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtsvg.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qttools.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qttranslations.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtx11extras.git -b ${QT_VERSION} --depth 1 && \
+    git clone git://code.qt.io/qt/qtxmlpatterns.git -b ${QT_VERSION} --depth 1 && \
    sed -ri s/\(Libs:.*\)/\\1\ -lexpat/ /usr/local/lib/pkgconfig/fontconfig.pc && \
    sed -ri s/\(Libs:.*\)/\\1\ -lz/ /usr/local/lib/pkgconfig/freetype2.pc && \
    sed -ri s/\(Libs:.*\)/\\1\ -lXau/ /usr/local/lib/pkgconfig/xcb.pc && \
+    sed -i s/\\/usr\\/X11R6\\/lib64/\\/usr\\/local\\/lib/ qtbase/mkspecs/linux-g++-64/qmake.conf && \
    ./configure --prefix=/usr -platform linux-g++-64 -opensource -confirm-license -release -static -no-avx \
-    -opengl desktop -qpa xcb -system-freetype -fontconfig -glib \
-    -no-dbus -no-openssl -no-sql-sqlite -no-use-gold-linker \
+    -opengl desktop -qpa xcb -xcb -xcb-xlib -feature-xlib -system-freetype -fontconfig -glib \
+    -no-dbus -no-feature-qml-worker-script -no-linuxfb -no-openssl -no-sql-sqlite -no-kms -no-use-gold-linker \
    -qt-harfbuzz -qt-libjpeg -qt-libpng -qt-pcre -qt-zlib \
    -skip qt3d -skip qtandroidextras -skip qtcanvas3d -skip qtcharts -skip qtconnectivity -skip qtdatavis3d \
    -skip qtdoc -skip qtgamepad -skip qtlocation -skip qtmacextras -skip qtnetworkauth -skip qtpurchasing \
@@ -137,7 +222,7 @@ RUN apt install -y libudev-dev && \
    git clone -b v1.0.23 --depth 1 https://github.com/libusb/libusb && \
    cd libusb && \
    git reset --hard e782eeb2514266f6738e242cdcb18e3ae1ed06fa && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
+    ./autogen.sh --disable-shared --enable-static && \
    make -j$THREADS && \
    make -j$THREADS install && \
    rm -rf $(pwd)
@@ -146,23 +231,7 @@ RUN git clone -b hidapi-0.9.0 --depth 1 https://github.com/libusb/hidapi && \
    cd hidapi && \
    git reset --hard 7da5cc91fc0d2dbe4df4f08cd31f6ca1a262418f && \
    ./bootstrap && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --disable-shared --enable-static && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN git clone -b libX11-1.6.9 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libx11 && \
-    cd libx11 && \
-    git reset --hard db7cca17ad7807e92a928da9d4c68a00f4836da2 && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN git clone -b libXext-1.3.4 --depth 1 https://gitlab.freedesktop.org/xorg/lib/libxext && \
-    cd libxext && \
-    git reset --hard ebb167f34a3514783966775fb12573c4ed209625 && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./autogen.sh --disable-shared --enable-static && \
+    ./configure --disable-shared --enable-static && \
    make -j$THREADS && \
    make -j$THREADS install && \
    rm -rf $(pwd)
@@ -172,7 +241,7 @@ RUN apt install -y libsodium-dev && \
    cd libzmq && \
    git reset --hard a84ffa12b2eb3569ced199660bac5ad128bff1f0 && \
    ./autogen.sh && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --disable-shared --enable-static --disable-libunwind --with-libsodium && \
+    ./configure --disable-shared --enable-static --disable-libunwind --with-libsodium && \
    make -j$THREADS && \
    make -j$THREADS install && \
    rm -rf $(pwd)
@@ -181,7 +250,7 @@ RUN git clone -b libgpg-error-1.38 --depth 1 git://git.gnupg.org/libgpg-error.gi
    cd libgpg-error && \
    git reset --hard 71d278824c5fe61865f7927a2ed1aa3115f9e439 && \
    ./autogen.sh && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --disable-shared --enable-static --disable-doc --disable-tests && \
+    ./configure --disable-shared --enable-static --disable-doc --disable-tests && \
    make -j$THREADS && \
    make -j$THREADS install && \
    rm -rf $(pwd)
@@ -190,7 +259,7 @@ RUN git clone -b libgcrypt-1.8.5 --depth 1 git://git.gnupg.org/libgcrypt.git &&
    cd libgcrypt && \
    git reset --hard 56606331bc2a80536db9fc11ad53695126007298 && \
    ./autogen.sh && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --disable-shared --enable-static --disable-doc && \
+    ./configure --disable-shared --enable-static --disable-doc && \
    make -j$THREADS && \
    make -j$THREADS install && \
    rm -rf $(pwd)
@@ -199,9 +268,17 @@ RUN git clone -b v3.10.0 --depth 1 https://github.com/protocolbuffers/protobuf &
    cd protobuf && \
    git reset --hard 6d4e7fd7966c989e38024a8ea693db83758944f1 && \
    ./autogen.sh && \
-    CFLAGS='-fPIC' CXXFLAGS='-fPIC' ./configure --enable-static --disable-shared && \
+    ./configure --enable-static --disable-shared && \
    make -j$THREADS && \
    make -j$THREADS install && \
    rm -rf $(pwd)

-RUN apt install -y cmake libusb-1.0-0-dev
+RUN git clone -b v3.18.4 --depth 1 https://github.com/Kitware/CMake && \
+    cd CMake && \
+    git reset --hard 3cc3d42aba879fff5e85b363ae8f21386a3f9f9b && \
+    ./bootstrap && \
+    make -j$THREADS && \
+    make -j$THREADS install && \
+    rm -rf $(pwd)
+
+RUN apt install -y libusb-1.0-0-dev
--- a/43
+++ b/43
@@ -1,40 +1,45 @@
 ANDROID_STANDALONE_TOOLCHAIN_PATH ?= /usr/local/toolchain
+MANUAL_SUBMODULES ?= OFF

 dotgit=$(shell ls -d .git/config)
 ifneq ($(dotgit), .git/config)
  USE_SINGLE_BUILDDIR=1
 endif

-subbuilddir:=$(shell echo  `uname | sed -e 's|[:/\\ \(\)]|_|g'`/`git branch | grep '\* ' | cut -f2- -d' '| sed -e 's|[:/\\ \(\)]|_|g'`)
+builddir := build
+topdir := ../..
 ifeq ($(USE_SINGLE_BUILDDIR), OFF)
-  builddir := build/"$(subbuilddir)"
-  topdir   := ../../../..
-  deldirs  := $(builddir)
+  os := $(shell echo  `uname | sed -e 's|[:/\\ \(\)]|_|g'`)
+  builddir := $(builddir)/$(os)
+  topdir := $(topdir)/..
+
+  branch:=$(shell git branch | grep '\* ' | cut -f2- -d' '| sed -e 's|[:/\\ \(\)]|_|g')
+  builddir := $(builddir)/$(branch)
+  topdir := $(topdir)/..
+
+  deldirs := $(builddir)
 else
-  builddir := build
-  topdir   := ../..
-  deldirs  := $(builddir)/debug $(builddir)/release $(builddir)/fuzz
+  deldirs := $(builddir)/debug $(builddir)/release $(builddir)/fuzz
 endif

-
 default:
-	mkdir -p build && cd build && cmake -D ARCH="x86-64" -D DEV_MODE=$(or ${DEV_MODE},OFF) -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release .. && $(MAKE)
+	mkdir -p build && cd build && cmake -D ARCH="x86-64" -D DEV_MODE=$(or ${DEV_MODE},OFF) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release .. && $(MAKE)
 debug:
-	mkdir -p build && cd build && cmake -D DEV_MODE=$(or ${DEV_MODE},ON) .. && $(MAKE) VERBOSE=1
+	mkdir -p build && cd build && cmake -D DEV_MODE=$(or ${DEV_MODE},ON) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} .. && $(MAKE) VERBOSE=1

 depends:
 	mkdir -p build/$(target)/release
-	cd build/$(target)/release && cmake -D STATIC=ON -D DEV_MODE=$(or ${DEV_MODE},OFF) -D BUILD_TAG=$(tag) -D CMAKE_BUILD_TYPE=Release -D CMAKE_TOOLCHAIN_FILE=$(root)/$(target)/share/toolchain.cmake ../../.. && $(MAKE)
+	cd build/$(target)/release && cmake -D STATIC=ON -D DEV_MODE=$(or ${DEV_MODE},OFF) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D BUILD_TAG=$(tag) -D CMAKE_BUILD_TYPE=Release -D CMAKE_TOOLCHAIN_FILE=$(root)/$(target)/share/toolchain.cmake ../../.. && $(MAKE)

 devmode:
-	mkdir -p build && cd build && cmake -D ARCH="x86-64" -D DEV_MODE=$(or ${DEV_MODE},ON) -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release .. && $(MAKE)
+	mkdir -p build && cd build && cmake -D ARCH="x86-64" -D DEV_MODE=$(or ${DEV_MODE},ON) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release .. && $(MAKE)
 clean:
 	mkdir -p build && cd build && rm -rf *
 scanner:
-	mkdir -p build && cd build && cmake -D ARCH="x86-64" -D DEV_MODE=$(or ${DEV_MODE},ON) -D WITH_SCANNER=ON -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release .. && $(MAKE)
+	mkdir -p build && cd build && cmake -D ARCH="x86-64" -D DEV_MODE=$(or ${DEV_MODE},ON) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D WITH_SCANNER=ON -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release .. && $(MAKE)

 release:
-	mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D DEV_MODE=$(or ${DEV_MODE},OFF) -D ARCH="x86-64" -D CMAKE_BUILD_TYPE=Release $(topdir) && $(MAKE)
+	mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D DEV_MODE=$(or ${DEV_MODE},OFF) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D ARCH="x86-64" -D CMAKE_BUILD_TYPE=Release $(topdir) && $(MAKE)

 release-linux-armv8:
 	mkdir -p $(builddir)/release
@@ -42,17 +47,17 @@ release-linux-armv8:
 	cmake -D DEV_MODE=$(or ${DEV_MODE},OFF) -D ARCH="armv8-a" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release -D BUILD_TAG="linux-armv8" $(topdir) && $(MAKE)

 release-static:
-	mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D STATIC=ON -D DEV_MODE=$(or ${DEV_MODE},OFF) -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release $(topdir) && $(MAKE)
+	mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D STATIC=ON -D DEV_MODE=$(or ${DEV_MODE},OFF) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release $(topdir) && $(MAKE)

 debug-static-win64:
-	mkdir -p $(builddir)/debug && cd $(builddir)/debug && cmake -D STATIC=ON -G "MSYS Makefiles" -D DEV_MODE=$(or ${DEV_MODE},ON) -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Debug -D BUILD_TAG="win-x64" -D CMAKE_TOOLCHAIN_FILE=$(topdir)/cmake/64-bit-toolchain.cmake -D MSYS2_FOLDER=$(shell cd ${MINGW_PREFIX}/.. && pwd -W) -D MINGW=ON $(topdir) && $(MAKE)
+	mkdir -p $(builddir)/debug && cd $(builddir)/debug && cmake -D STATIC=ON -G "MSYS Makefiles" -D DEV_MODE=$(or ${DEV_MODE},ON) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Debug -D BUILD_TAG="win-x64" -D CMAKE_TOOLCHAIN_FILE=$(topdir)/cmake/64-bit-toolchain.cmake -D MSYS2_FOLDER=$(shell cd ${MINGW_PREFIX}/.. && pwd -W) -D MINGW=ON $(topdir) && $(MAKE)

 debug-static-mac64:
 	mkdir -p $(builddir)/debug
-	cd $(builddir)/debug && cmake -D STATIC=ON -D DEV_MODE=$(or ${DEV_MODE},ON) -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=release -D BUILD_TAG="mac-x64" $(topdir) && $(MAKE)
+	cd $(builddir)/debug && cmake -D STATIC=ON -D DEV_MODE=$(or ${DEV_MODE},ON) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=release -D BUILD_TAG="mac-x64" $(topdir) && $(MAKE)

 release-static-win64:
-	mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D STATIC=ON -G "MSYS Makefiles" -D DEV_MODE=$(or ${DEV_MODE},OFF) -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release -D BUILD_TAG="win-x64" -D CMAKE_TOOLCHAIN_FILE=$(topdir)/cmake/64-bit-toolchain.cmake -D MSYS2_FOLDER=$(shell cd ${MINGW_PREFIX}/.. && pwd -W) -D MINGW=ON $(topdir) && $(MAKE)
+	mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D STATIC=ON -G "MSYS Makefiles" -D DEV_MODE=$(or ${DEV_MODE},OFF) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release -D BUILD_TAG="win-x64" -D CMAKE_TOOLCHAIN_FILE=$(topdir)/cmake/64-bit-toolchain.cmake -D MSYS2_FOLDER=$(shell cd ${MINGW_PREFIX}/.. && pwd -W) -D MINGW=ON $(topdir) && $(MAKE)

 release-win64:
-	mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D STATIC=OFF -G "MSYS Makefiles" -D DEV_MODE=$(or ${DEV_MODE},OFF) -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release -D BUILD_TAG="win-x64" -D CMAKE_TOOLCHAIN_FILE=$(topdir)/cmake/64-bit-toolchain.cmake -D MSYS2_FOLDER=$(shell cd ${MINGW_PREFIX}/.. && pwd -W) -D MINGW=ON $(topdir) && $(MAKE)
+	mkdir -p $(builddir)/release && cd $(builddir)/release && cmake -D STATIC=OFF -G "MSYS Makefiles" -D DEV_MODE=$(or ${DEV_MODE},OFF) -DMANUAL_SUBMODULES=${MANUAL_SUBMODULES} -D ARCH="x86-64" -D BUILD_64=ON -D CMAKE_BUILD_TYPE=Release -D BUILD_TAG="win-x64" -D CMAKE_TOOLCHAIN_FILE=$(topdir)/cmake/64-bit-toolchain.cmake -D MSYS2_FOLDER=$(shell cd ${MINGW_PREFIX}/.. && pwd -W) -D MINGW=ON $(topdir) && $(MAKE)
--- a/README.md
+++ b/README.md
@@ -124,6 +124,55 @@ Packaging for your favorite distribution would be a welcome contribution!
   \* `4` - number of CPU threads to use
 5. Monero GUI Linux static binaries will be placed in  `monero-gui/build/release/bin` directory

+### Building Android APK with Docker (any OS) *Experimental*
+ - Minimum Android 9 Pie (API 28)
+ - ARMv8-A 64-bit CPU
+1. Install Docker [https://docs.docker.com/engine/install/](https://docs.docker.com/engine/install/)
+2. Clone the repository
+   ```
+   git clone --recursive https://github.com/monero-project/monero-gui.git
+   ```
+3. Prepare build environment
+   ```
+   cd monero-gui
+   docker build --tag monero:build-env-android --build-arg THREADS=4 --file Dockerfile.android .
+   ```
+   \* `4` - number of CPU threads to use
+
+4. Build
+   ```
+   docker run --rm -it -v <MONERO_GUI_DIR_FULL_PATH>:/monero-gui -e THREADS=4 monero:build-env-android
+   ```
+   \* `<MONERO_GUI_DIR_FULL_PATH>` - absolute path to `monero-gui` directory  
+   \* `4` - number of CPU threads to use
+5. Monero GUI APK will be placed in  `monero-gui/build/Android/release/android-build` directory
+6. Deploy
+   * Using ADB (Android debugger bridge)
+     - [Enable adb debugging on your device](https://developer.android.com/studio/command-line/adb.html#Enabling)
+      * Connect your device with USB and install Monero GUI APK with adb:
+      ```
+      adb install build/Android/release/android-build/monero-gui.apk
+      ```
+      * Troubleshooting:
+      ```
+      adb devices -l
+      adb logcat
+      ```
+      * If using adb inside docker, make sure you did
+      ```
+      docker run -v /dev/bus/usb:/dev/bus/usb --privileged
+      ```
+   * Using a web server
+      ```
+      mkdir /usr/tmp
+      cp build/Android/release/android-build/monero-gui.apk /usr/tmp
+      docker run -d -v /usr/tmp:/usr/share/nginx/html:ro -p 8080:80 nginx
+      ```
+      Now it should be accessible through a web browser at
+      ```
+      http://<your.local.ip>:8080/QtApp-debug.apk
+      ```
+
 ### On Linux:

 (Tested on Ubuntu 17.10 x64, Ubuntu 18.04 x64 and Gentoo x64)
--- a/android/README.md
+++ b/android/README.md
@@ -1,53 +0,0 @@
-Copyright (c) 2014-2018, The Monero Project
-
-
-## Current status : ALPHA
-
- - Minimum Android 5.0 (api level 21)
- - Modal dialogs can appear in background giving the feeling that the application is frozen (Work around : turn screen off/on or switch to another app and back)
-
-## Build using Docker
-
-# Base environnement
-
-        cd monero/utils/build_scripts
-        docker build -f android32.Dockerfile -t monero-android .
-        cd ..
-
-# Build GUI
-
-        cd android/docker
-        docker build -t monero-gui-android .
-        docker create -it --name monero-gui-android monero-gui-android bash
-
-# Get the apk
-
-        docker cp monero-gui-android:/opt/android/monero-gui/build/release/bin/bin/QtApp-debug.apk .
-       
-## Deployment
-
- Using ADB (Android debugger bridge) : 
-
-  First, see section [Enable adb debugging on your device](https://developer.android.com/studio/command-line/adb.html#Enabling)
-  The only place where we are allowed to play is `/data/local/tmp`. So : 
-
-        adb  push /opt/android/monero-gui/build/release/bin/bin/QtApp-debug.apk /data/local/tmp
-        adb  shell pm install -r /data/local/tmp/QtApp-debug.apk
-   
-  - Troubleshooting: 
-  
-        adb devices -l
-        adb logcat
-	
-    if using adb inside docker, make sure you did "docker run -v /dev/bus/usb:/dev/bus/usb --privileged"
-	
- Using a web server
-
-        mkdir /usr/tmp
-        cp QtApp-debug.apk /usr/tmp
-        docker run -d -v /usr/tmp:/usr/share/nginx/html:ro -p 8080:80 nginx
-
-  Now it should be accessible through a web browser at 
-  
-        http://<your.local.ip>:8080/QtApp-debug.apk
-  
--- a/android/docker/Dockerfile
+++ b/android/docker/Dockerfile
@@ -1,107 +0,0 @@
-FROM monero-android
-
-#INSTALL JAVA
-RUN echo "deb http://ftp.fr.debian.org/debian/ jessie-backports main contrib non-free" >> /etc/apt/sources.list
-RUN dpkg --add-architecture i386 \
-    && apt-get update \
-    && apt-get install -y libc6:i386 libncurses5:i386 libstdc++6:i386 libz1:i386 \
-    && apt-get install -y -t jessie-backports ca-certificates-java openjdk-8-jdk-headless openjdk-8-jre-headless ant
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
-ENV PATH $JAVA_HOME/bin:$PATH
-
-#Get Qt
-ENV QT_VERSION 5.8
-
-RUN git clone git://code.qt.io/qt/qt5.git -b ${QT_VERSION} \
-    && cd qt5 \
-    && perl init-repository 
-
-## Note: Need to use libc++ but Qt does not provide mkspec for libc++.
-## Their support of it is quite recent and they claim they don't use it by default
-## [only because it produces bigger binary objects](https://bugreports.qt.io/browse/QTBUG-50724).
-
-#Create new mkspec for clang + libc++
-RUN cp -r qt5/qtbase/mkspecs/android-clang qt5/qtbase/mkspecs/android-clang-libc \
-    && cd qt5/qtbase/mkspecs/android-clang-libc \
-    && sed -i '16i ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/llvm-libc++/libs/$$ANDROID_TARGET_ARCH' qmake.conf \
-    && sed -i '17i ANDROID_SOURCES_CXX_STL_INCDIR = $$NDK_ROOT/sources/cxx-stl/llvm-libc++/include' qmake.conf \
-    && echo "QMAKE_LIBS_PRIVATE      = -lc++_shared -llog -lz -lm -ldl -lc -lgcc " >> qmake.conf \
-    && echo "QMAKE_CFLAGS -= -mfpu=vfp " >> qmake.conf \
-    && echo "QMAKE_CXXFLAGS -= -mfpu=vfp " >> qmake.conf \ 
-    && echo "QMAKE_CFLAGS += -mfpu=vfp4 " >> qmake.conf \
-    && echo "QMAKE_CXXFLAGS += -mfpu=vfp4 " >> qmake.conf 
-
-ENV ANDROID_API android-21
-    
-#ANDROID SDK TOOLS
-RUN echo y | $ANDROID_SDK_ROOT/tools/android update sdk --no-ui --all --filter platform-tools 
-RUN echo y | $ANDROID_SDK_ROOT/tools/android update sdk --no-ui --all --filter ${ANDROID_API}
-RUN echo y | $ANDROID_SDK_ROOT/tools/android update sdk --no-ui --all --filter build-tools-25.0.1 
-
-ENV CLEAN_PATH $JAVA_HOME/bin:/usr/cmake-3.6.3-Linux-x86_64/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-
-#build Qt
-RUN cd qt5 && PATH=${CLEAN_PATH} ./configure -developer-build -release \
-    -xplatform android-clang-libc \
-    -android-ndk-platform ${ANDROID_API} \
-    -android-ndk $ANDROID_NDK_ROOT \
-    -android-sdk $ANDROID_SDK_ROOT \
-    -opensource -confirm-license \
-    -prefix ${WORKDIR}/Qt-${QT_VERSION} \
-    -nomake tests -nomake examples \
-    -skip qtserialport \
-    -skip qtconnectivity \
-    -skip qttranslations \
-    -skip qtgamepad -skip qtscript -skip qtdoc
-
-# build Qt tools : gnustl_shared.so is hard-coded in androiddeployqt
-# replace it with libc++_shared.so
-COPY androiddeployqt.patch qt5/qttools/androiddeployqt.patch
-RUN cd qt5/qttools \
-    && git apply androiddeployqt.patch \
-    && cd .. \
-    && PATH=${CLEAN_PATH} make -j4 \
-    && PATH=${CLEAN_PATH} make install
-
-# Get iconv and ZBar
-ENV ICONV_VERSION 1.14
-RUN git clone https://github.com/ZBar/ZBar.git \
-    && curl -s -O http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${ICONV_VERSION}.tar.gz \
-    && tar -xzf libiconv-${ICONV_VERSION}.tar.gz \
-    && cd libiconv-${ICONV_VERSION} \
-    && CC=arm-linux-androideabi-clang CXX=arm-linux-androideabi-clang++ ./configure --build=x86_64-linux-gnu --host=arm-eabi --prefix=${WORKDIR}/libiconv --disable-rpath
-
-ENV PATH $ANDROID_SDK_ROOT/tools:$ANDROID_SDK_ROOT/platform-tools:${WORKDIR}/Qt-${QT_VERSION}/bin:$PATH
-
-#Build libiconv.a and libzbarjni.a
-COPY android.mk.patch ZBar/android.mk.patch
-RUN cd ZBar \
-    && git apply android.mk.patch \
-    && echo \
-"APP_ABI := armeabi-v7a \n\
-APP_STL := c++_shared \n\
-TARGET_PLATFORM := ${ANDROID_API} \n\
-TARGET_ARCH_ABI := armeabi-v7a \n\
-APP_CFLAGS +=  -target armv7-none-linux-androideabi -fexceptions -fstack-protector-strong -fno-limit-debug-info -mfloat-abi=softfp -mfpu=vfp -fno-builtin-memmove -fno-omit-frame-pointer -fno-stack-protector\n"\
-        >> android/jni/Application.mk \
-    && cd android \
-    && android update project --path . -t "${ANDROID_API}" \
-    && CC=arm-linux-androideabi-clang CXX=arm-linux-androideabi-clang++ ant -Dndk.dir=${ANDROID_NDK_ROOT} -Diconv.src=${WORKDIR}/libiconv-${ICONV_VERSION} zbar-clean zbar-ndk-build
-
-RUN cp openssl/lib* ${ANDROID_NDK_ROOT}/platforms/${ANDROID_API}/arch-arm/usr/lib
-RUN cp boost_${BOOST_VERSION}/android32/lib/lib* ${ANDROID_NDK_ROOT}/platforms/${ANDROID_API}/arch-arm/usr/lib
-RUN cp ZBar/android/obj/local/armeabi-v7a/lib* ${ANDROID_NDK_ROOT}/platforms/${ANDROID_API}/arch-arm/usr/lib
-
-RUN git clone https://github.com/monero-project/monero-gui.git \
-    && cd monero-gui \
-    && git submodule update \
-    && CC=arm-linux-androideabi-clang CXX=arm-linux-androideabi-clang++ BOOST_ROOT=/opt/android/boost_1_62_0 \
-         BOOST_LIBRARYDIR=${WORKDIR}/boost_${BOOST_VERSION}/android32/lib/ \
-         OPENSSL_ROOT_DIR=${WORKDIR}/openssl/ \
-         CMAKE_INCLUDE_PATH=${WORKDIR}/cppzmq/ \
-         CMAKE_LIBRARY_PATH=${WORKDIR}/zeromq4-1/.libs \
-         CXXFLAGS="-I ${WORKDIR}/zeromq4-1/include/" \
-         ./build.sh release-android \
-    && cd build \
-    && make deploy
-
--- a/android/docker/android.mk.patch
+++ b/android/docker/android.mk.patch
@@ -1,61 +0,0 @@
-diff --git a/android/jni/Android.mk b/android/jni/Android.mk
-index e442b07..158afd5 100644
--- a/android/jni/Android.mk
-+++ b/android/jni/Android.mk
-@@ -12,14 +12,18 @@ LOCAL_PATH := $(ICONV_SRC)
- 
- LOCAL_MODULE := libiconv
- 
-+LOCAL_ARM_MODE := arm
-+LOCAL_CPP_FEATURES := exceptions rtti features
- LOCAL_CFLAGS := \
-     -Wno-multichar \
-     -D_ANDROID \
-    -DLIBDIR="c" \
-+    -DLIBDIR="\".\"" \
-     -DBUILDING_LIBICONV \
-     -DBUILDING_LIBCHARSET \
-     -DIN_LIBRARY
- 
-+LOCAL_CFLAGS += -fno-stack-protector
-+
- LOCAL_SRC_FILES := \
- 	lib/iconv.c \
- 	libcharset/lib/localcharset.c \
-@@ -30,13 +34,14 @@ LOCAL_C_INCLUDES := \
- 	$(ICONV_SRC)/libcharset \
- 	$(ICONV_SRC)/libcharset/include
- 
-include $(BUILD_SHARED_LIBRARY)
-+include $(BUILD_STATIC_LIBRARY)
- 
- LOCAL_LDLIBS := -llog -lcharset
- 
- # libzbarjni
- include $(CLEAR_VARS)
- 
-+
- LOCAL_PATH := $(MY_LOCAL_PATH)
- LOCAL_MODULE := zbarjni
- LOCAL_SRC_FILES := ../../java/zbarjni.c \
-@@ -71,6 +76,17 @@ LOCAL_C_INCLUDES := ../include \
- 		    ../zbar \
- 		    $(ICONV_SRC)/include 
- 
-LOCAL_SHARED_LIBRARIES := libiconv
-+LOCAL_STATIC_LIBRARIES := libiconv
-+LOCAL_ARM_MODE := arm
-+LOCAL_CPP_FEATURES := exceptions rtti features
-+
-+LOCAL_CFLAGS := \
-+    -Wno-multichar \
-+    -D_ANDROID \
-+    -DLIBDIR="\".\"" \
-+    -DBUILDING_LIBICONV \
-+    -DBUILDING_LIBCHARSET \
-+    -DIN_LIBRARY
-+
- 
-include $(BUILD_SHARED_LIBRARY)
-\ No newline at end of file
-+include $(BUILD_STATIC_LIBRARY)
--- a/android/docker/androiddeployqt.patch
+++ b/android/docker/androiddeployqt.patch
@@ -1,62 +0,0 @@
-diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp
-index 8a8e591..71d693e 100644
--- a/src/androiddeployqt/main.cpp
-+++ b/src/androiddeployqt/main.cpp
-@@ -1122,7 +1122,7 @@ bool updateLibsXml(const Options &options)
- 
-     QString libsPath = QLatin1String("libs/") + options.architecture + QLatin1Char('/');
- 
-    QString qtLibs = QLatin1String("<item>gnustl_shared</item>\n");
-+    QString qtLibs = QLatin1String("<item>c++_shared</item>\n");
-     QString bundledInLibs;
-     QString bundledInAssets;
-     foreach (Options::BundledFile bundledFile, options.bundledFiles) {
-@@ -2519,6 +2519,39 @@ bool installApk(const Options &options)
-     return true;
- }
- 
-+bool copyStl(Options *options)
-+{
-+    if (options->deploymentMechanism == Options::Debug && !options->installApk)
-+        return true;
-+
-+    if (options->verbose)
-+        fprintf(stdout, "Copying LIBC++ STL library\n");
-+
-+    QString filePath = options->ndkPath
-+            + QLatin1String("/sources/cxx-stl/llvm-libc++")
-+            + QLatin1String("/libs/")
-+            + options->architecture
-+            + QLatin1String("/libc++_shared.so");
-+    if (!QFile::exists(filePath)) {
-+        fprintf(stderr, "LIBC STL library does not exist at %s\n", qPrintable(filePath));
-+        return false;
-+    }
-+
-+    QString destinationDirectory =
-+            options->deploymentMechanism == Options::Debug
-+            ? options->temporaryDirectoryName + QLatin1String("/lib")
-+            : options->outputDirectory + QLatin1String("/libs/") + options->architecture;
-+
-+    if (!copyFileIfNewer(filePath, destinationDirectory
-+                                   + QLatin1String("/libc++_shared.so"), options->verbose)) {
-+        return false;
-+    }
-+
-+    if (options->deploymentMechanism == Options::Debug && !deployToLocalTmp(options, QLatin1String("/lib/libc++_shared.so")))
-+        return false;
-+
-+    return true;
-+}
- bool copyGnuStl(Options *options)
- {
-     if (options->deploymentMechanism == Options::Debug && !options->installApk)
-@@ -2870,7 +2903,7 @@ int main(int argc, char *argv[])
-     if (Q_UNLIKELY(options.timing))
-         fprintf(stdout, "[TIMING] %d ms: Read dependencies\n", options.timer.elapsed());
- 
-    if (options.deploymentMechanism != Options::Ministro && !copyGnuStl(&options))
-+    if (options.deploymentMechanism != Options::Ministro && !copyStl(&options))
-         return CannotCopyGnuStl;
- 
-     if (Q_UNLIKELY(options.timing))
--- a/build.sh
+++ b/build.sh
@@ -1,121 +0,0 @@
-#!/bin/bash
-
-BUILD_TYPE=$1
-BUILD_TREZOR=${BUILD_TREZOR-true}
-source ./utils.sh
-platform=$(get_platform)
-# default build type
-if [ -z $BUILD_TYPE ]; then
-    BUILD_TYPE=release
-fi
-
-# Return 0 if the command exists, 1 if it does not.
-exists() {
-    command -v "$1" &>/dev/null
-}
-
-# Return the first value in $@ that's a runnable command.
-find_command() {
-    for arg in "$@"; do
-        if exists "$arg"; then
-           echo "$arg"
-           return 0
-        fi
-    done
-    return 1
-}
-
-if [ "$BUILD_TYPE" == "release" ]; then
-    echo "Building release"
-    CONFIG="CONFIG+=release";
-    BIN_PATH=release/bin
-elif [ "$BUILD_TYPE" == "release-static" ]; then
-    echo "Building release-static"
-    if [ "$platform" != "darwin" ]; then
-	    CONFIG="CONFIG+=release static";
-    else
-        # OS X: build static libwallet but dynamic Qt. 
-        echo "OS X: Building Qt project without static flag"
-        CONFIG="CONFIG+=release";
-    fi    
-    BIN_PATH=release/bin
-elif [ "$BUILD_TYPE" == "release-android" ]; then
-    echo "Building release for ANDROID"
-    CONFIG="CONFIG+=release static WITH_SCANNER DISABLE_PASS_STRENGTH_METER";
-    ANDROID=true
-    BIN_PATH=release/bin
-    DISABLE_PASS_STRENGTH_METER=true
-elif [ "$BUILD_TYPE" == "debug-android" ]; then
-    echo "Building debug for ANDROID : ultra INSECURE !!"
-    CONFIG="CONFIG+=debug qml_debug WITH_SCANNER DISABLE_PASS_STRENGTH_METER";
-    ANDROID=true
-    BIN_PATH=debug/bin
-    DISABLE_PASS_STRENGTH_METER=true
-elif [ "$BUILD_TYPE" == "debug" ]; then
-    echo "Building debug"
-	CONFIG="CONFIG+=debug"
-    BIN_PATH=debug/bin
-else
-    echo "Valid build types are release, release-static, release-android, debug-android and debug"
-    exit 1;
-fi
-
-
-source ./utils.sh
-pushd $(pwd)
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-MONERO_DIR=monero
-MONEROD_EXEC=monerod
-
-MAKE='make'
-if [[ $platform == *bsd* ]]; then
-    MAKE='gmake'
-fi
-
-# build libwallet
-export BUILD_TREZOR
-./get_libwallet_api.sh $BUILD_TYPE
- 
-# build zxcvbn
-if [ "$DISABLE_PASS_STRENGTH_METER" != true ]; then
-    $MAKE -C src/zxcvbn-c || exit
-fi
-
-if [ ! -d build ]; then mkdir build; fi
-
-
-# Platform indepenent settings
-if [ "$ANDROID" != true ] && ([ "$platform" == "linux32" ] || [ "$platform" == "linux64" ]); then
-    exists lsb_release && distro="$(lsb_release -is)"
-    if [ "$distro" = "Ubuntu" ] || [ "$distro" = "Fedora" ] || test -f /etc/fedora-release; then
-        CONFIG="$CONFIG libunwind_off"
-    fi
-fi
-
-if [ "$platform" == "darwin" ]; then
-    BIN_PATH=$BIN_PATH/monero-wallet-gui.app/Contents/MacOS/
-elif [ "$platform" == "mingw64" ] || [ "$platform" == "mingw32" ]; then
-    MONEROD_EXEC=monerod.exe
-fi
-
-# force version update
-get_tag
-GUI_VERSION=$(echo "$TAGNAME" | sed 's/^v\([[:digit:]]\)/\1/')
-echo "var GUI_VERSION = \"$GUI_VERSION\"" > version.js
-
-cd build
-if ! QMAKE=$(find_command qmake qmake-qt5); then
-    echo "Failed to find suitable qmake command."
-    exit 1
-fi
-$QMAKE ../monero-wallet-gui.pro "$CONFIG" || exit
-$MAKE || exit 
-
-# Copy monerod to bin folder
-if [ "$platform" != "mingw32" ] && [ "$ANDROID" != true ]; then
-cp ../$MONERO_DIR/bin/$MONEROD_EXEC $BIN_PATH
-fi
-
-# make deploy
-popd
-
--- a/cmake/FindZBar0.cmake
+++ b/cmake/FindZBar0.cmake
@@ -9,14 +9,30 @@
 #

 find_package(PkgConfig)
-pkg_check_modules(PC_ZBAR QUIET zbar)
-set(ZBAR_DEFINITIONS ${PC_ZBAR_CFLAGS_OTHER})
-find_library(ZBAR_LIBRARIES NAMES zbar 
-             HINTS ${PC_ZBAR_LIBDIR} ${PC_ZBAR_LIBRARY_DIRS} )
-find_path(ZBAR_INCLUDE_DIR Decoder.h
-          HINTS ${PC_ZBAR_INCLUDEDIR} ${PC_ZBAR_INCLUDE_DIRS}
-          PATH_SUFFIXES zbar )
+if(PkgConfig_FOUND)
+  pkg_check_modules(PC_ZBAR QUIET zbar)
+  if(PC_ZBAR_FOUND)
+    set(ZBAR_DEFINITIONS ${PC_ZBAR_CFLAGS_OTHER})
+    find_library(ZBAR_LIBRARIES NAMES zbar HINTS ${PC_ZBAR_LIBDIR} ${PC_ZBAR_LIBRARY_DIRS})
+    find_path(ZBAR_INCLUDE_DIR Decoder.h HINTS ${PC_ZBAR_INCLUDEDIR} ${PC_ZBAR_INCLUDE_DIRS} PATH_SUFFIXES zbar)
+  endif()
+endif()
+
+if(NOT ZBAR_LIBRARIES AND ANDROID)
+  find_library(ZBARJNI_LIBRARY NAMES zbarjni)
+  find_library(ICONV_LIBRARY NAMES iconv)
+  if(ZBARJNI_LIBRARY AND ICONV_LIBRARY)
+    set(ZBAR_LIBRARIES ${ZBARJNI_LIBRARY} ${ICONV_LIBRARY})
+  endif()
+endif()
+
+if(NOT ZBAR_INCLUDE_DIR)
+  find_path(ZBAR_H_PATH zbar.h)
+  if(ZBAR_H_PATH)
+    set(ZBAR_INCLUDE_DIR "${ZBAR_H_PATH}/zbar")
+  endif()
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(ZBAR  DEFAULT_MSG  ZBAR_LIBRARIES ZBAR_INCLUDE_DIR)
 message(STATUS "Found zbar libraries ${ZBAR_LIBRARIES}")
-
--- a/components/LanguageButton.qml
+++ b/components/LanguageButton.qml
@@ -0,0 +1,67 @@
+// Copyright (c) 2020, The Monero Project
+//
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of
+//    conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list
+//    of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be
+//    used to endorse or promote products derived from this software without specific
+//    prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import QtQuick 2.9
+import QtQuick.Layouts 1.3
+
+import FontAwesome 1.0
+
+import "../components" as MoneroComponents
+
+Item {
+    implicitHeight: layout.height
+    implicitWidth: layout.width
+
+    RowLayout {
+        id: layout
+        opacity: mouseArea.containsMouse ? 1 : 0.85
+        spacing: 10
+
+        MoneroComponents.Label {
+            Layout.bottomMargin: 5
+            fontColor: MoneroComponents.Style.defaultFontColor
+            fontFamily: FontAwesome.fontFamilySolid
+            fontSize: 26
+            styleName: "Solid"
+            text: FontAwesome.language
+        }
+
+        MoneroComponents.TextPlain {
+            font.pixelSize: 14
+            text: persistentSettings.language
+        }
+    }
+
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        cursorShape: Qt.PointingHandCursor
+        hoverEnabled: true
+        onClicked: appWindow.toggleLanguageView()
+    }
+}
--- a/components/LanguageSidebar.qml
+++ b/components/LanguageSidebar.qml
@@ -131,9 +131,9 @@ Drawer {
                            translationManager.setLanguage(locale_spl[0]);

                            // set wizard language settings
-                            wizard.language_locale = locale;
-                            wizard.language_wallet = wallet_language;
-                            wizard.language_language = display_name;
+                            persistentSettings.locale = locale;
+                            persistentSettings.language = display_name;
+                            persistentSettings.language_wallet = wallet_language;

                            appWindow.showStatusMessage(qsTr("Language changed."), 3);
                            appWindow.toggleLanguageView();
--- a/components/TxConfirmationDialog.qml
+++ b/components/TxConfirmationDialog.qml
@@ -0,0 +1,466 @@
+// Copyright (c) 2014-2020, The Monero Project
+//
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of
+//    conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list
+//    of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be
+//    used to endorse or promote products derived from this software without specific
+//    prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import QtQuick 2.9
+import QtQuick.Controls 1.4
+import QtQuick.Layouts 1.1
+
+import "../components" as MoneroComponents
+import FontAwesome 1.0
+
+Rectangle {
+    id: root
+    x: parent.width/2 - root.width/2
+    y: parent.height/2 - root.height/2
+    // TODO: implement without hardcoding sizes
+    width: 580
+    height: 400
+    color: MoneroComponents.Style.blackTheme ? "black" : "white"
+    visible: false
+    radius: 10
+    border.color: MoneroComponents.Style.blackTheme ? Qt.rgba(255, 255, 255, 0.25) : Qt.rgba(0, 0, 0, 0.25)
+    border.width: 1
+    focus: true
+    Keys.enabled: true
+    Keys.onEscapePressed: {
+        root.close()
+        root.clearFields()
+        root.rejected()
+    }
+    Keys.onEnterPressed: {
+         if (root.state == "default") {
+             root.close()
+             root.accepted()
+         } else if (root.state == "error") {
+             root.close()
+             root.clearFields()
+             root.rejected()
+         }
+    }
+    Keys.onReturnPressed: {
+         if (root.state == "default") {
+             root.close()
+             root.accepted()
+         } else if (root.state == "error") {
+             root.close()
+             root.clearFields()
+             root.rejected()
+         }
+    }
+    KeyNavigation.tab: confirmButton
+
+    property var transactionAmount: ""
+    property var transactionAddress: ""
+    property var transactionDescription: ""
+    property var transactionFee: ""
+    property var transactionPriority: ""
+    property bool sweepUnmixable: false
+    property alias errorText: errorText
+    property alias confirmButton: confirmButton
+    property alias backButton: backButton
+    property alias bottomText: bottomText
+    property alias bottomTextAnimation: bottomTextAnimation
+
+    state: "default"
+    states: [
+        State {
+            // waiting for user action, show tx details + back and confirm buttons
+            name: "default";
+            when: errorText.text == "" && bottomText.text == ""
+            PropertyChanges { target: errorText; visible: false }
+            PropertyChanges { target: txAmountText; visible: root.transactionAmount !== "(all)" || (root.transactionAmount === "(all)" && currentWallet.isHwBacked() === true) }
+            PropertyChanges { target: txAmountBusyIndicator; visible: !txAmountText.visible }
+            PropertyChanges { target: txFiatAmountText; visible: txAmountText.visible && persistentSettings.fiatPriceEnabled && root.transactionAmount !== "(all)" }
+            PropertyChanges { target: txDetails; visible: true }
+            PropertyChanges { target: bottom; visible: true }
+            PropertyChanges { target: bottomMessage; visible: false }
+            PropertyChanges { target: buttons; visible: true }
+            PropertyChanges { target: backButton; visible: true; primary: false }
+            PropertyChanges { target: confirmButton; visible: true }
+        }, State {
+            // error message being displayed, show only back button
+            name: "error";
+            when: errorText.text !== ""
+            PropertyChanges { target: dialogTitle; text: "Error" }
+            PropertyChanges { target: errorText; visible: true }
+            PropertyChanges { target: txAmountText; visible: false }
+            PropertyChanges { target: txAmountBusyIndicator; visible: false }
+            PropertyChanges { target: txFiatAmountText; visible: false }
+            PropertyChanges { target: txDetails; visible: false }
+            PropertyChanges { target: bottom; visible: true }
+            PropertyChanges { target: bottomMessage; visible: false }
+            PropertyChanges { target: buttons; visible: true }
+            PropertyChanges { target: backButton; visible: true; primary: true }
+            PropertyChanges { target: confirmButton; visible: false }
+        }, State {
+            // creating or sending transaction, show tx details and don't show any button
+            name: "bottomText";
+            when: errorText.text == "" && bottomText.text !== ""
+            PropertyChanges { target: errorText; visible: false }
+            PropertyChanges { target: txAmountText; visible: root.transactionAmount !== "(all)" || (root.transactionAmount === "(all)" && currentWallet.isHwBacked() === true) }
+            PropertyChanges { target: txAmountBusyIndicator; visible: !txAmountText.visible }
+            PropertyChanges { target: txFiatAmountText; visible: txAmountText.visible && persistentSettings.fiatPriceEnabled && root.transactionAmount !== "(all)" }
+            PropertyChanges { target: txDetails; visible: true }
+            PropertyChanges { target: bottom; visible: true }
+            PropertyChanges { target: bottomMessage; visible: true }
+            PropertyChanges { target: buttons; visible: false }
+        }
+    ]
+
+    // same signals as Dialog has
+    signal accepted()
+    signal rejected()
+
+    function open() {
+        root.visible = true;
+
+        //clean previous error message
+        errorText.text = "";
+        root.forceActiveFocus()
+    }
+
+    function close() {
+        root.visible = false;
+    }
+
+    function clearFields() {
+        root.transactionAmount = "";
+        root.transactionAddress = "";
+        root.transactionDescription = "";
+        root.transactionFee = "";
+        root.transactionPriority = "";
+        root.sweepUnmixable = false;
+    }
+
+    function showFiatConversion(valueXMR) {
+        const fiatFee = fiatApiConvertToFiat(valueXMR);
+        return "%1 %2".arg(fiatFee < 0.01 ? "<0.01" : "~" + fiatFee).arg(fiatApiCurrencySymbol());
+    }
+
+    ColumnLayout {
+        spacing: 10
+        anchors.fill: parent
+        anchors.margins: 25
+
+        RowLayout {
+            Layout.topMargin: 10
+            Layout.fillWidth: true
+
+            MoneroComponents.Label {
+                id: dialogTitle
+                Layout.fillWidth: true
+                fontSize: 18
+                fontFamily: "Arial"
+                horizontalAlignment: Text.AlignHCenter
+                text: {
+                    if (appWindow.viewOnly) {
+                        return qsTr("Create transaction file") + translationManager.emptyString;
+                    } else if (root.sweepUnmixable) {
+                        return qsTr("Sweep unmixable outputs") + translationManager.emptyString;
+                    } else {
+                        return qsTr("Confirm send") + translationManager.emptyString;
+                    }
+                }
+            }
+        }
+
+        Text {
+            id: errorText
+            Layout.fillWidth: true
+            Layout.fillHeight: true
+            color: MoneroComponents.Style.defaultFontColor
+            wrapMode: Text.Wrap
+            font.pixelSize: 15
+        }
+
+        ColumnLayout {
+            spacing: 0
+            Layout.fillWidth: true
+            Layout.preferredHeight: 71
+
+            BusyIndicator {
+                  id: txAmountBusyIndicator
+                  Layout.fillWidth: true
+                  Layout.alignment : Qt.AlignTop | Qt.AlignLeft
+                  running: root.transactionAmount == "(all)"
+            }
+
+            Text {
+                id: txAmountText
+                Layout.fillWidth: true
+                horizontalAlignment: Text.AlignHCenter
+                font.pixelSize: root.transactionAmount == "(all)" && currentWallet.isHwBacked() === true ? 32 : 42
+                color: MoneroComponents.Style.defaultFontColor
+                text: {
+                    if (root.transactionAmount == "(all)" && currentWallet.isHwBacked() === true) {
+                        return qsTr("All unlocked balance") +  translationManager.emptyString;
+                    } else {
+                        return root.transactionAmount + " XMR " +  translationManager.emptyString;
+                    }
+                }
+            }
+
+            Text {
+                id: txFiatAmountText
+                Layout.fillWidth: true
+                horizontalAlignment: Text.AlignHCenter
+                font.pixelSize: 20
+                color: MoneroComponents.Style.buttonSecondaryTextColor
+                text: showFiatConversion(transactionAmount) + translationManager.emptyString
+            }
+        }
+
+        GridLayout {
+            columns: 2
+            id: txDetails
+            Layout.fillWidth: true
+            columnSpacing: 15
+            rowSpacing: 16
+
+            ColumnLayout {
+                Layout.fillWidth: true
+                Layout.alignment : Qt.AlignTop | Qt.AlignLeft
+
+                Text {
+                    Layout.fillWidth: true
+                    color: MoneroComponents.Style.dimmedFontColor
+                    text: qsTr("From") + ":" + translationManager.emptyString
+                    font.pixelSize: 15
+                }
+            }
+
+            ColumnLayout {
+                Layout.fillWidth: true
+                spacing: 16
+
+                Text {
+                    Layout.fillWidth: true
+                    font.pixelSize: 15
+                    color: MoneroComponents.Style.defaultFontColor
+                    text: {
+                        if (currentWallet) {
+                            var walletTitle = function() {
+                                if (currentWallet.isLedger()) {
+                                    return "Ledger";
+                                } else if (currentWallet.isTrezor()) {
+                                    return "Trezor";
+                                } else {
+                                    return qsTr("My wallet");
+                                }
+                            }
+                            var walletName = appWindow.walletName;
+                            if (appWindow.currentWallet.numSubaddressAccounts() > 1) {
+                                var currentSubaddressAccount = currentWallet.currentSubaddressAccount;
+                                var currentAccountLabel =  currentWallet.getSubaddressLabel(currentWallet.currentSubaddressAccount, 0);
+                                return walletTitle() + " (" + walletName + ")" + "<br>" + qsTr("Account #") + currentSubaddressAccount + (currentAccountLabel !== "" ? " (" + currentAccountLabel + ")" : "") + translationManager.emptyString;
+                            } else {
+                                return walletTitle() + " (" + walletName + ")" + translationManager.emptyString;
+                            }
+                        } else {
+                            return "";
+                        }
+                    }
+                }
+            }
+
+            ColumnLayout {
+                Layout.fillWidth: true
+                Layout.alignment : Qt.AlignTop | Qt.AlignLeft
+
+                Text {
+                    Layout.fillWidth: true
+                    font.pixelSize: 15
+                    color: MoneroComponents.Style.dimmedFontColor
+                    text: qsTr("To") + ":" + translationManager.emptyString
+                }
+            }
+
+            ColumnLayout {
+                Layout.fillWidth: true
+                spacing: 16
+
+                Text {
+                    Layout.fillWidth: true
+                    font.pixelSize: 15
+                    font.family: MoneroComponents.Style.fontRegular.name
+                    textFormat: Text.RichText
+                    wrapMode: Text.Wrap
+                    color: MoneroComponents.Style.defaultFontColor
+                    text: {
+                        if (root.transactionAddress) {
+                            const addressBookName = currentWallet ? currentWallet.addressBook.getDescription(root.transactionAddress) : null;
+                            var fulladdress = root.transactionAddress;
+                            var spacedaddress = fulladdress.match(/.{1,4}/g);
+                            var spacedaddress = spacedaddress.join(' ');
+                            if (!addressBookName) {
+                                return qsTr("Monero address") + "<br>" + spacedaddress + translationManager.emptyString; 
+                            } else {
+                                return FontAwesome.addressBook + " " + addressBookName + "<br>" + spacedaddress;
+                            }
+                        } else {
+                            return "";
+                        }
+                    }
+                }
+            }
+
+            ColumnLayout {
+                Layout.fillWidth: true
+                Layout.alignment : Qt.AlignTop | Qt.AlignLeft
+
+                Text {
+                    Layout.fillWidth: true
+                    color: MoneroComponents.Style.dimmedFontColor
+                    text: qsTr("Fee") + ":" + translationManager.emptyString
+                    font.pixelSize: 15
+                }
+            }
+
+            RowLayout {
+                Layout.fillWidth: true
+                spacing: 16
+
+                Text {
+                    color: MoneroComponents.Style.defaultFontColor
+                    font.pixelSize: 15
+                    text: {
+                        if (currentWallet) {
+                            if (!root.transactionFee) {
+                                if (currentWallet.isHwBacked() === true) {
+                                    return qsTr("See on device") +  translationManager.emptyString;
+                                } else {
+                                    return qsTr("Calculating fee") + "..." +  translationManager.emptyString;
+                                }
+                            } else {
+                                return root.transactionFee + " XMR"
+                            }
+                        } else {
+                            return "";
+                        }
+                    }
+                }
+
+                Text {
+                    Layout.fillWidth: true
+                    Layout.leftMargin: 8
+                    color: MoneroComponents.Style.buttonSecondaryTextColor
+                    visible: persistentSettings.fiatPriceEnabled && root.transactionFee
+                    font.pixelSize: 15
+                    text: showFiatConversion(root.transactionFee)
+                }
+            }
+        }
+
+        ColumnLayout {
+            id: bottom
+            Layout.alignment: Qt.AlignBottom | Qt.AlignHCenter
+            Layout.fillWidth: true
+
+            RowLayout {
+                id: bottomMessage
+                Layout.fillWidth: true
+                Layout.preferredHeight: 50
+
+                BusyIndicator {
+                    visible: !bottomTextAnimation.running
+                    running: !bottomTextAnimation.running
+                    scale: .5
+                }
+
+                Text {
+                    id: bottomText
+                    color: MoneroComponents.Style.defaultFontColor
+                    text: ""
+                    horizontalAlignment: Text.AlignHCenter
+                    wrapMode: Text.Wrap
+                    font.pixelSize: 17
+                    opacity: 1
+
+                    SequentialAnimation{
+                        id:bottomTextAnimation
+                        running: false
+                        loops: Animation.Infinite
+                        alwaysRunToEnd: true
+                        NumberAnimation { target: bottomText; property: "opacity"; to: 0; duration: 500}
+                        NumberAnimation { target: bottomText; property: "opacity"; to: 1; duration: 500}
+                    }
+                }
+            }
+
+            RowLayout {
+                id: buttons
+                spacing: 70
+                Layout.fillWidth: true
+                Layout.preferredHeight: 50
+
+                MoneroComponents.StandardButton {
+                    id: backButton
+                    text: qsTr("Back") + translationManager.emptyString;
+                    width: 200
+                    focus: false
+                    primary: false
+                    KeyNavigation.tab: confirmButton
+                    Keys.enabled: backButton.visible
+                    Keys.onReturnPressed: backButton.onClicked
+                    Keys.onEnterPressed: backButton.onClicked
+                    Keys.onEscapePressed: {
+                        root.close()
+                        root.clearFields()
+                        root.rejected()
+                    }
+                    onClicked: {
+                        root.close()
+                        root.clearFields()
+                        root.rejected()
+                    }
+                }
+
+                MoneroComponents.StandardButton {
+                    id: confirmButton
+                    text: qsTr("Confirm") + translationManager.emptyString;
+                    rightIcon: "qrc:///images/rightArrow.png"
+                    width: 200
+                    focus: false
+                    KeyNavigation.tab: backButton
+                    Keys.enabled: confirmButton.visible
+                    Keys.onReturnPressed: confirmButton.onClicked
+                    Keys.onEnterPressed: confirmButton.onClicked
+                    Keys.onEscapePressed: {
+                        root.close()
+                        root.clearFields()
+                        root.rejected()
+                    }
+                    onClicked: {
+                        root.close()
+                        root.accepted()
+                    }
+                }
+            }
+        }
+    }
+}
--- a/deployment.pri
+++ b/deployment.pri
@@ -1,27 +0,0 @@
-android-no-sdk {
-    target.path = /data/user/qt
-    export(target.path)
-    INSTALLS += target
-} else:android {
-    x86 {
-        target.path = /libs/x86
-    } else: armeabi-v7a {
-        target.path = /libs/armeabi-v7a
-    } else {
-        target.path = /libs/armeabi
-    }
-    export(target.path)
-    INSTALLS += target
-} else:unix {
-    isEmpty(target.path) {
-        qnx {
-            target.path = /tmp/$${TARGET}/bin
-        } else {
-            target.path = /opt/$${TARGET}/bin
-        }
-        export(target.path)
-    }
-    INSTALLS += target
-}
-
-export(INSTALLS)
--- a/get_libwallet_api.sh
+++ b/get_libwallet_api.sh
@@ -1,286 +0,0 @@
-#!/bin/bash
-MONERO_URL=https://github.com/monero-project/monero.git
-MONERO_BRANCH=master
-
-pushd $(pwd)
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source $ROOT_DIR/utils.sh
-
-INSTALL_DIR=$ROOT_DIR/wallet
-MONERO_DIR=$ROOT_DIR/monero
-BUILD_LIBWALLET=false
-
-# init and update monero submodule
-if [ ! -d $MONERO_DIR/src ]; then
-    git submodule init monero
-fi
-git submodule update --remote
-git -C $MONERO_DIR fetch
-git -C $MONERO_DIR checkout v0.17.1.1
-
-# get monero core tag
-pushd $MONERO_DIR
-get_tag
-popd
-# create local monero branch
-git -C $MONERO_DIR checkout -B $VERSIONTAG
-
-# Merge monero PR dependencies
-
-# Workaround for git username requirements
-# Save current user settings and revert back when we are done with merging PR's
-OLD_GIT_USER=$(git -C $MONERO_DIR config --local user.name)
-OLD_GIT_EMAIL=$(git -C $MONERO_DIR config --local user.email)
-git -C $MONERO_DIR config user.name "Monero GUI"
-git -C $MONERO_DIR config user.email "gui@monero.local"
-# check for PR requirements in most recent commit message (i.e requires #xxxx)
-for PR in $(git log --format=%B -n 1 | grep -io "requires #[0-9]*" | sed 's/[^0-9]*//g'); do
-    echo "Merging monero push request #$PR"
-    # fetch pull request and merge
-    git -C $MONERO_DIR fetch origin pull/$PR/head:PR-$PR
-    git -C $MONERO_DIR merge --quiet PR-$PR  -m "Merge monero PR #$PR"
-    BUILD_LIBWALLET=true
-done
-
-# revert back to old git config
-$(git -C $MONERO_DIR config user.name "$OLD_GIT_USER")
-$(git -C $MONERO_DIR config user.email "$OLD_GIT_EMAIL")
-
-git -C $MONERO_DIR submodule init
-git -C $MONERO_DIR submodule update
-
-# Build libwallet if it doesnt exist
-if [ ! -f $MONERO_DIR/lib/libwallet_merged.a ]; then 
-    echo "libwallet_merged.a not found - Building libwallet"
-    BUILD_LIBWALLET=true
-# Build libwallet if no previous version file exists
-elif [ ! -f $MONERO_DIR/version.sh ]; then 
-    echo "monero/version.h not found - Building libwallet"
-    BUILD_LIBWALLET=true
-## Compare previously built version with submodule + merged PR's version. 
-else
-    source $MONERO_DIR/version.sh
-    # compare submodule version with latest build
-    pushd "$MONERO_DIR"
-    get_tag
-    popd
-    echo "latest libwallet version: $GUI_MONERO_VERSION"
-    echo "Installed libwallet version: $VERSIONTAG"
-    # check if recent
-    if [ "$VERSIONTAG" != "$GUI_MONERO_VERSION" ]; then
-        echo "Building new libwallet version $GUI_MONERO_VERSION"
-        BUILD_LIBWALLET=true
-    else
-        echo "latest libwallet ($GUI_MONERO_VERSION) is already built. Remove monero/lib/libwallet_merged.a to force rebuild"
-    fi
-fi
-
-if [ "$BUILD_LIBWALLET" != true ]; then
-    exit 0
-fi
-
-echo "GUI_MONERO_VERSION=\"$VERSIONTAG\"" > $MONERO_DIR/version.sh
-
-## Continue building libwallet
-
-# default build type
-BUILD_TYPE=$1
-if [ -z $BUILD_TYPE ]; then
-    BUILD_TYPE=release
-fi
-
-BUILD_TREZOR_FLAGS=" -DUSE_DEVICE_TREZOR=ON"
-if [ "$BUILD_TREZOR" == false ]; then
-    BUILD_TREZOR_FLAGS=" -DUSE_DEVICE_TREZOR=OFF"
-fi
-BUILD_TREZOR_FLAGS=" -DUSE_DEVICE_TREZOR_UDP_RELEASE=ON ${BUILD_TREZOR_FLAGS}"
-
-STATIC=false
-ANDROID=false
-if [ "$BUILD_TYPE" == "release" ]; then
-    echo "Building libwallet release"
-    CMAKE_BUILD_TYPE=Release
-elif [ "$BUILD_TYPE" == "release-static" ]; then
-    echo "Building libwallet release-static"
-    CMAKE_BUILD_TYPE=Release
-    STATIC=true
-elif [ "$BUILD_TYPE" == "release-android" ]; then
-    echo "Building libwallet release-static for ANDROID"
-    CMAKE_BUILD_TYPE=Release
-    STATIC=true
-    ANDROID=true
-elif [ "$BUILD_TYPE" == "debug-android" ]; then
-    echo "Building libwallet debug-static for ANDROID"
-    CMAKE_BUILD_TYPE=Debug
-    STATIC=true
-    ANDROID=true
-elif [ "$BUILD_TYPE" == "debug" ]; then
-    echo "Building libwallet debug"
-    CMAKE_BUILD_TYPE=Debug
-    STATIC=true
-else
-    echo "Valid build types are release, release-static, release-android, debug-android and debug"
-    exit 1;
-fi
-
-
-echo "cleaning up existing monero build dir, libs and includes"
-rm -fr $MONERO_DIR/build
-rm -fr $MONERO_DIR/lib
-rm -fr $MONERO_DIR/include
-rm -fr $MONERO_DIR/bin
-
-
-mkdir -p $MONERO_DIR/build/$BUILD_TYPE
-pushd $MONERO_DIR/build/$BUILD_TYPE
-
-# reusing function from "utils.sh"
-platform=$(get_platform)
-# default make executable
-make_exec="make"
-
-if [ -z "$ARCH" ]; then
-    ARCH="native"
-    if [ "$platform" == "darwin" ]; then
-        if [ "$STATIC" == true ]; then
-            ARCH="x86-64"
-        fi
-    elif [ "$platform" == "linux64" ]; then
-        if [ "$ANDROID" == true ]; then
-            ARCH="armv7-a"
-        elif [ "$STATIC" == true ]; then
-            ARCH="x86-64"
-        fi
-    elif [ "$platform" == "linux32" ]; then
-        if [ "$STATIC" == true ]; then
-            ARCH="i686"
-        fi
-    elif [ "$platform" == "linuxarmv7" ]; then
-        ARCH="armv7-a"
-    elif [ "$platform" == "mingw32" ]; then
-        ARCH="i686"
-    elif [ "$platform" == "mingw64" ]; then
-        ARCH="x86-64"
-    fi
-fi
-
-echo "Building for ARCH=$ARCH"
-
-## OS X
-if [ "$platform" == "darwin" ]; then
-    echo "Configuring build for MacOS.."
-    if [ "$STATIC" == true ]; then
-        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="$ARCH" -D BUILD_64=ON -D BUILD_TAG="mac-x64" -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../..
-    else
-        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D ARCH="$ARCH" -D BUILD_TAG="mac-x64" -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
-    fi
-
-## LINUX 64
-elif [ "$platform" == "linux64" ]; then
-    echo "Configuring build for Linux x64"
-    if [ "$ANDROID" == true ]; then
-        echo "Configuring build for Android on Linux host"
-        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="$ARCH" -D ANDROID=true -D BUILD_GUI_DEPS=ON -D USE_LTO=OFF -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
-    elif [ "$STATIC" == true ]; then
-        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="$ARCH" -D BUILD_64=ON -D BUILD_TAG="linux-x64" -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
-    else
-        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D ARCH="$ARCH" -D BUILD_TAG="linux-x64" -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
-    fi
-
-## LINUX 32
-elif [ "$platform" == "linux32" ]; then
-    echo "Configuring build for Linux i686"
-    if [ "$STATIC" == true ]; then
-        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="$ARCH" -D BUILD_64=OFF -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
-    else
-        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D ARCH="$ARCH" -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
-    fi
-
-## LINUX ARMv7
-elif [ "$platform" == "linuxarmv7" ]; then
-    echo "Configuring build for Linux armv7"
-    if [ "$STATIC" == true ]; then
-        cmake -D BUILD_TESTS=OFF -D ARCH="$ARCH" -D STATIC=ON -D BUILD_64=OFF  -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
-    else
-        cmake -D BUILD_TESTS=OFF -D ARCH="$ARCH" -D BUILD_64=OFF  -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
-    fi
-
-## LINUX other 
-elif [ "$platform" == "linux" ]; then
-    echo "Configuring build for Linux general"
-    if [ "$STATIC" == true ]; then
-        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="$ARCH" -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
-    else
-        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D ARCH="$ARCH" -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
-    fi
-
-## Windows 64
-## Windows is always static to work outside msys2
-elif [ "$platform" == "mingw64" ]; then
-    # Do something under Windows NT platform
-    echo "Configuring build for MINGW64.."
-    BOOST_ROOT=/mingw64/boost
-    cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D BOOST_ROOT="$BOOST_ROOT" -D ARCH="$ARCH" -D BUILD_TAG="win-x64" -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" -G "MSYS Makefiles" -D CMAKE_TOOLCHAIN_FILE=../../cmake/64-bit-toolchain.cmake -D MSYS2_FOLDER=$(cd $MINGW_PREFIX/.. && pwd -W) ../..
-
-## Windows 32
-elif [ "$platform" == "mingw32" ]; then
-    # Do something under Windows NT platform
-    echo "Configuring build for MINGW32.."
-    BOOST_ROOT=/mingw32/boost
-    cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D Boost_DEBUG=ON -D BOOST_ROOT="$BOOST_ROOT" -D ARCH="$ARCH" -D BUILD_64=OFF -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" -G "MSYS Makefiles" -D CMAKE_TOOLCHAIN_FILE=../../cmake/32-bit-toolchain.cmake -D MSYS2_FOLDER=$(cd $MINGW_PREFIX/.. && pwd -W) ../..
-    make_exec="mingw32-make"
-else
-    echo "Unknown platform, configuring general build"
-    if [ "$STATIC" == true ]; then
-        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="$ARCH" -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
-    else
-        cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D ARCH="$ARCH" -D BUILD_GUI_DEPS=ON $BUILD_TREZOR_FLAGS -D CMAKE_INSTALL_PREFIX="$MONERO_DIR"  ../..
-    fi
-fi
-
-# set CPU core count
-# thanks to SO: http://stackoverflow.com/a/20283965/4118915
-if test -z "$CPU_CORE_COUNT"; then
-  CPU_CORE_COUNT=$(grep -c ^processor /proc/cpuinfo 2>/dev/null || sysctl -n hw.ncpu)
-fi
-
-# Build libwallet_merged
-pushd $MONERO_DIR/build/$BUILD_TYPE/src/wallet
-eval $make_exec version -C ../..
-eval $make_exec  -j$CPU_CORE_COUNT
-eval $make_exec  install -j$CPU_CORE_COUNT
-popd
-
-# Build monerod
-# win32 need to build daemon manually with msys2 toolchain
-if [ "$platform" != "mingw32" ] && [ "$ANDROID" != true ]; then
-    pushd $MONERO_DIR/build/$BUILD_TYPE/src/daemon
-    eval make  -j$CPU_CORE_COUNT
-    eval make install -j$CPU_CORE_COUNT
-    popd
-fi
-
-# build install epee
-eval make -C $MONERO_DIR/build/$BUILD_TYPE/contrib/epee all install
-
-# install easylogging
-eval make -C $MONERO_DIR/build/$BUILD_TYPE/external/easylogging++ all install
-
-# install lmdb
-eval make -C $MONERO_DIR/build/$BUILD_TYPE/external/db_drivers/liblmdb all install
-
-# Install libunbound
-if [ -d $MONERO_DIR/build/$BUILD_TYPE/external/unbound ]; then
-    echo "Installing libunbound..."
-    pushd $MONERO_DIR/build/$BUILD_TYPE/external/unbound
-    # no need to make, it was already built as dependency for libwallet
-    # make -j$CPU_CORE_COUNT
-    $make_exec install -j$CPU_CORE_COUNT
-    popd
-fi
-
-# install randomx
-eval make -C $MONERO_DIR/build/$BUILD_TYPE/external/randomx all install
-
-popd
--- a/ios_get_libwallet.api.sh
+++ b/ios_get_libwallet.api.sh
@@ -1,49 +0,0 @@
-#!/bin/bash -e
-
-# 3 header files required by monero are missing from the IOS SDK. I copied them from iphoneSimulator SDK
-# cd /Applications/XCode.app
-# sudo cp ./Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include/sys/vmmeter.h ./Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/sys/
-# sudo cp ./Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include/netinet/udp_var.h ./Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/netinet/
-# sudo cp ./Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include/netinet/ip_var.h ./Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/netinet/
-
-
-if [ -z $BUILD_TYPE ]; then
-    BUILD_TYPE=release
-fi
-
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-if [ -z $BOOST_LIBRARYDIR ]; then
-    BOOST_LIBRARYDIR=${ROOT_DIR}/../ofxiOSBoost/build/ios/prefix/lib
-fi
-if [ -z $BOOST_INCLUDEDIR ]; then
-    BOOST_INCLUDEDIR=${ROOT_DIR}/../ofxiOSBoost/build/ios/prefix/include
-fi
-if [ -z $OPENSSL_INCLUDE_DIR ]; then
-    OPENSSL_INCLUDE_DIR=${ROOT_DIR}/../openssl/1.0.2j/include
-fi
-if [ -z $OPENSSL_ROOT_DIR ]; then
-    OPENSSL_ROOT_DIR=${ROOT_DIR}/../openssl/1.0.2j
-fi
-
-echo "Building IOS armv7"
-rm -r monero/build > /dev/null
-mkdir -p monero/build/release
-pushd monero/build/release
-cmake -D IOS=ON -D ARCH=armv7 -D BOOST_LIBRARYDIR=${BOOST_INCLUDEDIR} -D BOOST_INCLUDEDIR=${BOOST_INCLUDEDIR} -D OPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR} -D OPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -D CMAKE_BUILD_TYPE=debug -D STATIC=ON -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON -D CMAKE_INSTALL_PREFIX="/Users/jacob/crypto/monero-core/monero"  ../..
-make -j4 && make install
-popd
-echo "Building IOS arm64"
-rm -r monero/build > /dev/null
-mkdir -p monero/build/release
-pushd monero/build/release
-cmake -D IOS=ON -D ARCH=armv8-a -D BOOST_LIBRARYDIR=${BOOST_INCLUDEDIR} -D BOOST_INCLUDEDIR=${BOOST_INCLUDEDIR} -D OPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR} -D OPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -D CMAKE_BUILD_TYPE=debug -D STATIC=ON -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON -D CMAKE_INSTALL_PREFIX="/Users/jacob/crypto/monero-core/monero"  ../..
-make -j4 && make install
-popd
-
-echo "Creating fat library for armv7 and arm64"
-pushd monero
-mkdir -p lib-ios
-lipo -create lib-armv7/libwallet_merged.a lib-arm64/libwallet_merged.a -output lib-ios/libwallet_merged.a
-lipo -create lib-armv7/libunbound.a lib-arm64/libunbound.a -output lib-ios/libunbound.a
-lipo -create lib-armv7/libepee.a lib-arm64/libepee.a -output lib-ios/libepee.a
-popd
--- a/linuxdeploy_helper.sh
+++ b/linuxdeploy_helper.sh
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source $ROOT_DIR/utils.sh
-
-TARGET=$1
-
-GUI_EXEC=$2
-
-platform=$(get_platform)
-
-if [[ "$platform" == "linux64" ]]; then
-    PLAT_DIR="/usr/lib/x86_64-linux-gnu"
-elif [[ "$platform" == "linux32" ]]; then
-    PLAT_DIR="/usr/lib/i386-linux-gnu"
-elif [[ "$platform" == "linuxarmv7" ]]; then
-    PLAT_DIR="/usr/lib/arm-linux-gnueabihf"
-elif [[ "$platform" == "linuxarmv8" ]]; then
-    PLAT_DIR="/usr/lib/aarch64-linux-gnu"
-else
-    PLAT_DIR="/usr/lib"
-fi
-
-if [ -z "$QT_DIR" ]; then
-    QT_DIR=$PLAT_DIR/qt5
-fi
-
-if [ -z "$QTXML_DIR" ]; then
-    QTXML_DIR=$PLAT_DIR
-fi
-
-# Copy dependencies
-EXCLUDE='libstdc++|libgcc_s.so|libc.so|libpthread'
-INCLUDE='libunbound'
-cp -rv $QT_DIR/qml $TARGET || exit
-cp -rv $QT_DIR/plugins $TARGET || exit
-mkdir -p $TARGET/libs || exit
-#ldd $TARGET/$GUI_EXEC | grep "=> /" | awk '{print $3}' | grep $INCLUDE | xargs -I '{}' cp -v '{}' $TARGET/libs || exit
-#ldd $TARGET/$GUI_EXEC | grep "=> /" | awk '{print $3}' | grep -Ev $EXCLUDE | xargs -I '{}' cp -v '{}' $TARGET/libs || exit
-#ldd $TARGET/plugins/platforms/libqxcb.so| grep "=> /" | awk '{print $3}' | grep -Ev $EXCLUDE | xargs -I '{}' cp -v '{}' $TARGET/libs || exit
-#cp -v $QTXML_DIR/libQt5XmlPatterns.so.5 $TARGET/libs || exit
-
-# Create start script
-cat > $TARGET/start-gui.sh <<EOL
-#!/bin/bash
-export LD_LIBRARY_PATH=\`pwd\`/libs
-export QT_PLUGIN_PATH=\`pwd\`/plugins
-export QML2_IMPORT_PATH=\`pwd\`/qml
-# make it so that it can be called from anywhere and also through soft links
-SCRIPT_DIR="\$(dirname "\$(test -L "\${BASH_SOURCE[0]}" && readlink "\${BASH_SOURCE[0]}" || echo "\${BASH_SOURCE[0]}")")"
-"\$SCRIPT_DIR"/$GUI_EXEC "\$@"
-EOL
-
-# Create start script
-cat > $TARGET/start-tails.AppImage <<EOL
-#!/bin/bash
-# Silly hack to provide a launcher that is double clickable
-bash ./start-gui.sh
-EOL
-
-chmod +x $TARGET/start-gui.sh
-chmod +x $TARGET/start-tails.AppImage
--- a/main.qml
+++ b/main.qml
@@ -65,7 +65,6 @@ ApplicationWindow {
    property var currentWallet;
    property bool disconnected: currentWallet ? currentWallet.disconnected : false
    property var transaction;
-    property var transactionDescription;
    property var walletPassword
    property int restoreHeight:0
    property bool daemonSynced: false
@@ -234,12 +233,6 @@ ApplicationWindow {
        else
          walletManager.setLogLevel(persistentSettings.logLevel)

-        // setup language
-        var locale = persistentSettings.locale
-        if (locale !== "") {
-            translationManager.setLanguage(locale.split("_")[0]);
-        }
-
        // Reload transfer page with translations enabled
        middlePanel.transferView.onPageCompleted();

@@ -508,16 +501,30 @@ ApplicationWindow {
    }

    function onDeviceButtonRequest(code){
-        prevSplashText = splash.messageText;
-        splashDisplayedBeforeButtonRequest = splash.visible;
-        appWindow.showProcessingSplash(qsTr("Please proceed to the device..."));
+        if (txConfirmationPopup.visible) {
+            txConfirmationPopup.bottomTextAnimation.running = true
+            if (!txConfirmationPopup.errorText.visible) {
+                txConfirmationPopup.bottomText.text  = qsTr("Please confirm transaction on the device...") + translationManager.emptyString;
+            } else {
+                txConfirmationPopup.bottomText.text  = qsTr("Please proceed to the device...") + translationManager.emptyString;
+            }
+        } else {
+            prevSplashText = splash.messageText;
+            splashDisplayedBeforeButtonRequest = splash.visible;
+            appWindow.showProcessingSplash(qsTr("Please proceed to the device..."));
+        }
    }

    function onDeviceButtonPressed(){
-        if (splashDisplayedBeforeButtonRequest){
-           appWindow.showProcessingSplash(prevSplashText);
+        if (txConfirmationPopup.visible) {
+            txConfirmationPopup.bottomTextAnimation.running = false;
+            txConfirmationPopup.bottomText.text  = qsTr("Signing transaction in the device...") + translationManager.emptyString;
        } else {
-           hideProcessingSplash();
+            if (splashDisplayedBeforeButtonRequest){
+                appWindow.showProcessingSplash(prevSplashText);
+            } else {
+                hideProcessingSplash();
+            }
        }
    }

@@ -812,51 +819,33 @@ ApplicationWindow {

    function onTransactionCreated(pendingTransaction,address,paymentId,mixinCount){
        console.log("Transaction created");
-        hideProcessingSplash();
+        txConfirmationPopup.bottomText.text = "";
        transaction = pendingTransaction;
        // validate address;
        if (transaction.status !== PendingTransaction.Status_Ok) {
            console.error("Can't create transaction: ", transaction.errorString);
-            informationPopup.title = qsTr("Error") + translationManager.emptyString;
-            if (currentWallet.connected() == Wallet.ConnectionStatus_WrongVersion)
-                informationPopup.text  = qsTr("Can't create transaction: Wrong daemon version: ") + transaction.errorString
-            else
-                informationPopup.text  = qsTr("Can't create transaction: ") + transaction.errorString
-            informationPopup.icon  = StandardIcon.Critical
-            informationPopup.onCloseCallback = null
-            informationPopup.open();
+            if (currentWallet.connected() == Wallet.ConnectionStatus_WrongVersion) {
+                txConfirmationPopup.errorText.text  = qsTr("Can't create transaction: Wrong daemon version: ") + transaction.errorString
+            } else {
+                txConfirmationPopup.errorText.text  = qsTr("Can't create transaction: ") + transaction.errorString
+            }
            // deleting transaction object, we don't want memleaks
            currentWallet.disposeTransaction(transaction);

        } else if (transaction.txCount == 0) {
-            informationPopup.title = qsTr("Error") + translationManager.emptyString
-            informationPopup.text  = qsTr("No unmixable outputs to sweep") + translationManager.emptyString
-            informationPopup.icon = StandardIcon.Information
-            informationPopup.onCloseCallback = null
-            informationPopup.open()
+            console.error("Can't create transaction: ", transaction.errorString);
+            txConfirmationPopup.errorText.text   = qsTr("No unmixable outputs to sweep") + translationManager.emptyString
            // deleting transaction object, we don't want memleaks
            currentWallet.disposeTransaction(transaction);
        } else {
            console.log("Transaction created, amount: " + walletManager.displayAmount(transaction.amount)
                    + ", fee: " + walletManager.displayAmount(transaction.fee));

-            // here we show confirmation popup;
-            transactionConfirmationPopup.title = qsTr("Please confirm transaction:\n") + translationManager.emptyString;
-            transactionConfirmationPopup.text = "";
-            transactionConfirmationPopup.text += (address === "" ? "" : (qsTr("Address: ") + address));
-            transactionConfirmationPopup.text += (paymentId === "" ? "" : (qsTr("\nPayment ID: ") + paymentId));
-            transactionConfirmationPopup.text +=  qsTr("\n\nAmount: ") + walletManager.displayAmount(transaction.amount);
-            transactionConfirmationPopup.text +=  qsTr("\nFee: ") + walletManager.displayAmount(transaction.fee);
-            transactionConfirmationPopup.text +=  qsTr("\nRingsize: ") + (mixinCount + 1);
-            transactionConfirmationPopup.text +=  qsTr("\n\nNumber of transactions: ") + transaction.txCount
-            transactionConfirmationPopup.text +=  (transactionDescription === "" ? "" : (qsTr("\nDescription: ") + transactionDescription))
-            for (var i = 0; i < transaction.subaddrIndices.length; ++i){
-                transactionConfirmationPopup.text += qsTr("\nSpending address index: ") + transaction.subaddrIndices[i];
-            }
-
-            transactionConfirmationPopup.text += translationManager.emptyString;
-            transactionConfirmationPopup.icon = StandardIcon.Question
-            transactionConfirmationPopup.open()
+            // here we update txConfirmationPopup
+            txConfirmationPopup.transactionAmount = Utils.removeTrailingZeros(walletManager.displayAmount(transaction.amount));
+            txConfirmationPopup.transactionFee = Utils.removeTrailingZeros(walletManager.displayAmount(transaction.fee));
+            txConfirmationPopup.confirmButton.text = viewOnly ? qsTr("Save as file") : qsTr("Confirm") + translationManager.emptyString;
+            txConfirmationPopup.confirmButton.rightIcon = viewOnly ? "" : "qrc:///images/rightArrow.png"
        }
    }

@@ -870,12 +859,12 @@ ApplicationWindow {
                    ", mixins: ", mixinCount,
                    ", priority: ", priority,
                    ", description: ", description);
-
-        var splashMsg = qsTr("Creating transaction...");
-        splashMsg += appWindow.currentWallet.isLedger() ? qsTr("\n\nPlease check your hardware wallet –\nyour input may be required.") : "";
-        showProcessingSplash(splashMsg);
-
-        transactionDescription = description;
+        txConfirmationPopup.bottomTextAnimation.running = false
+        txConfirmationPopup.bottomText.text  = qsTr("Creating transaction...") + translationManager.emptyString;
+        txConfirmationPopup.transactionAddress = address;
+        txConfirmationPopup.transactionAmount = Utils.removeTrailingZeros(amount);
+        txConfirmationPopup.transactionPriority = priority;
+        txConfirmationPopup.transactionDescription = description;

        // validate amount;
        if (amount !== "(all)") {
@@ -883,31 +872,21 @@ ApplicationWindow {
            console.log("integer amount: ", amountxmr);
            console.log("integer unlocked", currentWallet.unlockedBalance())
            if (amountxmr <= 0) {
-                hideProcessingSplash()
-                informationPopup.title = qsTr("Error") + translationManager.emptyString;
-                informationPopup.text  = qsTr("Amount is wrong: expected number from %1 to %2")
-                        .arg(walletManager.displayAmount(0))
-                        .arg(walletManager.displayAmount(currentWallet.unlockedBalance()))
-                        + translationManager.emptyString
-
-                informationPopup.icon  = StandardIcon.Critical
-                informationPopup.onCloseCallback = null
-                informationPopup.open()
+                txConfirmationPopup.errorText.text = qsTr("Amount is wrong: expected number from %1 to %2")
+                    .arg(walletManager.displayAmount(0))
+                    .arg(walletManager.displayAmount(currentWallet.unlockedBalance()))
+                    + translationManager.emptyString;
                return;
            } else if (amountxmr > currentWallet.unlockedBalance()) {
-                hideProcessingSplash()
-                informationPopup.title = qsTr("Error") + translationManager.emptyString;
-                informationPopup.text  = qsTr("Insufficient funds. Unlocked balance: %1")
-                        .arg(walletManager.displayAmount(currentWallet.unlockedBalance()))
-                        + translationManager.emptyString
-
-                informationPopup.icon  = StandardIcon.Critical
-                informationPopup.onCloseCallback = null
-                informationPopup.open()
+                txConfirmationPopup.errorText.text = qsTr("Insufficient funds. Unlocked balance: %1")
+                    .arg(walletManager.displayAmount(currentWallet.unlockedBalance()))
+                    + translationManager.emptyString;
                return;
            }
        }

+        txConfirmationPopup.open();
+
        if (amount === "(all)")
            currentWallet.createTransactionAllAsync(address, paymentId, mixinCount, priority);
        else
@@ -935,40 +914,27 @@ ApplicationWindow {
    function handleSweepUnmixable() {
        console.log("Creating transaction: ")

+        txConfirmationPopup.sweepUnmixable = true;
        transaction = currentWallet.createSweepUnmixableTransaction();
        if (transaction.status !== PendingTransaction.Status_Ok) {
            console.error("Can't create transaction: ", transaction.errorString);
-            informationPopup.title = qsTr("Error") + translationManager.emptyString;
-            informationPopup.text  = qsTr("Can't create transaction: ") + transaction.errorString
-            informationPopup.icon  = StandardIcon.Critical
-            informationPopup.onCloseCallback = null
-            informationPopup.open();
+            txConfirmationPopup.errorText.text  = qsTr("Can't create transaction: ") + transaction.errorString + translationManager.emptyString
            // deleting transaction object, we don't want memleaks
            currentWallet.disposeTransaction(transaction);

        } else if (transaction.txCount == 0) {
-            informationPopup.title = qsTr("Error") + translationManager.emptyString
-            informationPopup.text  = qsTr("No unmixable outputs to sweep") + translationManager.emptyString
-            informationPopup.icon = StandardIcon.Information
-            informationPopup.onCloseCallback = null
-            informationPopup.open()
+            console.error("No unmixable outputs to sweep");
+            txConfirmationPopup.errorText.text  = qsTr("No unmixable outputs to sweep") + translationManager.emptyString
            // deleting transaction object, we don't want memleaks
            currentWallet.disposeTransaction(transaction);
        } else {
            console.log("Transaction created, amount: " + walletManager.displayAmount(transaction.amount)
                    + ", fee: " + walletManager.displayAmount(transaction.fee));
-
-            // here we show confirmation popup;
-
-            transactionConfirmationPopup.title = qsTr("Confirmation") + translationManager.emptyString
-            transactionConfirmationPopup.text  = qsTr("Please confirm transaction:\n")
-                        + qsTr("\n\nAmount: ") + walletManager.displayAmount(transaction.amount)
-                        + qsTr("\nFee: ") + walletManager.displayAmount(transaction.fee)
-                        + translationManager.emptyString
-            transactionConfirmationPopup.icon = StandardIcon.Question
-            transactionConfirmationPopup.open()
+            txConfirmationPopup.transactionAmount = Utils.removeTrailingZeros(walletManager.displayAmount(transaction.amount));
+            txConfirmationPopup.transactionFee = Utils.removeTrailingZeros(walletManager.displayAmount(transaction.fee));
            // committing transaction
        }
+        txConfirmationPopup.open();
    }

    // called after user confirms transaction
@@ -986,13 +952,10 @@ ApplicationWindow {
            // Store to file
            transaction.setFilename(path);
        }
-
-        appWindow.showProcessingSplash(qsTr("Sending transaction ..."));
        currentWallet.commitTransactionAsync(transaction);
    }

    function onTransactionCommitted(success, transaction, txid) {
-        hideProcessingSplash();
        if (!success) {
            console.log("Error committing transaction: " + transaction.errorString);
            informationPopup.title = qsTr("Error") + translationManager.emptyString
@@ -1001,13 +964,14 @@ ApplicationWindow {
            informationPopup.onCloseCallback = null;
            informationPopup.open();
        } else {
-            if (transactionDescription.length > 0) {
+            if (txConfirmationPopup.transactionDescription.length > 0) {
                for (var i = 0; i < txid.length; ++i)
-                  currentWallet.setUserNote(txid[i], transactionDescription);
+                    currentWallet.setUserNote(txid[i], txConfirmationPopup.transactionDescription);
            }

            // Clear tx fields
            middlePanel.transferView.clearFields()
+            txConfirmationPopup.clearFields()
            successfulTxPopup.open(txid)
        }
        currentWallet.refresh()
@@ -1321,6 +1285,8 @@ ApplicationWindow {
        x = (Screen.width - width) / 2
        y = (Screen.height - maxWindowHeight) / 2

+        translationManager.setLanguage(persistentSettings.locale.split("_")[0]);
+
        applyWalletMode(persistentSettings.walletMode);

        //
@@ -1376,8 +1342,9 @@ ApplicationWindow {
            return "";
        }

-        property string language
-        property string locale
+        property string language: 'English (US)'
+        property string language_wallet: 'English'
+        property string locale: 'en_US'
        property string account_name
        property string wallet_path
        property bool   allow_background_mining : false
@@ -1459,10 +1426,11 @@ ApplicationWindow {
        }
    }

-    // Confrirmation aka question dialog
-    StandardDialog {
+    // Transaction confirmation popup
+    TxConfirmationDialog {
+        // dynamically change onclose handler
+        id: txConfirmationPopup
        z: parent.z + 1
-        id: transactionConfirmationPopup
        onAccepted: {
            var handleAccepted = function() {
                // Save transaction to file if view only wallet
@@ -1768,7 +1736,7 @@ ApplicationWindow {
            anchors.fill: blurredArea
            source: blurredArea
            radius: 64
-            visible: passwordDialog.visible || inputDialog.visible || splash.visible || updateDialog.visible || devicePassphraseDialog.visible || successfulTxPopup.visible
+            visible: passwordDialog.visible || inputDialog.visible || splash.visible || updateDialog.visible || devicePassphraseDialog.visible || txConfirmationPopup.visible || successfulTxPopup.visible
        }


@@ -1874,11 +1842,6 @@ ApplicationWindow {
    function toggleLanguageView(){
        languageSidebar.isOpened ? languageSidebar.close() : languageSidebar.open();
        resetLanguageFields()
-        // update after changing language from settings page
-        if (persistentSettings.language != wizard.language_language) {
-            persistentSettings.language = wizard.language_language
-            persistentSettings.locale   = wizard.language_locale
-        }
    }

    Timer {
--- a/2
+++ b/2
--- a/monero-wallet-gui.pro
+++ b/monero-wallet-gui.pro
@@ -1,581 +0,0 @@
-# qml components require at least QT 5.9.7
-lessThan (QT_MAJOR_VERSION, 5) | lessThan (QT_MINOR_VERSION, 9) {
-  error("Can't build with Qt $${QT_VERSION}. Use at least Qt 5.9.7")
-}
-
-TEMPLATE = app
-
-QT += svg qml gui-private quick widgets
-
-WALLET_ROOT=$$PWD/monero
-
-CONFIG += c++11 link_pkgconfig
-packagesExist(libusb-1.0) {
-    PKGCONFIG += libusb-1.0
-}
-packagesExist(hidapi-libusb) {
-    PKGCONFIG += hidapi-libusb
-}
-
-GCC_VERSION = $$system("g++ -dumpversion")
-GCC_VERSION = $$split(GCC_VERSION, .)
-GCC_VERSION_MAJOR = $$member(GCC_VERSION, 0)
-GCC_VERSION_MINOR = $$member(GCC_VERSION, 1)
-greaterThan(GCC_VERSION_MAJOR, 9) | if(equals(GCC_VERSION_MAJOR, 9) : greaterThan(GCC_VERSION_MINOR, 0)) {
-    GCC_9_1_OR_GREATER = TRUE
-}
-
-!win32 | !isEmpty(GCC_9_1_OR_GREATER) {
-    QMAKE_CXXFLAGS += -fPIC -fstack-protector -fstack-protector-strong
-    QMAKE_LFLAGS += -fstack-protector -fstack-protector-strong
-}
-
-!win32 {
-    packagesExist(protobuf) {
-        PKGCONFIG += protobuf
-    }
-}
-
-# cleaning "auto-generated" bitmonero directory on "make distclean"
-QMAKE_DISTCLEAN += -r $$WALLET_ROOT
-
-INCLUDEPATH +=  $$WALLET_ROOT/include \
-                $$PWD/src/libwalletqt \
-                $$PWD/src/QR-Code-generator \
-                $$PWD/src \
-                $$WALLET_ROOT/src \
-                $$WALLET_ROOT/external/easylogging++ \
-                $$WALLET_ROOT/contrib/epee/include
-
-HEADERS += \
-    src/main/filter.h \
-    src/main/clipboardAdapter.h \
-    src/main/oscursor.h \
-    src/libwalletqt/WalletManager.h \
-    src/libwalletqt/Wallet.h \
-    src/libwalletqt/PassphraseHelper.h \
-    src/libwalletqt/PendingTransaction.h \
-    src/libwalletqt/TransactionHistory.h \
-    src/libwalletqt/TransactionInfo.h \
-    src/libwalletqt/QRCodeImageProvider.h \
-    src/libwalletqt/Transfer.h \
-    src/NetworkType.h \
-    src/main/oshelper.h \
-    src/TranslationManager.h \
-    src/model/TransactionHistoryModel.h \
-    src/model/TransactionHistorySortFilterModel.h \
-    src/QR-Code-generator/BitBuffer.hpp \
-    src/QR-Code-generator/QrCode.hpp \
-    src/QR-Code-generator/QrSegment.hpp \
-    src/model/AddressBookModel.h \
-    src/libwalletqt/AddressBook.h \
-    src/model/SubaddressModel.h \
-    src/libwalletqt/Subaddress.h \
-    src/model/SubaddressAccountModel.h \
-    src/libwalletqt/SubaddressAccount.h \
-    src/zxcvbn-c/zxcvbn.h \
-    src/libwalletqt/UnsignedTransaction.h \
-    src/main/Logger.h \
-    src/main/MainApp.h \
-    src/qt/downloader.h \
-    src/qt/FutureScheduler.h \
-    src/qt/ipc.h \
-    src/qt/KeysFiles.h \
-    src/qt/network.h \
-    src/qt/utils.h \
-    src/qt/macoshelper.h \
-    src/qt/MoneroSettings.h \
-    src/qt/TailsOS.h
-
-SOURCES += src/main/main.cpp \
-    src/main/filter.cpp \
-    src/main/clipboardAdapter.cpp \
-    src/main/oscursor.cpp \
-    src/libwalletqt/WalletManager.cpp \
-    src/libwalletqt/WalletListenerImpl.cpp \
-    src/libwalletqt/Wallet.cpp \
-    src/libwalletqt/PassphraseHelper.cpp \
-    src/libwalletqt/PendingTransaction.cpp \
-    src/libwalletqt/TransactionHistory.cpp \
-    src/libwalletqt/TransactionInfo.cpp \
-    src/libwalletqt/QRCodeImageProvider.cpp \
-    src/main/oshelper.cpp \
-    src/openpgp/openpgp.cpp \
-    src/TranslationManager.cpp \
-    src/model/TransactionHistoryModel.cpp \
-    src/model/TransactionHistorySortFilterModel.cpp \
-    src/QR-Code-generator/BitBuffer.cpp \
-    src/QR-Code-generator/QrCode.cpp \
-    src/QR-Code-generator/QrSegment.cpp \
-    src/model/AddressBookModel.cpp \
-    src/libwalletqt/AddressBook.cpp \
-    src/model/SubaddressModel.cpp \
-    src/libwalletqt/Subaddress.cpp \
-    src/model/SubaddressAccountModel.cpp \
-    src/libwalletqt/SubaddressAccount.cpp \
-    src/zxcvbn-c/zxcvbn.c \
-    src/libwalletqt/UnsignedTransaction.cpp \
-    src/main/Logger.cpp \
-    src/main/MainApp.cpp \
-    src/qt/downloader.cpp \
-    src/qt/FutureScheduler.cpp \
-    src/qt/ipc.cpp \
-    src/qt/KeysFiles.cpp \
-    src/qt/network.cpp \
-    src/qt/updater.cpp \
-    src/qt/utils.cpp \
-    src/qt/MoneroSettings.cpp \
-    src/qt/TailsOS.cpp
-
-CONFIG(DISABLE_PASS_STRENGTH_METER) {
-    HEADERS -= src/zxcvbn-c/zxcvbn.h
-    SOURCES -= src/zxcvbn-c/zxcvbn.c
-    DEFINES += "DISABLE_PASS_STRENGTH_METER"
-}
-
-!ios {
-    HEADERS += src/daemon/DaemonManager.h
-    SOURCES += src/daemon/DaemonManager.cpp
-}
-
-lupdate_only {
-SOURCES = *.qml \
-          components/*.qml \
-          components/effects/*.qml \
-          pages/*.qml \
-          pages/settings/*.qml \
-          pages/merchant/*.qml \
-          wizard/*.qml \
-          wizard/*js
-}
-
-# Linker flags required by Trezor
-TREZOR_LINKER = $$cat($$WALLET_ROOT/lib/trezor_link_flags.txt)
-
-ios:armv7 {
-    message("target is armv7")
-    LIBS += \
-        -L$$PWD/../ofxiOSBoost/build/libs/boost/lib/armv7 \
-}
-ios:arm64 {
-    message("target is arm64")
-    LIBS += \
-        -L$$PWD/../ofxiOSBoost/build/libs/boost/lib/arm64 \
-}
-
-LIBS_COMMON = \
-    -lgcrypt \
-    -lgpg-error \
-    -lwallet_merged \
-    -llmdb \
-    -lepee \
-    -lunbound \
-    -lsodium \
-    -leasylogging \
-    -lrandomx
-
-!ios:!android {
-    LIBS += -L$$WALLET_ROOT/lib \
-        $$LIBS_COMMON
-}
-
-android {
-    message("Host is Android")
-    LIBS += -L$$WALLET_ROOT/lib \
-        $$LIBS_COMMON
-}
-
-
-
-QMAKE_CXXFLAGS += -Werror -Wformat -Wformat-security
-QMAKE_CFLAGS += -Werror -Wformat -Wformat-security
-QMAKE_CXXFLAGS_RELEASE += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -O2
-QMAKE_CFLAGS_RELEASE += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -O2
-
-ios {
-    message("Host is IOS")
-
-    QMAKE_LFLAGS += -v
-    QMAKE_IOS_DEVICE_ARCHS = arm64
-    CONFIG += arm64
-    LIBS += -L$$WALLET_ROOT/lib-ios \
-        $$LIBS_COMMON
-
-    LIBS+= \
-        -L$$PWD/../OpenSSL-for-iPhone/lib \
-        -L$$PWD/../ofxiOSBoost/build/libs/boost/lib/arm64 \
-        -lboost_serialization \
-        -lboost_thread \
-        -lboost_system \
-        -lboost_date_time \
-        -lboost_filesystem \
-        -lboost_regex \
-        -lboost_chrono \
-        -lboost_program_options \
-        -lssl \
-        -lcrypto \
-        -ldl
-}
-
-CONFIG(WITH_SCANNER) {
-    if( greaterThan(QT_MINOR_VERSION, 5) ) {
-        message("using camera scanner")
-        QT += multimedia
-        DEFINES += "WITH_SCANNER"
-        INCLUDEPATH += $$PWD/src/QR-Code-scanner
-        HEADERS += \
-            src/QR-Code-scanner/QrScanThread.h \
-            src/QR-Code-scanner/QrCodeScanner.h
-        SOURCES += \
-            src/QR-Code-scanner/QrScanThread.cpp \
-            src/QR-Code-scanner/QrCodeScanner.cpp
-        android {
-            INCLUDEPATH += $$PWD/../ZBar/include
-            LIBS += -lzbarjni -liconv
-        } else {
-            LIBS += -lzbar
-            macx {
-                ZBAR_DIR = $$system(brew --prefix zbar, lines, EXIT_CODE)
-                equals(EXIT_CODE, 0) {
-                    INCLUDEPATH += $$ZBAR_DIR/include
-                } else {
-                    INCLUDEPATH += /usr/local/include
-                }
-            }
-        }
-    } else {
-        message("Skipping camera scanner because of Incompatible Qt Version !")
-    }
-}
-
-
-# currently we only support x86 build as qt.io only provides prebuilt qt for x86 mingw
-
-win32 {
-
-    # QMAKE_HOST.arch is unreliable, will allways report 32bit if mingw32 shell is run.
-    # Obtaining arch through uname should be reliable. This also fixes building the project in Qt creator without changes.
-    MSYS_HOST_ARCH = $$system(uname -a | grep -o "x86_64")
-
-    # WIN64 Host settings
-    contains(MSYS_HOST_ARCH, x86_64) {
-        message("Host is 64bit")
-        MSYS_ROOT_PATH=c:/msys64
-
-    # WIN32 Host settings
-    } else {
-        message("Host is 32bit")
-        MSYS_ROOT_PATH=c:/msys32
-    }
-
-    # WIN64 Target settings
-    contains(QMAKE_HOST.arch, x86_64) {
-        MSYS_MINGW_PATH=/mingw64
-
-    # WIN32 Target settings
-    } else {
-        MSYS_MINGW_PATH=/mingw32
-    }
-    
-    MSYS_PATH=$$MSYS_ROOT_PATH$$MSYS_MINGW_PATH
-
-    # boost root path
-    BOOST_PATH=$$MSYS_PATH/boost
-    BOOST_MINGW_PATH=$$MSYS_MINGW_PATH/boost
-
-    LIBS+=-L$$MSYS_PATH/lib
-    LIBS+=-L$$MSYS_MINGW_PATH/lib
-    LIBS+=-L$$BOOST_PATH/lib
-    LIBS+=-L$$BOOST_MINGW_PATH/lib
-    
-    QMAKE_LFLAGS += -static-libgcc -static-libstdc++
-
-    LIBS+= \
-        -Wl,-Bdynamic \
-        -lwinscard \
-        -lwsock32 \
-        -lIphlpapi \
-        -lcrypt32 \
-        -lhidapi \
-        -lgdi32 $$TREZOR_LINKER \
-        -Wl,-Bstatic \
-        -lboost_serialization-mt \
-        -lboost_thread-mt \
-        -lboost_system-mt \
-        -lboost_date_time-mt \
-        -lboost_filesystem-mt \
-        -lboost_regex-mt \
-        -lboost_chrono-mt \
-        -lboost_program_options-mt \
-        -lboost_locale-mt \
-        -licuio \
-        -licuin \
-        -licuuc \
-        -licudt \
-        -licutu \
-        -liconv \
-        -lstdc++ \
-        -lpthread \
-        -lsetupapi \
-        -lssl \
-        -lsodium \
-        -lcrypto \
-        -lws2_32 \
-        -lole32
-    
-    !contains(QMAKE_TARGET.arch, x86_64) {
-        message("Target is 32bit")
-        ## Windows x86 (32bit) specific build here
-        ## there's 2Mb stack in libwallet allocated internally, so we set stack=4Mb
-        ## this fixes app crash for x86 Windows build
-        QMAKE_LFLAGS += -Wl,--stack,4194304
-    } else {
-        message("Target is 64bit")
-    }
-
-    QMAKE_LFLAGS += -Wl,--dynamicbase -Wl,--nxcompat
-}
-
-linux {
-    CONFIG(static) {
-        message("using static libraries")
-        LIBS+= -Wl,-Bstatic    
-        QMAKE_LFLAGS += -static-libgcc -static-libstdc++
-        QMAKE_LIBDIR += /usr/local/ssl/lib
-   #     contains(QT_ARCH, x86_64) {
-            LIBS+= -lunbound \
-                   -lusb-1.0 \
-                   -lhidapi-hidraw \
-                   -ludev
-   #     }
-    } else {
-      # On some distro's we need to add dynload
-      LIBS+= -ldl
-    }
-
-    LIBS+= \
-        -lboost_serialization \
-        -lboost_thread \
-        -lboost_system \
-        -lboost_date_time \
-        -lboost_filesystem \
-        -lboost_regex \
-        -lboost_chrono \
-        -lboost_program_options \
-        -lssl \
-        -llmdb \
-        -lsodium \
-        -lhidapi-libusb \
-        -lcrypto $$TREZOR_LINKER
-
-    if(!android) {
-        LIBS+= \
-            -Wl,-Bdynamic \
-            -lGL \
-            -lX11
-    }
-    # currently monero has an issue with "static" build and linunwind-dev,
-    # so we link libunwind-dev only for non-Ubuntu distros
-    CONFIG(libunwind_off) {
-        message(Building without libunwind)
-    } else {
-        message(Building with libunwind)
-        LIBS += -Wl,-Bdynamic -lunwind
-    }
-
-    QMAKE_LFLAGS += -pie -Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack
-}
-
-macx {
-    # mixing static and shared libs are not supported on mac
-    # CONFIG(static) {
-    #     message("using static libraries")
-    #     LIBS+= -Wl,-Bstatic
-    # }
-
-    OPENSSL_DIR = $$system(brew --prefix openssl, lines, EXIT_CODE)
-    !equals(EXIT_CODE, 0) {
-        OPENSSL_DIR = /usr/local/ssl
-    }
-    OPENSSL_LIBRARY_DIR = $$OPENSSL_DIR/lib
-    INCLUDEPATH += $$OPENSSL_DIR/include
-
-    BOOST_DIR = $$system(brew --prefix boost, lines, EXIT_CODE)
-    equals(EXIT_CODE, 0) {
-        INCLUDEPATH += $$BOOST_DIR/include
-    } else {
-        INCLUDEPATH += /usr/local/include
-    }
-
-    GCRYPT_DIR = $$system(brew --prefix libgcrypt, lines, EXIT_CODE)
-    equals(EXIT_CODE, 0) {
-        INCLUDEPATH += $$GCRYPT_DIR/include
-    } else {
-        INCLUDEPATH += /usr/local/include
-    }
-
-    GPGP_ERROR_DIR = $$system(brew --prefix libgpg-error, lines, EXIT_CODE)
-    equals(EXIT_CODE, 0) {
-        INCLUDEPATH += $$GPGP_ERROR_DIR/include
-    } else {
-        INCLUDEPATH += /usr/local/include
-    }
-
-    SODIUM_DIR = $$system(brew --prefix libsodium, lines, EXIT_CODE)
-    equals(EXIT_CODE, 0) {
-        INCLUDEPATH += $$SODIUM_DIR/include
-    } else {
-        INCLUDEPATH += /usr/local/include
-    }
-
-    QT += macextras
-    OBJECTIVE_SOURCES += src/qt/macoshelper.mm
-    LIBS+= -Wl,-dead_strip
-    LIBS+= -Wl,-dead_strip_dylibs
-    LIBS+= -Wl,-bind_at_load
-    LIBS+= \
-        -L/usr/local/lib \
-        -L$$OPENSSL_LIBRARY_DIR \
-        -L/usr/local/opt/boost/lib \
-        -lboost_serialization \
-        -lboost_thread-mt \
-        -lboost_system \
-        -lboost_date_time \
-        -lboost_filesystem \
-        -lboost_regex \
-        -lboost_chrono \
-        -lboost_program_options \
-        -framework CoreFoundation \
-        -framework AppKit \
-        -lhidapi \
-        -lssl \
-        -lsodium \
-        -lcrypto \
-        -ldl $$TREZOR_LINKER
-
-    QMAKE_LFLAGS += -pie
-}
-
-
-# translation stuff
-TRANSLATIONS = $$files($$PWD/translations/monero-core_*.ts)
-
-CONFIG(release, debug|release) {
-    DESTDIR = release/bin
-    LANGUPD_OPTIONS = -locations none -no-ui-lines -no-obsolete
-    LANGREL_OPTIONS = -compress -nounfinished -removeidentical
-
-} else {
-    DESTDIR = debug/bin
-    LANGUPD_OPTIONS =
-#    LANGREL_OPTIONS = -markuntranslated "MISS_TR "
-}
-
-TRANSLATION_TARGET_DIR = $$OUT_PWD/translations
-
-!ios {
-    isEmpty(QMAKE_LUPDATE) {
-        win32:LANGUPD = $$[QT_INSTALL_BINS]\lupdate.exe
-        else:LANGUPD = $$[QT_INSTALL_BINS]/lupdate
-    }
-
-    isEmpty(QMAKE_LRELEASE) {
-        win32:LANGREL = $$[QT_INSTALL_BINS]\lrelease.exe
-        else:LANGREL = $$[QT_INSTALL_BINS]/lrelease
-    }
-
-    langupd.command = \
-        $$LANGUPD $$LANGUPD_OPTIONS $$shell_path($$_PRO_FILE) -ts $$_PRO_FILE_PWD/$$TRANSLATIONS
-
-
-
-    langrel.depends = langupd
-    langrel.input = TRANSLATIONS
-    langrel.output = $$TRANSLATION_TARGET_DIR/${QMAKE_FILE_BASE}.qm
-    langrel.commands = \
-        $$LANGREL $$LANGREL_OPTIONS ${QMAKE_FILE_IN} -qm $$TRANSLATION_TARGET_DIR/${QMAKE_FILE_BASE}.qm
-    langrel.CONFIG += no_link
-
-    QMAKE_EXTRA_TARGETS += langupd deploy deploy_win
-    QMAKE_EXTRA_COMPILERS += langrel
-
-    # Compile an initial version of translation files when running qmake
-    # the first time and generate the resource file for translations.
-    !exists($$TRANSLATION_TARGET_DIR) {
-        mkpath($$TRANSLATION_TARGET_DIR)
-    }
-    qrc_entry = "<RCC>"
-    qrc_entry += '  <qresource prefix="/">'
-    write_file($$TRANSLATION_TARGET_DIR/translations.qrc, qrc_entry)
-    for(tsfile, TRANSLATIONS) {
-        qmfile = $$TRANSLATION_TARGET_DIR/$$basename(tsfile)
-        qmfile ~= s/.ts$/.qm/
-        system($$LANGREL $$LANGREL_OPTIONS $$tsfile -qm $$qmfile)
-        qrc_entry = "    <file>$$basename(qmfile)</file>"
-        write_file($$TRANSLATION_TARGET_DIR/translations.qrc, qrc_entry, append)
-    }
-    qrc_entry = "  </qresource>"
-    qrc_entry += "</RCC>"
-    write_file($$TRANSLATION_TARGET_DIR/translations.qrc, qrc_entry, append)
-    RESOURCES += $$TRANSLATION_TARGET_DIR/translations.qrc
-}
-
-
-# Update: no issues with the "slow link process" anymore,
-# for development, just build debug version of libwallet_merged lib
-# by invoking 'get_libwallet_api.sh Debug'
-# so we update translations everytime even for debug build
-
-PRE_TARGETDEPS += langupd compiler_langrel_make_all
-
-RESOURCES += qml.qrc
-CONFIG += qtquickcompiler
-
-# Additional import path used to resolve QML modules in Qt Creator's code model
-QML_IMPORT_PATH = fonts
-
-# Default rules for deployment.
-include(deployment.pri)
-macx {
-    deploy.commands += macdeployqt $$sprintf("%1/%2/%3.app", $$OUT_PWD, $$DESTDIR, $$TARGET) -qmldir=$$PWD
-}
-
-win32 {
-    deploy.commands += windeployqt $$sprintf("%1/%2/%3.exe", $$OUT_PWD, $$DESTDIR, $$TARGET) -no-translations -qmldir=$$PWD
-    # Win64 msys2 deploy settings
-    contains(QMAKE_HOST.arch, x86_64) {
-        deploy.commands += $$escape_expand(\n\t) $$PWD/windeploy_helper.sh $$DESTDIR
-    }
-}
-
-linux:!android {
-    deploy.commands += $$escape_expand(\n\t) $$PWD/linuxdeploy_helper.sh $$DESTDIR $$TARGET
-}
-
-android{
-    deploy.commands += make install INSTALL_ROOT=$$DESTDIR && androiddeployqt --input android-libmonero-wallet-gui.so-deployment-settings.json --output $$DESTDIR --deployment bundled --android-platform android-21 --jdk /usr/lib/jvm/java-8-openjdk-amd64 -qmldir=$$PWD
-}
-
-
-OTHER_FILES += \
-    .gitignore \
-    $$TRANSLATIONS
-
-DISTFILES += \
-    notes.txt \
-    monero/src/wallet/CMakeLists.txt
-
-VERSION = $$cat('version.js', lines)
-VERSION = $$find(VERSION, 'GUI_VERSION')
-VERSION_LONG = $$replace(VERSION, '.*\"(.*)\"', '\1')
-VERSION = $$replace(VERSION, '.*(\d+\.\d+\.\d+\.\d+).*', '\1')
-
-# windows application icon
-RC_ICONS = images/appicon.ico
-
-# mac Info.plist & application icon
-QMAKE_INFO_PLIST = $$PWD/share/Info.plist
-macx {
-    QMAKE_POST_LINK += sed -i "''" -e "s/@VERSION@/$$VERSION/g" -e "s/@VERSION_LONG@/$$VERSION_LONG/g" "$$sprintf("%1/%2/%3.app", $$OUT_PWD, $$DESTDIR, $$TARGET)/Contents/Info.plist";
-}
-ICON = $$PWD/images/appicon.icns
--- a/pages/AddressBook.qml
+++ b/pages/AddressBook.qml
@@ -132,7 +132,7 @@ Rectangle {
                    delegate: Rectangle {
                        id: tableItem2
                        height: addressBookListRow.addressBookListItemHeight
-                        width: parent.width
+                        width: parent ? parent.width : undefined
                        Layout.fillWidth: true
                        color: "transparent"

--- a/pages/History.qml
+++ b/pages/History.qml
@@ -127,7 +127,7 @@ Rectangle {
                    image: "qrc:///images/whiteDropIndicator.png"
                    fontAwesomeFallbackIcon: FontAwesome.arrowDown
                    fontAwesomeFallbackSize: 14
-                    rotation: sortAndFilter.collapsed ? 0 : 180
+                    rotation: sortAndFilter.collapsed ? 180 : 0
                    color: MoneroComponents.Style.defaultFontColor

                    MouseArea {
--- a/pages/settings/SettingsInfo.qml
+++ b/pages/settings/SettingsInfo.qml
@@ -47,7 +47,7 @@ Rectangle {
        } else if(appWindow.walletMode === 1){
          return qsTr("Simple mode") + " (bootstrap)" + translationManager.emptyString;
        } else if(appWindow.walletMode === 2){
-          return qsTr("Advanced mode") + translationManager.emptyString;
+          return "%1 (%2)".arg(qsTr("Advanced mode")).arg(persistentSettings.useRemoteNode ? qsTr("Remote node") : qsTr("Local node")) + translationManager.emptyString;
        }
    }

--- a/pages/settings/SettingsWallet.qml
+++ b/pages/settings/SettingsWallet.qml
@@ -62,7 +62,7 @@ Rectangle {
            iconText: FontAwesome.eye
            description: qsTr("Creates a new wallet that can only view and initiate transactions, but requires a spendable wallet to sign transactions before sending.") + translationManager.emptyString
            title: qsTr("Create a view-only wallet") + translationManager.emptyString
-            visible: !appWindow.viewOnly
+            visible: !appWindow.viewOnly && (currentWallet ? !currentWallet.isLedger() : true)

            onClicked: {
                var newPath = currentWallet.path + "_viewonly";
--- a/qml.qrc
+++ b/qml.qrc
@@ -4,6 +4,7 @@
        <file>LeftPanel.qml</file>
        <file>MiddlePanel.qml</file>
        <file>components/Label.qml</file>
+        <file>components/LanguageButton.qml</file>
        <file>components/SettingsListItem.qml</file>
        <file>components/Slider.qml</file>
        <file>components/UpdateDialog.qml</file>
@@ -243,5 +244,6 @@
        <file>images/success.png</file>
        <file>images/success@2x.png</file>
        <file>components/SuccessfulTxDialog.qml</file>
+        <file>components/TxConfirmationDialog.qml</file>
    </qresource>
 </RCC>
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -81,13 +81,20 @@ if(APPLE)
    list(APPEND RESOURCES ${ICON})
 endif()

-add_executable(monero-wallet-gui ${EXECUTABLE_FLAG} main/main.cpp
+set(monero_wallet_gui_sources
    ${SOURCE_FILES}
    ${PASS_STRENGTH_FILES}
    ${QR_CODE_FILES}
    ${RESOURCES}
 )

+if(NOT ANDROID)
+    add_executable(monero-wallet-gui ${EXECUTABLE_FLAG} ${monero_wallet_gui_sources})
+else()
+    add_library(monero-wallet-gui SHARED ${monero_wallet_gui_sources})
+    set_target_properties(monero-wallet-gui PROPERTIES COMPILE_DEFINITIONS "ANDROID")
+endif()
+
 set_target_properties(monero-wallet-gui PROPERTIES
    RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
    MACOSX_BUNDLE TRUE
@@ -164,13 +171,17 @@ if(X11_FOUND)
 endif()

 if(WITH_SCANNER)
-    target_link_libraries(monero-wallet-gui
-        ${ZBAR_LIBRARIES}
-        jpeg
-        v4l2
-        v4lconvert
-        rt
-    )
+    if(NOT ANDROID)
+        target_link_libraries(monero-wallet-gui
+            ${ZBAR_LIBRARIES}
+            jpeg
+            v4l2
+            v4lconvert
+            rt
+        )
+    else()
+        target_link_libraries(monero-wallet-gui ${ZBAR_LIBRARIES})
+    endif()
 endif()

 add_custom_command(TARGET monero-wallet-gui POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:daemon> $<TARGET_FILE_DIR:monero-wallet-gui>)
--- a/src/main/Logger.cpp
+++ b/src/main/Logger.cpp
@@ -117,13 +117,14 @@ Logger::Logger(QCoreApplication &parent, QString userDefinedLogFilePath)
    c.setGlobally(el::ConfigurationType::ToFile, "false");
    c.setGlobally(el::ConfigurationType::ToStandardOutput, "true");
    el::Loggers::setDefaultConfigurations(c, true);
+    qInstallMessageHandler(messageHandler);
 }

 void Logger::resetLogFilePath(bool portable)
 {
    m_logFilePath = QDir::toNativeSeparators(getLogPath(m_userDefinedLogFilePath, portable));
    Monero::Wallet::init(m_applicationFilePath.c_str(), "monero-wallet-gui", m_logFilePath.toStdString(), true);
-    qInstallMessageHandler(messageHandler);
+    qWarning() << "Logging to" << m_logFilePath;
    emit logFilePathChanged();
 }

--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -120,6 +120,9 @@ Q_IMPORT_PLUGIN(QQmlDebugServerFactory)
 Q_IMPORT_PLUGIN(QTcpServerConnectionFactory)
 Q_IMPORT_PLUGIN(QGenericEnginePlugin)

+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+Q_IMPORT_PLUGIN(QtQmlPlugin)
+#endif
 Q_IMPORT_PLUGIN(QtQuick2Plugin)
 Q_IMPORT_PLUGIN(QtQuickLayoutsPlugin)
 Q_IMPORT_PLUGIN(QtGraphicalEffectsPlugin)
@@ -156,8 +159,6 @@ int main(int argc, char *argv[])
    // platform dependant settings
 #if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
    bool isDesktop = true;
-#elif defined(Q_OS_LINUX)
-    bool isLinux = true;
 #elif defined(Q_OS_ANDROID)
    bool isAndroid = true;
 #elif defined(Q_OS_IOS)
@@ -179,8 +180,8 @@ int main(int argc, char *argv[])
    // disable "QApplication: invalid style override passed" warning
    if (isDesktop) qputenv("QT_STYLE_OVERRIDE", "fusion");
 #ifdef Q_OS_LINUX
-    // force platform xcb
-    if (isDesktop) qputenv("QT_QPA_PLATFORM", "xcb");
+    // platform xcb by default
+    if (isDesktop && qEnvironmentVariableIsEmpty("QT_QPA_PLATFORM")) qputenv("QT_QPA_PLATFORM", "xcb");
 #endif

    // enable High DPI scaling
@@ -189,6 +190,20 @@ int main(int argc, char *argv[])
    // Turn off colors in monerod log output.
    qputenv("TERM", "goaway");

+#if defined(Q_OS_MACOS)
+    QDir::setCurrent(QDir(MacOSHelper::bundlePath() + QDir::separator() + "..").canonicalPath());
+#endif
+
+    if (MoneroSettings::portableConfigExists())
+    {
+        const QString cacheDir(MoneroSettings::portableFolderName() + QDir::separator() + ".cache");
+        if (!qputenv("QML_DISK_CACHE_PATH", cacheDir.toUtf8()))
+        {
+            qCritical() << "Error: failed to set QML disk cache path";
+            return 1;
+        }
+    }
+
    MainApp app(argc, argv);

 #if defined(Q_OS_WIN)
@@ -277,7 +292,6 @@ Verify update binary using 'shasum'-compatible (SHA256 algo) output signed by tw
    if (logLevelOk && logLevel >= 0 && logLevel <= Monero::WalletManagerFactory::LogLevel_Max){
        Monero::WalletManagerFactory::setLogLevel(logLevel);
    }
-    qWarning().noquote() << "app startd" << "(log: " + logger.logFilePath() + ")";

    if (parser.isSet(verifyUpdateOption))
    {
@@ -326,10 +340,6 @@ Verify update binary using 'shasum'-compatible (SHA256 algo) output signed by tw
    // start listening
    QTimer::singleShot(0, ipc, SLOT(bind()));

-#if defined(Q_OS_MACOS)
-    QDir::setCurrent(QDir(MacOSHelper::bundlePath() + QDir::separator() + "..").canonicalPath());
-#endif
-
    // screen settings
    // Mobile is designed on 128dpi
    qreal ref_dpi = 128;
--- a/src/openpgp/CMakeLists.txt
+++ b/src/openpgp/CMakeLists.txt
@@ -1,8 +1,10 @@
 file(GLOB_RECURSE SOURCES *.cpp)
 file(GLOB_RECURSE HEADERS *.h)

-find_library(GCRYPT_LIBRARY gcrypt)
-find_library(GPG_ERROR_LIBRARY gpg-error)
+find_library(GCRYPT_LIBRARY gcrypt REQUIRED)
+find_path(GCRYPT_INCLUDE_DIR gcrypt.h REQUIRED)
+
+find_library(GPG_ERROR_LIBRARY gpg-error REQUIRED)

 add_library(openpgp
  ${SOURCES}
@@ -10,7 +12,8 @@ add_library(openpgp

 target_include_directories(openpgp
  PUBLIC
-    ${CMAKE_SOURCE_DIR}/monero/contrib/epee/include)
+    ${CMAKE_SOURCE_DIR}/monero/contrib/epee/include
+    ${GCRYPT_INCLUDE_DIR})

 target_link_libraries(openpgp
  PUBLIC
--- a/src/qt/FutureScheduler.cpp
+++ b/src/qt/FutureScheduler.cpp
@@ -1,8 +1,16 @@
 #include "FutureScheduler.h"

+#include <mutex>
+
+#include <QThreadPool>
+
 FutureScheduler::FutureScheduler(QObject *parent)
    : QObject(parent), Alive(0), Stopping(false)
 {
+    static std::once_flag once;
+    std::call_once(once, []() {
+        QThreadPool::globalInstance()->setMaxThreadCount(4);
+    });
 }

 FutureScheduler::~FutureScheduler()
--- a/src/qt/MoneroSettings.cpp
+++ b/src/qt/MoneroSettings.cpp
@@ -179,13 +179,13 @@ bool MoneroSettings::portable() const
    return this->m_settings && this->m_settings->fileName() == portableFilePath();
 }

-bool MoneroSettings::portableConfigExists() const
+bool MoneroSettings::portableConfigExists()
 {
    QFileInfo info(portableFilePath());
    return info.exists() && info.isFile();
 }

-QString MoneroSettings::portableFilePath() const
+QString MoneroSettings::portableFilePath()
 {
    static QString filename(QDir(portableFolderName()).absoluteFilePath("settings.ini"));
    return filename;
--- a/src/qt/MoneroSettings.h
+++ b/src/qt/MoneroSettings.h
@@ -64,6 +64,7 @@ public:
    Q_INVOKABLE void setWritable(bool enabled);

    static QString portableFolderName();
+    static bool portableConfigExists();

 public slots:
    void _q_propertyChanged();
@@ -84,8 +85,7 @@ private:
    void store();

    bool portable() const;
-    bool portableConfigExists() const;
-    QString portableFilePath() const;
+    static QString portableFilePath();
    std::unique_ptr<QSettings> portableSettings() const;
    std::unique_ptr<QSettings> unportableSettings() const;
    void swap(std::unique_ptr<QSettings> newSettings);
--- a/utils.sh
+++ b/utils.sh
@@ -1,74 +0,0 @@
-#!/bin/bash
-
-
-function get_platform {
-    local platform="unknown"
-    if [ "$(uname)" == "Darwin" ]; then
-        platform="darwin"
-    elif [ "$(uname)" == "FreeBSD" ]; then
-        platform="freebsd"
-    elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
-        if [ "$(expr substr $(uname -m) 1 6)" == "x86_64" ]; then
-            platform="linux64"
-        elif [ "$(expr substr $(uname -m) 1 4)" == "i686" ]; then
-            platform="linux32"
-        elif [ "$(expr substr $(uname -m) 1 6)" == "armv7l" ]; then
-            platform="linuxarmv7"
-	elif [ "$(expr substr $(uname -m) 1 7)" == "aarch64" ]; then
-            platform="linuxarmv8"
-	else
-            platform="linux"
-        fi
-    elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW64_NT" ]; then
-        platform="mingw64"
-    elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW32_NT" ]; then
-        platform="mingw32"
-    fi
-    echo "$platform"
-
-}
-
-
-function get_tag()
-{
-  COMMIT=$(git rev-parse --short HEAD | sed -e 's/[\t ]*//')
-  if test $? -ne 0
-  then
-    echo "Cannot determine current commit. Make sure that you are building either from a Git working tree or from a source archive."
-    VERSIONTAG="unknown"
-  else
-    echo "You are currently on commit ${COMMIT}"
-    TAGGEDCOMMIT=$(git rev-list --tags --max-count=1 --abbrev-commit | sed -e 's/[\t ]*//')
-    if test -z "$TAGGEDCOMMIT"
-    then
-      echo "Cannot determine most recent tag. Make sure that you are building either from a Git working tree or from a source archive."
-      VERSIONTAG=$COMMIT
-    else
-      echo "The most recent tag was at ${TAGGEDCOMMIT}"
-      if test "$TAGGEDCOMMIT" = "$COMMIT"
-      then
-        echo "You are building a tagged release"
-        VERSIONTAG="release"
-      else
-        echo "You are ahead of or behind a tagged release"
-        VERSIONTAG="$COMMIT"
-      fi
-      # save tag name + commit if availible
-      TAGNAME=$(git describe --tags | sed -e 's/[\t ]*//')
-      if test -z "$TAGNAME"
-      then
-        TAGNAME="$VERSIONTAG"
-      fi
-    fi
-  fi
-}
-
-
-
-
-
-
-
-
-
-
--- a/windeploy_helper.sh
+++ b/windeploy_helper.sh
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source $ROOT_DIR/utils.sh
-
-
-TARGET=$1
-
-BUILD_TYPE=$2
-
-
-
-
-if [[ -z $BUILD_TYPE ]]; then
-	BUILD_TYPE=Release
-fi
-
-if [[ "$BUILD_TYPE" == "Release" ]]; then
-	echo "Release build"
-	ICU_FILES=(libicudt67.dll libicuin67.dll libicuio67.dll libicutu67.dll libicuuc67.dll)
-else
-	echo "Debug build"
-	ICU_FILES=(libicudtd67.dll libicuind67.dll libicuiod67.dll libicutud67.dll libicuucd67.dll)
-fi
-
-FILES=(libprotobuf.dll libbrotlicommon.dll libbrotlidec.dll libusb-1.0.dll zlib1.dll libzstd.dll libwinpthread-1.dll libtiff-5.dll libstdc++-6.dll libpng16-16.dll libpcre16-0.dll libpcre-1.dll libmng-2.dll liblzma-5.dll liblcms2-2.dll libjpeg-8.dll libintl-8.dll libiconv-2.dll libharfbuzz-0.dll libgraphite2.dll libglib-2.0-0.dll libfreetype-6.dll libbz2-1.dll libssp-0.dll libpcre2-16-0.dll libhidapi-0.dll libdouble-conversion.dll libgcrypt-20.dll)
-
-OPENSSL_FILES=(libssl-1_1 libcrypto-1_1)
-
-platform=$(get_platform)
-
-if [[ "$platform" == "mingw64" ]]; then
-	PLATFORM_FILES="libgcc_s_seh-1.dll" 
-	OPENSSL_SUFFIX="-x64"
-elif [[ "$platform" == "mingw32" ]]; then 
-	PLATFORM_FILES="libgcc_s_dw2-1.dll" 
-	OPENSSL_SUFFIX = ""
-fi
-
-for f in "${FILES[@]}"; do cp $MSYSTEM_PREFIX/bin/$f $TARGET || exit 1; done
-
-for f in "${ICU_FILES[@]}"; do cp $MSYSTEM_PREFIX/bin/$f $TARGET || exit 1; done
-
-for f in "${PLATFORM_FILES[@]}"; do cp $MSYSTEM_PREFIX/bin/$f $TARGET || exit 1; done
-
-for f in "${OPENSSL_FILES[@]}"; do cp $MSYSTEM_PREFIX/bin/$f$OPENSSL_SUFFIX.dll $TARGET || exit 1; done
-
-cp $ROOT_DIR/start-low-graphics-mode.bat $TARGET
--- a/wizard/WizardController.qml
+++ b/wizard/WizardController.qml
@@ -107,11 +107,6 @@ Rectangle {
    property bool   walletOptionsDeviceIsRestore: false
    property string tmpWalletFilename: ''

-    // language settings, updated via sidebar
-    property string language_locale: 'en_US'
-    property string language_wallet: 'English'
-    property string language_language: 'English (US)'
-
    // recovery made (restore wallet)
    property string walletRestoreMode: 'seed'  // seed, keys, qr

@@ -333,7 +328,7 @@ Rectangle {
        console.log("Creating temporary wallet", tmp_wallet_filename)
        var nettype = appWindow.persistentSettings.nettype;
        var kdfRounds = appWindow.persistentSettings.kdfRounds;
-        var wallet = walletManager.createWallet(tmp_wallet_filename, "", wizardController.language_wallet, nettype, kdfRounds)
+        var wallet = walletManager.createWallet(tmp_wallet_filename, "", persistentSettings.language_wallet, nettype, kdfRounds)

        wizardController.walletOptionsSeed = wallet.seed

@@ -364,9 +359,6 @@ Rectangle {
            wizardController.m_wallet.setPassword(wizardController.walletOptionsPassword);

            // save to persistent settings
-            persistentSettings.language = wizardController.language_language
-            persistentSettings.locale   = wizardController.language_locale
-
            persistentSettings.account_name = wizardController.walletOptionsName
            persistentSettings.wallet_path = wizardController.m_wallet.path;
            persistentSettings.restore_height = (isNaN(walletOptionsRestoreHeight))? 0 : walletOptionsRestoreHeight
@@ -404,7 +396,7 @@ Rectangle {
        if(wizardController.walletRestoreMode === 'seed')
            wallet = walletManager.recoveryWallet(tmp_wallet_filename, wizardController.walletOptionsSeed, wizardController.walletOptionsSeedOffset, nettype, restoreHeight, kdfRounds);
        else
-            wallet = walletManager.createWalletFromKeys(tmp_wallet_filename, wizardController.language_wallet, nettype,
+            wallet = walletManager.createWalletFromKeys(tmp_wallet_filename, persistentSettings.language_wallet, nettype,
                                                            wizardController.walletOptionsRecoverAddress, wizardController.walletOptionsRecoverViewkey,
                                                            wizardController.walletOptionsRecoverSpendkey, restoreHeight, kdfRounds)

--- a/wizard/WizardHome.qml
+++ b/wizard/WizardHome.qml
@@ -56,10 +56,20 @@ Rectangle {
            Layout.alignment: Qt.AlignHCenter
            spacing: 0

-            WizardHeader {
-                Layout.bottomMargin: 20
-                title: qsTr("Welcome to Monero") + translationManager.emptyString
-                subtitle: ""
+            RowLayout {
+                Layout.fillWidth: true
+                spacing: 10
+
+                WizardHeader {
+                    Layout.bottomMargin: 7
+                    Layout.fillWidth: true
+                    title: qsTr("Welcome to Monero") + translationManager.emptyString
+                    subtitle: ""
+                }
+
+                MoneroComponents.LanguageButton {
+                    Layout.bottomMargin: 8
+                }
            }

            WizardMenuItem {
@@ -147,15 +157,6 @@ Rectangle {
                        wizardController.wizardState = 'wizardModeSelection';
                    }                    
                }
-
-                MoneroComponents.StandardButton {
-                    small: true
-                    text: qsTr("Change language") + translationManager.emptyString
-
-                    onClicked: {
-                        appWindow.toggleLanguageView();
-                    }
-                }
            }

            MoneroComponents.CheckBox2 {
--- a/wizard/WizardLanguage.qml
+++ b/wizard/WizardLanguage.qml
@@ -152,15 +152,7 @@ Rectangle {
            Layout.fillWidth: true
            columnSpacing: 20

-            MoneroComponents.StandardButton {
-                id: idChangeLang
-                Layout.minimumWidth: 150
-                text: qsTr("Language") + translationManager.emptyString
-
-                onClicked: {
-                    appWindow.toggleLanguageView();
-                }
-            }
+            MoneroComponents.LanguageButton { }

            MoneroComponents.StandardButton {
                id: btnContinue
--- a/wizard/WizardSummary.qml
+++ b/wizard/WizardSummary.qml
@@ -54,7 +54,7 @@ ColumnLayout {
    WizardSummaryItem {
        Layout.fillWidth: true
        header: qsTr("Language") + translationManager.emptyString
-        value: wizardController.language_language
+        value: persistentSettings.language
    }

    WizardSummaryItem {
Author	SHA1	Message	Date
luigi1111	96f9c11320	Merge pull request #3248 `2e81ea2` build: prepare v0.17.1.5 (selsta)	2020-11-25 17:24:18 -06:00
luigi1111	4a5b191f7f	Merge pull request #3247 `5150945` workflows: upload source archive artifact (xiphon)	2020-11-25 17:23:24 -06:00
luigi1111	148d487988	Merge pull request #3245 `ec8cd13` portable: use portable storage folder to store QML disk cache (xiphon)	2020-11-25 17:22:38 -06:00
luigi1111	7b137f7682	Merge pull request #3097 `56722e4` AddressBook: fix Qt warning (selsta)	2020-11-25 17:21:41 -06:00
selsta	2e81ea2c09	build: prepare v0.17.1.5	2020-11-25 16:36:37 +01:00
xiphon	5150945414	workflows: upload source archive artifact	2020-11-25 13:27:59 +00:00
xiphon	ec8cd137cc	portable: use portable storage folder to store QML disk cache	2020-11-25 10:50:56 +00:00
Alexander Blair	d5365298d2	Merge pull request #3244 `2d20bfd7` cmake: find libgcrypt include directory (xiphon)	2020-11-24 11:36:29 -08:00
Alexander Blair	30bf63b4b8	Merge pull request #3237 `46cea8db` History: fix sortCollapsedIcon rotation (xiphon)	2020-11-24 11:36:05 -08:00
Alexander Blair	e8ee55a502	Merge pull request #3236 `b4c0cb65` Makefile: refactor USE_SINGLE_BUILDDIR=OFF builddir path (xiphon)	2020-11-24 11:35:45 -08:00
Alexander Blair	212fa083e2	Merge pull request #3231 `56e61148` wizard: move language related settings to PersistentSettings (xiphon)	2020-11-24 11:35:24 -08:00
Alexander Blair	3daf16e65d	Merge pull request #3229 `45bfcfd2` workflows: build and upload macOS bundle (selsta)	2020-11-24 11:35:05 -08:00
Alexander Blair	abfaac9772	Merge pull request #3227 `ff201af7` docker: Linux - use Qt 5.15.2 (xiphon)	2020-11-24 11:34:39 -08:00
Alexander Blair	28e6558a48	Merge pull request #3224 `ef2be82c` cmake: use QT_INSTALL_PREFIX instead of CMAKE_PREFIX_PATH (xiphon)	2020-11-24 11:34:15 -08:00
xiphon	2d20bfd7ac	cmake: find libgcrypt include directory	2020-11-24 15:41:41 +00:00
selsta	45bfcfd2e9	workflows: build and upload macOS bundle	2020-11-24 01:00:26 +01:00
xiphon	46cea8db6b	History: fix sortCollapsedIcon rotation	2020-11-15 02:50:18 +00:00
xiphon	b4c0cb65de	Makefile: refactor USE_SINGLE_BUILDDIR=OFF builddir path	2020-11-15 02:45:28 +00:00
xiphon	56e611480a	wizard: move language related settings to PersistentSettings	2020-11-12 22:47:07 +00:00
xiphon	ff201af778	docker: Linux - use Qt 5.15.2	2020-11-12 13:51:36 +00:00
xiphon	ef2be82c21	cmake: use QT_INSTALL_PREFIX instead of CMAKE_PREFIX_PATH	2020-11-10 02:00:07 +00:00
luigi1111	6fce5c7a84	Merge pull request #3223 `1571662` build: prepare v0.17.1.4 (selsta)	2020-11-09 11:52:44 -06:00
selsta	157166269b	build: prepare v0.17.1.4	2020-11-09 18:41:19 +01:00
luigi1111	caa273afea	Merge pull request #3221 `19a6f39` Revert 'docker: Linux - use Qt 5.15.2' (selsta)	2020-11-09 11:35:15 -06:00
luigi1111	d58ce3f599	Merge pull request #3217 `18c964a` docker: Android - use Qt 5.15.2, drop QT_PREFIX env variable (xiphon)	2020-11-09 11:32:46 -06:00
selsta	19a6f399f3	Revert "docker: Linux - use Qt 5.15.2" This reverts commit `1adf58793f`.	2020-11-09 15:37:46 +01:00
xiphon	18c964afca	docker: Android - use Qt 5.15.2, drop QT_PREFIX env variable	2020-11-07 23:05:26 +00:00
luigi1111	158e0c3523	Merge pull request #3214 `f3ddf52` build: prepare v0.17.1.3 (selsta)	2020-11-07 13:19:54 -06:00
luigi1111	770a7a344b	Merge pull request #3204 `e86fa3e` cmake: workaround for MacOS '-framework' pkg-config flags issue (xiphon)	2020-11-07 13:17:21 -06:00
selsta	f3ddf525a4	build: prepare v0.17.1.3	2020-11-07 20:11:59 +01:00
luigi1111	df2b85e7ee	Merge pull request #3200 `5702bde` workflows: upload Windows and Linux static binaries (xiphon)	2020-11-06 19:10:01 -06:00
xiphon	e86fa3e4fb	cmake: workaround for MacOS '-framework' pkg-config flags issue	2020-11-06 13:51:02 +00:00
xiphon	5702bdef39	workflows: upload Windows and Linux static binaries	2020-11-06 13:48:08 +00:00
Alexander Blair	c7213abb9a	Merge pull request #3212 `be177d62` workflows: bump msys2 action to v2 (selsta)	2020-11-06 05:11:53 -08:00
Alexander Blair	5ee363f9f3	Merge pull request #3210 `919b2e4f` WizardLanguage: introduce LanguageButton component, replace the btn (xiphon) `8b9580d6` WizardHome: display icon + language instead of change language button (xiphon)	2020-11-06 05:11:29 -08:00
Alexander Blair	3e01647744	Merge pull request #3209 `6f5bacab` Logger: print to stdout till log file path gets initialized (xiphon)	2020-11-06 05:11:09 -08:00
Alexander Blair	f491b41100	Merge pull request #3205 `6fab741f` SettingsInfo: add selected node to info page (selsta)	2020-11-06 05:10:52 -08:00
Alexander Blair	a564abbe6b	Merge pull request #3202 `0997b38e` SettingsWallet: fix warning (selsta)	2020-11-06 05:09:46 -08:00
Alexander Blair	149732af3a	Merge pull request #3203 `c2977ac4` DEPLOY: new hidapi release available (selsta)	2020-11-06 05:09:31 -08:00
Alexander Blair	2bb6da5f09	Merge pull request #3201 `1adf5879` docker: Linux - use Qt 5.15.2 (xiphon)	2020-11-06 05:08:40 -08:00
Alexander Blair	11370c50eb	Merge pull request #3199 `d79f8e8b` Makefile: MANUAL_SUBMODULES support (OFF by default) (xiphon)	2020-11-06 05:06:23 -08:00
Alexander Blair	0ae4677a25	Merge pull request #3198 `a817bfba` QThreadPool: adjust max threads count (4) (xiphon)	2020-11-06 05:06:10 -08:00
Alexander Blair	1c2879bda3	Merge pull request #3188 `9fa597bb` workflows: docker android apk build (xiphon)	2020-11-06 05:05:45 -08:00
selsta	0997b38e1e	SettingsWallet: fix warning	2020-11-05 02:39:47 +01:00
selsta	be177d6205	workflows: bump msys2 action to v2	2020-11-05 00:32:16 +01:00
xiphon	919b2e4f3a	WizardLanguage: introduce LanguageButton component, replace the btn	2020-11-04 03:10:02 +00:00
xiphon	8b9580d621	WizardHome: display icon + language instead of change language button Co-authored-by: rating89us <45968869+rating89us@users.noreply.github.com>	2020-11-04 02:10:37 +00:00
xiphon	6f5bacabfd	Logger: print to stdout till log file path gets initialized	2020-11-04 01:42:19 +00:00
selsta	6fab741f2e	SettingsInfo: add selected node to info page	2020-11-02 01:26:40 +01:00
selsta	c2977ac410	DEPLOY: new hidapi release available	2020-11-01 00:25:08 +01:00
xiphon	1adf58793f	docker: Linux - use Qt 5.15.2	2020-10-30 22:20:35 +00:00
xiphon	9fa597bb58	workflows: docker android apk build	2020-10-30 22:16:20 +00:00
xiphon	d79f8e8b17	Makefile: MANUAL_SUBMODULES support (OFF by default)	2020-10-30 03:05:06 +00:00
xiphon	a817bfba05	QThreadPool: adjust max threads count (4)	2020-10-30 02:58:38 +00:00
Alexander Blair	04429e85e6	Merge pull request #3159 `9d2f083a` repo: cleanup qmake (selsta)	2020-10-28 01:22:38 -07:00
Alexander Blair	e52d86d442	Merge pull request #3195 `153154f4` cmake: Linux - Qt 5.15 installer support (xiphon)	2020-10-28 00:44:03 -07:00
Alexander Blair	7f164e739a	Merge pull request #3194 `9b18344d` main: don't override user-provided QT_QPA_PLATFORM env variable (xiphon)	2020-10-28 00:43:43 -07:00
Alexander Blair	43214de7d0	Merge pull request #3193 `ee013705` cmake: omit Qt5Widgets and Qt5Network modules (xiphon)	2020-10-28 00:43:18 -07:00
Alexander Blair	0cf683a6cf	Merge pull request #3192 `1b0f274a` docker: Linux - CFLAGS and CXXFLAGS env variables (xiphon)	2020-10-28 00:42:59 -07:00
Alexander Blair	c9fd9634ee	Merge pull request #3187 `cd054f6c` docker: fix Android build, update to Qt 5.15, README.md build steps (xiphon) `d6cb9b6c` docker: move Android Dockerfile to root (xiphon)	2020-10-28 00:42:36 -07:00
Alexander Blair	ddcee95b88	Merge pull request #3186 `fe730114` cmake: Android cross compilation support (xiphon)	2020-10-28 00:42:16 -07:00
Alexander Blair	299067a273	Merge pull request #3185 `852378ac` cmake: ZBar - Android support, fix find_package without pkg-config (xiphon)	2020-10-28 00:40:22 -07:00
Alexander Blair	08635e3030	Merge pull request #3163 `25ca0811` transfer: new TxConfirmationDialog (rating89us)	2020-10-28 00:39:43 -07:00
Alexander Blair	fdff5f68dd	Merge pull request #3160 `9da52f23` SettingsWallet: disable creating view-only wallet for Ledger (rating89us)	2020-10-28 00:37:30 -07:00
xiphon	9b18344d23	main: don't override user-provided QT_QPA_PLATFORM env variable	2020-10-28 00:57:30 +00:00
xiphon	153154f484	cmake: Linux - Qt 5.15 installer support	2020-10-28 00:55:06 +00:00
xiphon	ee0137056d	cmake: omit Qt5Widgets and Qt5Network modules	2020-10-28 00:44:58 +00:00
xiphon	1b0f274aed	docker: Linux - CFLAGS and CXXFLAGS env variables	2020-10-27 10:59:41 +00:00
xiphon	cd054f6c26	docker: fix Android build, update to Qt 5.15, README.md build steps Co-authored-by: takel	2020-10-26 11:24:45 +00:00
xiphon	d6cb9b6c85	docker: move Android Dockerfile to root	2020-10-22 04:13:19 +00:00
xiphon	852378accb	cmake: ZBar - Android support, fix find_package without pkg-config	2020-10-21 20:48:38 +00:00
xiphon	fe73011422	cmake: Android cross compilation support	2020-10-21 20:29:17 +00:00
selsta	9d2f083a97	repo: cleanup qmake	2020-10-20 02:01:44 +02:00
rating89us	25ca081109	transfer: new TxConfirmationDialog	2020-10-17 12:11:13 +02:00
rating89us	9da52f2387	SettingsWallet: disable creating view-only wallet for Ledger	2020-10-17 03:10:33 +02:00
selsta	56722e4747	AddressBook: fix Qt warning	2020-09-21 00:47:32 +02:00