Skip to content

Commit 0b23222

Browse files
committed
Merge remote-tracking branch 'origin/stable'
To mainly bring the SAI use telemetry. # Conflicts: # src/GWallet.Backend/Account.fs
2 parents b0f066b + ae9f2a6 commit 0b23222

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

configure.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUNNER_ARG=invalid
77
REPL_CHECK_MSG="checking for a working F# REPL..."
88

99
if which dotnet >/dev/null 2>&1; then
10-
echo "$REPL_CHECK_MSG" $'found'
10+
echo -n "$REPL_CHECK_MSG"
1111
RUNNER_BIN=dotnet
1212
RUNNER_ARG=fsi
1313
else
@@ -32,10 +32,10 @@ else
3232
if ! which fsx >/dev/null 2>&1; then
3333
echo "$FSX_CHECK_MSG" $'not found\n'
3434

35-
echo "$0" $'failed, please install "fsharpi" or "fsx" first'
35+
echo "$0" $'failed, please install "dotnet" first'
3636
exit 1
3737
else
38-
echo "$FSX_CHECK_MSG" $'found'
38+
echo -n "$FSX_CHECK_MSG"
3939
RUNNER_BIN=fsx
4040
RUNNER_ARG=
4141
fi
@@ -53,11 +53,11 @@ else
5353
cd scripts/fsx && ./configure.sh --prefix=$BIN_DIR && make install && cd ../..
5454
RUNNER_BIN="$BIN_DIR/bin/fsx"
5555
else
56-
echo "$FSX_CHECK_MSG" $'found'
56+
echo -n "$FSX_CHECK_MSG"
5757
RUNNER_BIN=fsx
5858
fi
5959
else
60-
echo "$REPL_CHECK_MSG" $'found'
60+
echo -n "$REPL_CHECK_MSG"
6161
RUNNER_BIN=fsharpi
6262
RUNNER_ARG="--define:LEGACY_FRAMEWORK"
6363
fi
@@ -73,4 +73,4 @@ if [ ! -z "${RUNNER_ARG}" ]; then
7373
echo -e "FsxRunnerArg=$RUNNER_ARG" >> scripts/build.config
7474
fi
7575
source scripts/build.config
76-
$RUNNER_BIN $RUNNER_ARG ./scripts/configure.fsx "$@"
76+
DOTNET_NOLOGO=true $RUNNER_BIN $RUNNER_ARG ./scripts/configure.fsx "$@"

scripts/configure.fsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ let buildTool, legacyBuildTool, areGtkLibsAbsentOrDoesNotApply =
4040
dotnetCmd, msbuildCmd, true
4141
| platform (* Unix *) ->
4242

43+
// because it comes from configure.sh's "Checking for a working F# REPL..."
44+
Console.WriteLine " found"
45+
4346
Process.ConfigCommandCheck ["make"] true true |> ignore
4447

4548
match Process.ConfigCommandCheck ["mono"] false true with

src/GWallet.Backend/Account.fs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,13 @@ module Account =
5050
| None ->
5151
let cachedBalance = Caching.Instance.RetrieveLastCompoundBalance account.PublicAddress account.Currency
5252
return (NotFresh cachedBalance, None)
53+
5354
| Some (balance,imminentIncomingPayment) ->
55+
56+
if account.Currency = Currency.SAI && balance > 0m then
57+
Infrastructure.ReportWarningMessage ("Some user is still using SAI (informative telemetry to avoid phasing out this currency too early)")
58+
|> ignore<bool>
59+
5460
let compoundBalance,_ =
5561
Caching.Instance.RetrieveAndUpdateLastCompoundBalance account.PublicAddress
5662
account.Currency

0 commit comments

Comments
 (0)