commit 6bfa209354131942906566b156a9084074bf1090
parent 544ffe4ec1ab451c2efa1d105ab9c2355ae665dd
Author: Sebastian <sebasjm@gmail.com>
Date: Thu, 6 Nov 2025 18:19:56 -0300
Merge branch 'release/1.1.x'
Diffstat:
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/contrib/next-dev-version.sh b/contrib/next-dev-version.sh
@@ -5,12 +5,13 @@ set -e
FILE=$1
[ ! -w "$FILE" ] && echo first argument should be a writtable file && exit 1
jq -e . $FILE >/dev/null 2>&1 || (echo $FILE should be a json file && exit 1)
+jq -e .version $FILE >/dev/null 2>&1 || (echo $FILE doesnt have a version field to increment && exit 1)
# looks for [string]-dev.[number]
-# if not present returns [string]-dev.1
-# else version = number +1 and returns [string]-dev.[version]
+# if not present returns [first].[second].[third+1]-dev.1
+# else returns [string]-dev.[version+1]
inc_version() {
- jq '. + {"version": (if .version | contains("-dev") then [.version | match("^(.*)-dev.([0-9]*)$").captures[].string] | .[0] + "-dev." + (.[1]|tonumber|.+1|tostring) else .version + "-dev.1" end)}'
+ jq '. + {"version": (if .version | contains("-dev") then [.version | match("^(.*)-dev.([0-9]*)$").captures[].string] | .[0] + "-dev." + (.[1]|tonumber|.+1|tostring) else [.version | match("^([0-9]*)\\.([0-9]*)\\.([0-9]*)$").captures[].string] | .[0] + "." + .[1] + "." + (.[2]|tonumber|.+1|tostring) + "-dev.1" end)}'
}
# read file
diff --git a/packages/merchant-backoffice-ui/src/components/form/InputPaytoForm.tsx b/packages/merchant-backoffice-ui/src/components/form/InputPaytoForm.tsx
@@ -467,7 +467,6 @@ export function InputPaytoForm<T>({
label={i18n.str`Name of the account holder`}
placeholder="John Doe"
tooltip={i18n.str`Legal name of the person holding the account.`}
- help={i18n.str`This supports Taler Revenue API then you can add the name of the bank account holder.`}
/>
</Fragment>
)}
diff --git a/packages/merchant-backoffice-ui/src/paths/login/index.tsx b/packages/merchant-backoffice-ui/src/paths/login/index.tsx
@@ -130,10 +130,6 @@ export function LoginPage({ showCreateAccount }: Props): VNode {
class="modal-card-body"
style={{ border: "1px solid", borderTop: 0, borderBottom: 0 }}
>
- <i18n.Translate>
- Please enter your password for <b>"{state.instance}"</b>.
- </i18n.Translate>
-
<div class="field is-horizontal">
<div class="field-label is-normal">
<label class="label">
