Skip to content

Commit

Permalink
Merge branch 'master' into lessthan500
Browse files Browse the repository at this point in the history
  • Loading branch information
@marcosrdz
marcosrdz committed Jan 19, 2021
2 parents 6355871 + dcc2670 commit b9c63cf
Show file tree
Hide file tree
Showing 7 changed files with 55 additions and 41 deletions.
2 changes: 1 addition & 1 deletion android/app/build.gradle
View file
Expand Up @@ -136,7 +136,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "6.0.3"
versionName "6.0.4"
multiDexEnabled true
missingDimensionStrategy 'react-native-camera', 'general'
testBuildType System.getProperty('testBuildType', 'debug') // This will later be used to control the test apk build type
Expand Down
7 changes: 4 additions & 3 deletions appcenter-post-build.sh
View file
Expand Up @@ -2,7 +2,8 @@

echo Uploading to Appetize and publishing link to Github...
echo -n "Branch "
git ls-remote --heads origin | grep $(git rev-parse HEAD) | cut -d / -f 3
BRANCH=`git ls-remote --heads origin | grep $(git rev-parse HEAD) | cut -d / -f 3`
echo $BRANCH
echo -n "Branch 2 "
git log -n 1 --pretty=%d HEAD | awk '{print $2}' | sed 's/origin\///' | sed 's/)//'

Expand All @@ -19,11 +20,11 @@ if [ -f $FILENAME ]; then

# uploading file
HASH=`date +%s`
FILENAME_UNIQ="$APPCENTER_OUTPUT_DIRECTORY/$HASH.apk"
FILENAME_UNIQ="$APPCENTER_OUTPUT_DIRECTORY/$BRANCH-$HASH.apk"
cp "$FILENAME" "$FILENAME_UNIQ"
curl "http://filestorage.bluewallet.io:1488/upload.php" -F "fileToUpload=@$FILENAME_UNIQ"
rm "$FILENAME_UNIQ"
DLOAD_APK="http://filestorage.bluewallet.io:1488/$HASH.apk"
DLOAD_APK="http://filestorage.bluewallet.io:1488/$BRANCH-$HASH.apk"

