diff --git a/release.sh b/release.sh index 74528528edad572bf50b10b7aef06efefa5f561b..a394cf0fa914b8cf8a2783286ee4a97dfbc06042 100755 --- a/release.sh +++ b/release.sh @@ -165,8 +165,8 @@ git submodule init git submodule sync git submodule update --remote --merge -if [[ -d "$DIRNAME/platforms/desktop" ]]; then - cd platforms/desktop +if [[ -d "${DIRNAME}/platforms/desktop" ]]; then + cd ${DIRNAME}/platforms/desktop # Build desktop assets ./release.sh $2 @@ -178,7 +178,7 @@ else fi; # back to nodejs version 6 -cd $DIRNAME +cd ${DIRNAME} nvm use 6 echo "**********************************" diff --git a/www/js/services/wallet-services.js b/www/js/services/wallet-services.js index 4054880e1a4bbbcd643cfac531d25690ed8a5350..97b4a431bd149038cedeb50e28a4bbb12c1d6056 100644 --- a/www/js/services/wallet-services.js +++ b/www/js/services/wallet-services.js @@ -1073,7 +1073,7 @@ angular.module('cesium.wallet.services', ['ngApi', 'ngFileSaver', 'cesium.bma.se _.find(data.sources || [], function(source) { if (!source.consumed && source.base === filterBase && // Filter on simple SIG output condition - fix #845 - BMA.regexp.TX_OUTPUT_SIG.exec(source.condition) + BMA.regexp.TX_OUTPUT_SIG.exec(source.conditions) ) { sourcesAmount += powBase(source.amount, source.base); sources.push(source);