diff --git a/src/components/mobile/TransactionTagSelectionSheet.vue b/src/components/mobile/TransactionTagSelectionSheet.vue index 68e419e1..ba4933dc 100644 --- a/src/components/mobile/TransactionTagSelectionSheet.vue +++ b/src/components/mobile/TransactionTagSelectionSheet.vue @@ -5,17 +5,17 @@
- +
- + + :text="tt('Add')" v-if="!allTags || !allTags.length || noAvailableTag" @click="addNewTag">
- + - @@ -49,7 +49,7 @@
@@ -75,131 +75,126 @@ - diff --git a/src/lib/common.ts b/src/lib/common.ts index 243accf5..7e6b8a2f 100644 --- a/src/lib/common.ts +++ b/src/lib/common.ts @@ -394,7 +394,7 @@ export function copyObjectTo(fromObject: Record | undefined, to return (toObject as Record); } -export function copyArrayTo(fromArray: unknown[], toArray: unknown[]): unknown[] { +export function copyArrayTo(fromArray: T[], toArray: T[]): T[] { if (!isArray(fromArray)) { return toArray; } @@ -410,9 +410,9 @@ export function copyArrayTo(fromArray: unknown[], toArray: unknown[]): unknown[] const toValue = toArray[i]; if (isArray(fromValue)) { - toArray[i] = copyArrayTo(fromValue as unknown[], toValue as unknown[]); + toArray[i] = copyArrayTo(fromValue as unknown[], toValue as unknown[]) as T; } else if (isObject(fromValue)) { - toArray[i] = copyObjectTo(fromValue as Record, toValue as Record); + toArray[i] = copyObjectTo(fromValue as Record, toValue as Record) as T; } else { if (fromValue !== toValue) { toArray[i] = fromValue; @@ -420,9 +420,9 @@ export function copyArrayTo(fromArray: unknown[], toArray: unknown[]): unknown[] } } else { if (isArray(fromValue)) { - toArray.push(copyArrayTo(fromValue as unknown[], [])); + toArray.push(copyArrayTo(fromValue as unknown[], []) as T); } else if (isObject(fromValue)) { - toArray.push(copyObjectTo(fromValue as Record, {})); + toArray.push(copyObjectTo(fromValue as Record, {}) as T); } else { toArray.push(fromValue); } diff --git a/src/lib/ui/mobile.ts b/src/lib/ui/mobile.ts index 376b4f0c..3bed4fb8 100644 --- a/src/lib/ui/mobile.ts +++ b/src/lib/ui/mobile.ts @@ -66,7 +66,7 @@ export function showToast(message: string, timeout: number | undefined, translat }); } -export function showLoading(delayConditionFunc: () => boolean, delayMills: number): void { +export function showLoading(delayConditionFunc?: () => boolean, delayMills?: number): void { if (!delayConditionFunc) { f7ready((f7) => { return f7.preloader.show();