curl -X POST --data "{\"body\":\"♫ This was a triumph. I'm making a note here: HUGE SUCCESS ♫\n\n [android in browser] $APPURL\n\n[download apk]($DLOAD_APK) \"}" -u "$GITHUB" "https://api.github.com/repos/BlueWallet/BlueWallet/issues/$PR/comments"
fi
36 changes: 18 additions & 18 deletions ios/BlueWallet.xcodeproj/project.pbxproj
View file
Expand Up @@ -1617,7 +1617,7 @@
"$(inherited)",
"$(PROJECT_DIR)",
);
MARKETING_VERSION = 6.0.3;
MARKETING_VERSION = 6.0.4;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -1660,7 +1660,7 @@
"$(inherited)",
"$(PROJECT_DIR)",
);
MARKETING_VERSION = 6.0.3;
MARKETING_VERSION = 6.0.4;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -1701,7 +1701,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 6.0.3;
MARKETING_VERSION = 6.0.4;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.TodayExtension;
Expand Down Expand Up @@ -1740,7 +1740,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 6.0.3;
MARKETING_VERSION = 6.0.4;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.TodayExtension;
PRODUCT_NAME = "BlueWallet - Bitcoin Price";
Expand Down Expand Up @@ -1772,7 +1772,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = Stickers/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MARKETING_VERSION = 6.0.3;
MARKETING_VERSION = 6.0.4;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.Stickers;
Expand Down Expand Up @@ -1803,7 +1803,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = Stickers/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MARKETING_VERSION = 6.0.3;
MARKETING_VERSION = 6.0.4;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.Stickers;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -1839,7 +1839,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 6.0.3;
MARKETING_VERSION = 6.0.4;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.PriceWidget;
Expand Down Expand Up @@ -1881,7 +1881,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 6.0.3;
MARKETING_VERSION = 6.0.4;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.PriceWidget;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -1921,7 +1921,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 6.0.3;
MARKETING_VERSION = 6.0.4;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.MarketWidget;
Expand Down Expand Up @@ -1964,7 +1964,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 6.0.3;
MARKETING_VERSION = 6.0.4;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.MarketWidget;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -2005,7 +2005,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 6.0.3;
MARKETING_VERSION = 6.0.4;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.WalletInformationAndMarketWidget;
Expand Down Expand Up @@ -2049,7 +2049,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 6.0.3;
MARKETING_VERSION = 6.0.4;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.WalletInformationAndMarketWidget;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -2090,7 +2090,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 6.0.3;
MARKETING_VERSION = 6.0.4;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.WalletInformationWidget;
Expand Down Expand Up @@ -2133,7 +2133,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 6.0.3;
MARKETING_VERSION = 6.0.4;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.WalletInformationWidget;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -2275,7 +2275,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 6.0.3;
MARKETING_VERSION = 6.0.4;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.watch.extension;
Expand Down Expand Up @@ -2315,7 +2315,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 6.0.3;
MARKETING_VERSION = 6.0.4;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.watch.extension;
PRODUCT_NAME = "${TARGET_NAME}";
Expand Down Expand Up @@ -2349,7 +2349,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
IBSC_MODULE = BlueWalletWatch_Extension;
INFOPLIST_FILE = BlueWalletWatch/Info.plist;
MARKETING_VERSION = 6.0.3;
MARKETING_VERSION = 6.0.4;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.watch;
Expand Down Expand Up @@ -2385,7 +2385,7 @@
GCC_C_LANGUAGE_STANDARD = gnu11;
IBSC_MODULE = BlueWalletWatch_Extension;
INFOPLIST_FILE = BlueWalletWatch/Info.plist;
MARKETING_VERSION = 6.0.3;
MARKETING_VERSION = 6.0.4;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.watch;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
33 changes: 19 additions & 14 deletions ios/fastlane/metadata/en-US/release_notes.txt
View file
@@ -1,3 +1,22 @@
v6.0.3
======

* DEL: Reset keychain after uninstall
* FIX: share panel bug when sharing multisig cosigner
* FIX: ask fp & path when scanning Zpub during multisig creation
* FIX: show spinner if multisig is trying to cosign external transaction
* FIX: disable RPC batching for Fulcrum electrum server
* FIX: Bug: when connected to custom Lndhub, create new ln wallet -> backup screen doesnt include this custom server
* FIX: coincontrol hangs (no connection on fetchUtxo)
* FIX: Scanning a Vault PSBT Qr code when scanning for a send address hangs the app
* FIX: alert no LN wallet
* FIX: Some devices wouldnt allow writing files when user requested
* FIX: Add wallet->set custom label->create multisig: label is not set to created wallet
* FIX: Wrong empty screen on LN #2456
* FIX: multisig coin control
* REF: Remove "new" from LocalTrader
* FIX: locales fr_FR, sl_SI, es_ES, ru, fa_IR, fi_FI

v6.0.2
======

Expand Down Expand Up @@ -68,17 +87,3 @@ v5.6.9
* REF: PSBT Multisig provide signature flow
* ADD: refresh wallet transactions for freshly imported wallets
* FIX: locales sl_SI, fi_FI


v5.6.8
======

