Verified Commit 3299a51d authored by Sarath's avatar Sarath
Browse files

Merge remote-tracking branch 'gitlab/staging' into staging

parents 4ab4aca4 9753adf6
......@@ -67,9 +67,9 @@ android {
minSdkVersion 21
targetSdkVersion 30
versionCode 183
versionName "0.99.96i"
versionName "0.99.96j"
resValue "string", "app_name", "Samourai Staging"
resValue "string", "version_name", "0.99.96i"
resValue "string", "version_name", "0.99.96j"
}
}
testOptions {
......
......@@ -216,16 +216,16 @@ class RestoreOptionActivity : AppCompatActivity() {
private fun doSupportCreate() {
val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://samourai.kayako.com/section/1-starting-a-new-wallet"))
val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://docs.samourai.io/wallet/start#create-new-wallet"))
startActivity(intent)
}
private fun doSupportRestore() {
val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://samourai.kayako.com/category/3-restore-recovery"))
val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://docs.samourai.io/wallet/restore-recovery"))
startActivity(intent)
}
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
menuInflater.inflate(R.menu.landing_activity_menu, menu)
return true
}
}
\ No newline at end of file
}
......@@ -1680,7 +1680,11 @@ public class SendActivity extends SamouraiActivity {
message = strCannotDoBoltzmann + strPrivacyWarning + "Send " + FormatsUtil.formatBTCWithoutUnit(amount) + " to " + dest + " (fee:" + FormatsUtil.formatBTCWithoutUnit(_fee.longValue()) + ")?\n";
if (selectedCahootsType == SelectCahootsType.type.NONE) {
tvTotalFee.setText(FormatsUtil.formatBTC(fee.longValue()));
boolean is_sat_prefs = PrefsUtil.getInstance(SendActivity.this).getValue(PrefsUtil.IS_SAT, true);
if (is_sat_prefs)
tvTotalFee.setText(FormatsUtil.formatSats(fee.longValue())+"s");
else
tvTotalFee.setText(FormatsUtil.formatBTC(fee.longValue()));
calculateTransactionSize(_fee);
} else {
tvTotalFee.setText("__");
......
......@@ -62,13 +62,10 @@ class SorobanMeetingListenActivity : SamouraiActivity() {
showSorobanRequest(cahootsRequest)
}) { error: Throwable ->
Log.i(TAG, "Error: " + error.message)
error.message?.let {
if (it.contains("aborting")) {
menu?.findItem(R.id.action_refresh)?.isVisible = true
progressLoader.visibility = View.GONE
loaderText.text = getString(R.string.no_cahoots_detected)
}
}
// show refresh button on any error
menu?.findItem(R.id.action_refresh)?.isVisible = true
progressLoader.visibility = View.GONE
loaderText.text = getString(R.string.no_cahoots_detected)
Toast.makeText(this, "${error.message}", Toast.LENGTH_SHORT).show()
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment