Skip to content

Commit

Permalink
Merge pull request fedimint#576 from Kodylow/fix-percent-error
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kodylow
Kodylow authored Nov 15, 2024
2 parents da3158b + 137e388 commit a67630b
Show file tree
Hide file tree
Showing 15 changed files with 39 additions and 15 deletions.
2 changes: 1 addition & 1 deletion apps/router/src/guardian-ui/components/setup/screens/roleSelector/RoleSelector.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export const RoleSelector = React.memo<Props>(function RoleSelector({
</AlertTitle>
<AlertDescription>
{t('role-selector.bitcoin-node.not-synced-description', {
progress: Math.round(Number(bitcoinStatus) * 100),
progress: bitcoinStatus,
})}
</AlertDescription>
</Box>
Expand Down
2 changes: 1 addition & 1 deletion .../router/src/guardian-ui/components/setup/screens/setConfiguration/BitcoinSettingsForm.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export const BitcoinSettingsForm: React.FC<BitcoinSettingsFormProps> = ({
</AlertTitle>
<AlertDescription>
{t('role-selector.bitcoin-node.not-synced-description', {
progress: typeof bitcoinStatus === 'number' ? bitcoinStatus * 100 : 0,
progress: bitcoinStatus,
})}
</AlertDescription>
</Box>
Expand Down
4 changes: 3 additions & 1 deletion apps/router/src/languages/ca.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,9 @@
},
"bitcoin-node": {
"not-synced": "Node de Bitcoin no està completament sincronitzat",
"not-synced-description": "El vostre node de Bitcoin està actualment sincronitzat al {{progress}}%. Heu d'esperar a la sincronització completa abans de continuar."
"not-synced-description": "El vostre node de Bitcoin està actualment sincronitzat al {{progress}}. Heu d'esperar a la sincronització completa abans de continuar.",
"error": "Error del Node de Bitcoin",
"error-description": "S'ha produït un error en connectar-se al vostre node de Bitcoin. Si us plau, comproveu la vostra configuració i torneu-ho a provar."
}
},
"run-dkg": {
Expand Down
4 changes: 3 additions & 1 deletion apps/router/src/languages/de.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,9 @@
},
"bitcoin-node": {
"not-synced": "Bitcoin-Knoten nicht vollständig synchronisiert",
"not-synced-description": "Ihr Bitcoin-Knotenpunkt ist derzeit zu {{progress}}% synchronisiert. Sie müssen auf die vollständige Synchronisation warten, bevor Sie fortfahren können."
"not-synced-description": "Ihr Bitcoin-Knotenpunkt ist derzeit zu {{progress}} synchronisiert. Sie müssen auf die vollständige Synchronisation warten, bevor Sie fortfahren können.",
"error": "Bitcoin Node Fehler",
"error-description": "Es gab einen Fehler bei der Verbindung zu Ihrem Bitcoin-Knoten. Bitte überprüfen Sie Ihre Konfiguration und versuchen Sie es erneut."
}
},
"run-dkg": {
Expand Down
4 changes: 3 additions & 1 deletion apps/router/src/languages/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,9 @@
},
"bitcoin-node": {
"not-synced": "Bitcoin Node Not Fully Synced",
"not-synced-description": "Your Bitcoin node is currently {{progress}}% synced. You must wait for full synchronization before proceeding."
"not-synced-description": "Your Bitcoin node is currently {{progress}} synced. You must wait for full synchronization before proceeding.",
"error": "Bitcoin Node Error",
"error-description": "There was an error connecting to your Bitcoin node. Please check your configuration and try again."
}
},
"run-dkg": {
Expand Down
4 changes: 3 additions & 1 deletion apps/router/src/languages/es.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,9 @@
},
"bitcoin-node": {
"not-synced": "Nodo de Bitcoin no completamente sincronizado",
"not-synced-description": "Tu nodo de Bitcoin está actualmente sincronizado al {{progress}}%. Debes esperar a la sincronización completa antes de continuar."
"not-synced-description": "Tu nodo de Bitcoin está actualmente sincronizado al {{progress}}. Debes esperar a la sincronización completa antes de continuar.",
"error": "Error de Nodo Bitcoin",
"error-description": "Hubo un error al conectar con tu nodo de Bitcoin. Por favor, revisa tu configuración e intenta de nuevo."
}
},
"run-dkg": {
Expand Down
4 changes: 3 additions & 1 deletion apps/router/src/languages/fr.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,9 @@
},
"bitcoin-node": {
"not-synced": "Nœud Bitcoin pas entièrement synchronisé",
"not-synced-description": "Votre nœud Bitcoin est actuellement synchronisé à {{progress}}%. Vous devez attendre la synchronisation complète avant de continuer."
"not-synced-description": "Votre nœud Bitcoin est actuellement synchronisé à {{progress}}. Vous devez attendre la synchronisation complète avant de continuer.",
"error": "Erreur de nœud Bitcoin",
"error-description": "Il y a eu une erreur de connexion à votre nœud Bitcoin. Veuillez vérifier votre configuration et réessayer."
}
},
"run-dkg": {
Expand Down
4 changes: 3 additions & 1 deletion apps/router/src/languages/hu.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,9 @@
},
"bitcoin-node": {
"not-synced": "A Bitcoin csomópont nincs teljesen szinkronizálva",
"not-synced-description": "A Bitcoin csomópontja jelenleg {{progress}}% -ban szinkronizált. Teljes szinkronizációra kell várnia a folytatás előtt."
"not-synced-description": "A Bitcoin csomópontja jelenleg {{progress}}-ban szinkronizált. Teljes szinkronizációra kell várnia a folytatás előtt.",
"error": "Bitcoin csomópont hiba",
"error-description": "Hiba történt a Bitcoin csomópontodhoz való csatlakozás során. Kérjük, ellenőrizze a konfigurációját, és próbálja újra."
}
},
"run-dkg": {
Expand Down
4 changes: 3 additions & 1 deletion apps/router/src/languages/it.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,9 @@
},
"bitcoin-node": {
"not-synced": "Nodo Bitcoin non completamente sincronizzato",
"not-synced-description": "Il tuo nodo Bitcoin è attualmente sincronizzato al {{progress}}%. Devi aspettare la completa sincronizzazione prima di procedere."
"not-synced-description": "Il tuo nodo Bitcoin è attualmente sincronizzato al {{progress}}. Devi aspettare la completa sincronizzazione prima di procedere.",
"error": "Errore del Nodo Bitcoin",
"error-description": "C'è stato un errore nel collegamento al tuo nodo Bitcoin. Controlla la tua configurazione e prova di nuovo."
}
},
"run-dkg": {
Expand Down
4 changes: 3 additions & 1 deletion apps/router/src/languages/ja.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,9 @@
},
"bitcoin-node": {
"not-synced": "Bitcoinノードが完全に同期されていません",
"not-synced-description": "あなたのビットコインノードは現在{{progress}}％同期されています。完全に同期が完了するまで待つ必要があります。"
"not-synced-description": "あなたのビットコインノードは現在{{progress}}同期されています。完全に同期が完了するまで待つ必要があります。",
"error": "ビットコインノードエラー",
"error-description": "あなたのビットコインノードへの接続中にエラーが発生しました。設定を確認して、再度お試しください。"
}
},
"run-dkg": {
Expand Down
4 changes: 3 additions & 1 deletion apps/router/src/languages/ko.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,9 @@
},
"bitcoin-node": {
"not-synced": "비트코인 노드가 완전히 동기화되지 않았습니다",
"not-synced-description": "당신의 비트코인 노드는 현재 {{progress}}% 동기화되었습니다. 진행하기 전에 완전한 동기화를 기다려야 합니다."
"not-synced-description": "당신의 비트코인 노드는 현재 {{progress}} 동기화되었습니다. 진행하기 전에 완전한 동기화를 기다려야 합니다.",
"error": "비트코인 노드 오류",
"error-description": "비트코인 노드에 연결하는 중 오류가 발생했습니다. 구성을 확인하고 다시 시도해 주세요."
}
},
"run-dkg": {
Expand Down
4 changes: 3 additions & 1 deletion apps/router/src/languages/pt.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,9 @@
},
"bitcoin-node": {
"not-synced": "Nó Bitcoin Não Sincronizado Completamente",
"not-synced-description": "Seu nó Bitcoin está atualmente sincronizado em {{progress}}%. Você deve esperar pela sincronização completa antes de prosseguir."
"not-synced-description": "Seu nó Bitcoin está atualmente sincronizado em {{progress}}. Você deve esperar pela sincronização completa antes de prosseguir.",
"error": "Erro do Nó Bitcoin",
"error-description": "Ocorreu um erro ao conectar ao seu nó Bitcoin. Por favor, verifique sua configuração e tente novamente."
}
},
"run-dkg": {
Expand Down
4 changes: 3 additions & 1 deletion apps/router/src/languages/ru.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,9 @@
},
"bitcoin-node": {
"not-synced": "Узел Bitcoin не полностью синхронизирован",
"not-synced-description": "Ваш узел Bitcoin в настоящее время синхронизирован на {{progress}}%. Вы должны дождаться полной синхронизации, прежде чем продолжить."
"not-synced-description": "Ваш узел Bitcoin в настоящее время синхронизирован на {{progress}}. Вы должны дождаться полной синхронизации, прежде чем продолжить.",
"error": "Ошибка узла Bitcoin",
"error-description": "Произошла ошибка при подключении к вашему узлу Bitcoin. Пожалуйста, проверьте вашу конфигурацию и попробуйте снова."
}
},
"run-dkg": {
Expand Down
4 changes: 3 additions & 1 deletion apps/router/src/languages/zh.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,9 @@
},
"bitcoin-node": {
"not-synced": "比特币节点未完全同步",
"not-synced-description": "您的比特币节点目前已同步{{progress}}%。在进行下一步操作之前，您必须等待完全同步。"
"not-synced-description": "您的比特币节点目前已同步{{progress}}。在进行下一步操作之前，您必须等待完全同步。",
"error": "比特币节点错误",
"error-description": "连接到您的比特币节点时出现错误。请检查您的配置并再试一次。"
}
},
"run-dkg": {
Expand Down
2 changes: 1 addition & 1 deletion packages/types/src/bitcoin.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ export class Bip21Uri {
}
}

export type BitcoinRpcConnectionStatus = 'Synced' | number;
export type BitcoinRpcConnectionStatus = 'Synced' | string;

0 comments on commit a67630b

Please sign in to comment.