* ADD: warning text on backup screen
* ADD: CoinControl displays balances with user's preferred unit
* ADD: LBP Currency
* FIX: fetch wallet transaction after broadcast
* FIX: crash on refresh button
* FIX: Don't display amount if none is passed
* REF: PSBT Multisig provide signature flow
* ADD: refresh wallet transactions for freshly imported wallets
* FIX: locales sl_SI, fi_FI
14 changes: 11 additions & 3 deletions loc/de_de.json
View file
Expand Up @@ -77,6 +77,7 @@
"local_trader": "Local Trader",
"local_trader_new": "Neu",
"login": "Login",
"logout": "Abmelden",
"mycont": "Meine Verträge",
"offer_accept": "Angebot annehmen",
"offer_account_finish": "Die Einrichtung Deines HodlHodl Konto scheint unvollständig. Möchtest Du die Einrichtung jetzt abschliessen?",
Expand Down Expand Up @@ -136,8 +137,9 @@
"ok": "Ja, ich habe sie aufgeschrieben!",
"ok_lnd": "Okay, ich habe sie gesichert.",
"text": "Nimm Dir Zeit die mnemonischen Wörter zur späteren Wiederherstellung des Wallets aufzuschreiben. Die Wörter sind dein einziges Backup im Fall eines Geräteverlustes.",
"text_lnd": "Bitte sichere die LNDHub-Authentifizierung. Die Sicherung ist erforderlich, damit Du das Wallet auf anderen Geräten wiederherstellen kannst.",
"title": "Ihr Wallet wird erstellt..."
"text_lnd": "Zur Wiederherstellung des Wallet im Verlustfall bitte dieses Wallet-Backup speichern. ",
"text_lnd2": "Diese Wallet wird durch BlueWallet verwaltet.",
"title": "Dein Wallet ist erstellt"
},
"receive": {
"details_create": "Erstelle",
Expand Down Expand Up @@ -447,6 +449,7 @@
},
"multisig": {
"multisig_vault": "Tresor",
"default_label": "Multisignatur Tresor",
"multisig_vault_explain": "Höchste Sicherheit für große Beträge",
"provide_signature": "Stell die Signatur bereit",
"vault_key": "Tresor-Schlüssel: {number}",
Expand All @@ -458,7 +461,9 @@
"share": "Teilen",
"view": "Anzeigen",
"manage_keys": "Schlüssel verwalten",
"how_many_signatures_can_bluewallet_make": "Erlaubte Anzahl an BlueWallet-Signaturen",
"how_many_signatures_can_bluewallet_make": "Anzahl Signaturen durch BlueWallet",
"signatures_required_to_spend": "Benötigte Signaturen {number}",
"signatures_we_can_make": "kann {number} machen",
"scan_or_import_file": "Datei scannen oder importieren",
"export_coordination_setup": "Koordinations-Setup exportieren",
"cosign_this_transaction": "Diese Transaktion teilsignieren?",
Expand All @@ -484,6 +489,7 @@
"view_key": "Anzeigen",
"invalid_mnemonics": "Ungültige mnemonische Phrase",
"invalid_cosigner": "Keine gültigen Daten des Mitsignierers",
"not_a_multisignature_xpub": "Dies ist keine xpub eines Multisignatur-Wallet!",
"invalid_cosigner_format": "Falscher Mitsignierer: Dies ist kein Mitsignierer für das Format {format} ",
"create_new_key": "Neuerstellen",
"scan_or_open_file": "Datei scannen oder öffnen",
Expand Down Expand Up @@ -530,8 +536,10 @@
"empty": "Dieses Wallet hat aktuell keine Münzen",
"freeze": "einfrieren",
"freezeLabel": "Einfrieren",
"freezeLabel_un": "Entblocken",
"header": "Münzenauswahl 'Coin control'",
"use_coin": "Münzen benutzen",
"use_coins": "Benutze Münzen",
"tip": "Wallet-Verwaltung zum Anzeigen, Beschriften, Einfrieren oder Auswählen von Münzen."
},
"units": {
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
@@ -1,6 +1,6 @@
{
"name": "bluewallet",
"version": "6.0.3",
"version": "6.0.4",
"license": "MIT",
"devDependencies": {
"@babel/core": "^7.10.4",
Expand Down

0 comments on commit b9c63cf

Please sign in to comment.