Merge remote-tracking branch 'origin/main'

lib/view_model/unspent_coins/unspent_coins_list_view_model.dart

@@ -28,12 +28,15 @@ abstract class UnspentCoinsListViewModelBase with Store {
       final amount = bitcoin.formatterBitcoinAmountToString(amount: elem.value) +
           ' ${wallet.currency.title}';
   
+     final info = _unspentCoinsInfo.values
+          .firstWhere((element) => element.walletId == wallet.id && element.hash == elem.hash);
+
       return UnspentCoinsItem(
           address: elem.address,
           amount: amount,
           hash: elem.hash,
           isFrozen: elem.isFrozen,
-          note: elem.note,
+          note: info.note,
           isSending: elem.isSending
       );
     }));

scripts/android/build_haven.sh

@@ -62,7 +62,7 @@ mkdir -p ./build/release
 cd ./build/release
 CC=${CLANG} CXX=${CXXLANG} cmake -D USE_DEVICE_TREZOR=OFF -D BUILD_GUI_DEPS=1 -D BUILD_TESTS=OFF -D ARCH=${ARCH} -D STATIC=ON -D BUILD_64=${BUILD_64} -D CMAKE_BUILD_TYPE=release -D ANDROID=true -D INSTALL_VENDORED_LIBUNBOUND=ON -D BUILD_TAG=${TAG} -D CMAKE_SYSTEM_NAME="Android" -D CMAKE_ANDROID_STANDALONE_TOOLCHAIN="${ANDROID_STANDALONE_TOOLCHAIN_PATH}" -D CMAKE_ANDROID_ARCH_ABI=${ARCH_ABI} $FLAGS ../..
     
-make wallet_api -j4
+make wallet_api -j$THREADS
 find . -path ./lib -prune -o -name '*.a' -exec cp '{}' lib \;
 
 cp -r ./lib/* $DEST_LIB_DIR

scripts/android/build_iconv.sh

@@ -31,7 +31,7 @@ rm -rf $ICONV_SRC_DIR
 tar -xzf $ICONV_FILE_PATH -C $WORKDIR
 cd $ICONV_SRC_DIR
 CC=${CLANG} CXX=${CXXLANG} ./configure --build=x86_64-linux-gnu --host=${HOST} --prefix=${PREFIX} --disable-rpath
-make
+make -j$THREADS
 make install
 
 done

scripts/android/build_monero.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 . ./config.sh
-MONERO_BRANCH=v0.17.2.3-android
+MONERO_BRANCH=v0.17.3.0-android
 MONERO_SRC_DIR=${WORKDIR}/monero
 
 git clone https://github.com/cake-tech/monero.git ${MONERO_SRC_DIR} --branch ${MONERO_BRANCH}
@@ -61,7 +61,7 @@ mkdir -p ./build/release
 cd ./build/release
 CC=${CLANG} CXX=${CXXLANG} cmake -D USE_DEVICE_TREZOR=OFF -D BUILD_GUI_DEPS=1 -D BUILD_TESTS=OFF -D ARCH=${ARCH} -D STATIC=ON -D BUILD_64=${BUILD_64} -D CMAKE_BUILD_TYPE=release -D ANDROID=true -D INSTALL_VENDORED_LIBUNBOUND=ON -D BUILD_TAG=${TAG} -D CMAKE_SYSTEM_NAME="Android" -D CMAKE_ANDROID_STANDALONE_TOOLCHAIN="${ANDROID_STANDALONE_TOOLCHAIN_PATH}" -D CMAKE_ANDROID_ARCH_ABI=${ARCH_ABI} $FLAGS ../..
     
-make wallet_api -j4
+make wallet_api -j$THREADS
 find . -path ./lib -prune -o -name '*.a' -exec cp '{}' lib \;
 
 cp -r ./lib/* $DEST_LIB_DIR

scripts/android/build_openssl.sh

@@ -49,7 +49,7 @@ CC=clang ANDROID_NDK=$TOOLCHAIN \
 	--prefix=${PREFIX} \
 	--openssldir=${PREFIX} \
 	-D__ANDROID_API__=$API 
-make -j4
+make -j$THREADS
 make install
 
 done

scripts/android/build_sodium.sh

@@ -23,7 +23,7 @@ git clone https://github.com/jedisct1/libsodium.git $SODIUM_SRC_DIR -b $SODIUM_B
 cd $SODIUM_SRC_DIR
 ./autogen.sh
 CC=clang CXX=clang++ ./configure --prefix=${PREFIX} --host=${HOST} --enable-static --disable-shared
-make
+make -j$THREADS
 make install
 
 done

scripts/android/build_zmq.sh

@@ -26,7 +26,7 @@ cd $ZMQ_SRC_DIR
 git checkout ${ZMQ_COMMIT_HASH}
 ./autogen.sh
 CC=clang CXX=clang++ ./configure --prefix=${PREFIX} --host=${HOST} --enable-static --disable-shared
-make
+make -j$THREADS
 make install
 
 done

scripts/android/config.sh

@@ -8,3 +8,4 @@ export ANDROID_NDK_HOME=$ANDROID_NDK_ROOT
 export TOOLCHAIN_DIR="${WORKDIR}/toolchain"
 export TOOLCHAIN_BASE_DIR=$TOOLCHAIN_DIR
 export ORIGINAL_PATH=$PATH
+export THREADS=4

scripts/android/finish_boost.sh

@@ -6,4 +6,4 @@ BOOST_SRC_DIR=$3
 
 cd $BOOST_SRC_DIR
 
-./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} install
+./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} -j$THREADS install

scripts/ios/build_monero.sh

@@ -4,7 +4,7 @@
 
 MONERO_URL="https://github.com/monero-project/monero.git"
 MONERO_DIR_PATH="${EXTERNAL_IOS_SOURCE_DIR}/monero"
-MONERO_VERSION=tags/v0.17.2.3
+MONERO_VERSION=tags/v0.17.3.0
 BUILD_TYPE=release
 PREFIX=${EXTERNAL_IOS_DIR}