From 4c5a2cf01f321d5bde9996f21fbfb40a540f3012 Mon Sep 17 00:00:00 2001 From: Saksham Gupta <90046016+0xSaksham@users.noreply.github.com> Date: Tue, 2 Jul 2024 15:56:52 +0530 Subject: [PATCH 1/3] ui: add Right Caret icon to Start Scheduler button (#783) --- src/components/Jam.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/Jam.tsx b/src/components/Jam.tsx index de067a9c..ddc07d92 100644 --- a/src/components/Jam.tsx +++ b/src/components/Jam.tsx @@ -65,6 +65,7 @@ const addressValueKeys = (addressCount: number) => const isValidAddress = (candidate: any) => { return typeof candidate === 'string' && candidate !== '' } + const isAddressReused = ( walletInfo: WalletInfo, destination: Api.BitcoinAddress, @@ -341,7 +342,6 @@ export default function Jam({ wallet }: JamProps) { <> {alert && {alert.message}} - {isLoading || !serviceInfo || !walletInfo || isWaitingSchedulerStart || isWaitingSchedulerStop ? ( @@ -545,6 +545,7 @@ export default function Jam({ wallet }: JamProps) { >
{t('scheduler.button_start')} +
From da8b0a908e6da44017f6ee59bdfe81381d212b14 Mon Sep 17 00:00:00 2001 From: Thebora Kompanioni Date: Thu, 4 Jul 2024 22:19:23 +0200 Subject: [PATCH 2/3] dev(setup): switch to docker compose v2 (#784) * dev(setup): switch to docker compose v2 * dev(setup): remove deprecated version property from docker files --- docker/regtest/docker-compose-common.yml | 1 - docker/regtest/docker-compose.yml | 1 - docker/regtest/prepare-setup.sh | 4 ++-- package.json | 8 ++++---- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/docker/regtest/docker-compose-common.yml b/docker/regtest/docker-compose-common.yml index fa0acb22..aed7b682 100644 --- a/docker/regtest/docker-compose-common.yml +++ b/docker/regtest/docker-compose-common.yml @@ -1,4 +1,3 @@ -version: "3" services: diff --git a/docker/regtest/docker-compose.yml b/docker/regtest/docker-compose.yml index cf5e6503..f6becb41 100644 --- a/docker/regtest/docker-compose.yml +++ b/docker/regtest/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3" services: diff --git a/docker/regtest/prepare-setup.sh b/docker/regtest/prepare-setup.sh index 10746851..3d51c88a 100755 --- a/docker/regtest/prepare-setup.sh +++ b/docker/regtest/prepare-setup.sh @@ -5,10 +5,10 @@ # This script prepares the regtest environment. # # The output of this script is a ".env.generated" file -# to be used in when running docker-compose. +# to be used in when running `docker compose`. # e.g. # ``` -# docker-compose --env-file .env.generated --file docker-compose.yml up +# docker compose --env-file .env.generated --file docker-compose.yml up # ``` # ### diff --git a/package.json b/package.json index f10472f4..2a23842d 100644 --- a/package.json +++ b/package.json @@ -58,11 +58,11 @@ "format": "prettier --write --no-error-on-unmatched-pattern 'src/**/*.{js,jsx,ts,tsx,json,css,md}'", "version": "node scripts/changelog.mjs && git checkout -b \"prepare-v${npm_package_version}-$(date +%s)\" && git add --all && git commit --message \"chore(release): v${npm_package_version}\" && git push --set-upstream origin $(git branch --show-current)", "postversion": "which gh && gh pr create --title \"chore(release): v${npm_package_version}\" --body \"Prepares the v${npm_package_version} release.\" --assignee @me --label release --repo joinmarket-webui/jam --draft", - "regtest:build": "npm run regtest:clear && docker-compose --env-file docker/regtest/.env.example --file docker/regtest/docker-compose.yml build --pull", + "regtest:build": "npm run regtest:clear && docker compose --env-file docker/regtest/.env.example --file docker/regtest/docker-compose.yml build --pull", "regtest:rebuild": "npm run regtest:build -- --no-cache", - "regtest:clear": "docker-compose --env-file docker/regtest/.env.example --file docker/regtest/docker-compose.yml down --volumes --remove-orphans", - "regtest:up": "./docker/regtest/prepare-setup.sh && docker-compose --env-file docker/regtest/.env.generated --file docker/regtest/docker-compose.yml up", - "regtest:down": "docker-compose --env-file docker/regtest/.env.example --file docker/regtest/docker-compose.yml down", + "regtest:clear": "docker compose --env-file docker/regtest/.env.example --file docker/regtest/docker-compose.yml down --volumes --remove-orphans", + "regtest:up": "./docker/regtest/prepare-setup.sh && docker compose --env-file docker/regtest/.env.generated --file docker/regtest/docker-compose.yml up", + "regtest:down": "docker compose --env-file docker/regtest/.env.example --file docker/regtest/docker-compose.yml down", "regtest:logs:jmwalletd": "docker exec -t jm_regtest_joinmarket tail -f /var/log/jam/jmwalletd_stdout.log", "regtest:logs:schedule": "docker exec -t jm_regtest_joinmarket tail -f /root/.joinmarket/logs/TUMBLE.schedule", "regtest:logs:directory_node": "docker exec -t jm_regtest_joinmarket_directory_node tail -f /var/log/jam/directory_node_stdout.log -n 200", From 4a5bf207be9cb506cbd8ba5e6a52aa9ff5398ca6 Mon Sep 17 00:00:00 2001 From: Saksham Gupta <90046016+0xSaksham@users.noreply.github.com> Date: Sat, 6 Jul 2024 13:13:32 +0530 Subject: [PATCH 3/3] ui: remove twitter link from settings page (#790) * Unused Twitter Link Remove from Settings Page * Removed settings.jam_twitter from translation.json * Removed jam_twitter from all translation.json --- src/components/Settings.tsx | 6 ------ src/i18n/locales/de/translation.json | 1 - src/i18n/locales/en/translation.json | 1 - src/i18n/locales/fr/translation.json | 1 - src/i18n/locales/it/translation.json | 1 - src/i18n/locales/pt_BR/translation.json | 1 - src/i18n/locales/zh_Hans/translation.json | 1 - src/i18n/locales/zh_Hant/translation.json | 1 - 8 files changed, 13 deletions(-) diff --git a/src/components/Settings.tsx b/src/components/Settings.tsx index 7ff18bd5..d570a642 100644 --- a/src/components/Settings.tsx +++ b/src/components/Settings.tsx @@ -256,12 +256,6 @@ export default function Settings({ wallet, stopWallet }: SettingsProps) { {t('settings.telegram')} - -
- - {t('settings.jam_twitter')} -
-
diff --git a/src/i18n/locales/de/translation.json b/src/i18n/locales/de/translation.json index daa12f7b..f4a704a3 100644 --- a/src/i18n/locales/de/translation.json +++ b/src/i18n/locales/de/translation.json @@ -222,7 +222,6 @@ "matrix": "Matrix", "telegram": "Telegram", "jm_twitter": "JoinMarket Twitter", - "jam_twitter": "Jam Twitter", "confirm_locking_modal_title": "Wallet sperren", "confirm_locking_modal_body_earn": "Earn Modus aktiv. Das Sperren der Wallet wird diesen Modus beenden. Du kannst das Browserfenster schließen und Jam im Hintergrund weiterlaufen lassen. ", "confirm_locking_modal_body_jam": "Eine gemeinschaftliche Transaktion ist derzeit im Gange. Das Sperren der Wallet wird diese beenden. Du kannst das Browserfenster schließen und Jam im Hintergrund weiterlaufen lassen. ", diff --git a/src/i18n/locales/en/translation.json b/src/i18n/locales/en/translation.json index 18e909ef..1657b000 100644 --- a/src/i18n/locales/en/translation.json +++ b/src/i18n/locales/en/translation.json @@ -233,7 +233,6 @@ "matrix": "Matrix", "telegram": "Telegram", "jm_twitter": "JoinMarket Twitter", - "jam_twitter": "Jam Twitter", "confirm_locking_modal_title": "Lock Wallet", "confirm_locking_modal_body_earn": "Earn is active. Locking the wallet will stop the service. You can close the browser window to let it run in the background.", "confirm_locking_modal_body_jam": "A collaborative transaction is being executed. Locking the wallet will stop the service. You can close the browser window to let it run in the background.", diff --git a/src/i18n/locales/fr/translation.json b/src/i18n/locales/fr/translation.json index 117c1140..d171cdc9 100644 --- a/src/i18n/locales/fr/translation.json +++ b/src/i18n/locales/fr/translation.json @@ -166,7 +166,6 @@ "matrix": "Matrix", "telegram": "Telegram", "jm_twitter": "JoinMarket Twitter", - "jam_twitter": "Jam Twitter", "confirm_locking_modal_title": "Verrouiller le Portefeuille", "fees": { "text_button_cancel": "Annuler", diff --git a/src/i18n/locales/it/translation.json b/src/i18n/locales/it/translation.json index 5bc2166f..ef34c739 100644 --- a/src/i18n/locales/it/translation.json +++ b/src/i18n/locales/it/translation.json @@ -186,7 +186,6 @@ "matrix": "Matrix", "telegram": "Telegram", "jm_twitter": "JoinMarket Twitter", - "jam_twitter": "Jam Twitter", "confirm_locking_modal_title": "Blocca portafoglio", "confirm_locking_modal_body_earn": "La funzione Guadagna è attiva. Il blocco del portafoglio interromperà il servizio. È possibile chiudere la finestra del browser per lasciarlo funzionare in background.", "confirm_locking_modal_body_jam": "È in corso l'esecuzione di una transazione collaborativa. Bloccando il portafoglio si interromperà il servizio. È possibile chiudere la finestra del browser per lasciarlo funzionare in background.", diff --git a/src/i18n/locales/pt_BR/translation.json b/src/i18n/locales/pt_BR/translation.json index 8166c6a4..e4f701bc 100644 --- a/src/i18n/locales/pt_BR/translation.json +++ b/src/i18n/locales/pt_BR/translation.json @@ -186,7 +186,6 @@ "matrix": "Matrix", "telegram": "Telegram", "jm_twitter": "JoinMarket no Twitter", - "jam_twitter": "Jam no Twitter", "confirm_locking_modal_title": "Trancar Carteira", "confirm_locking_modal_body_earn": "'Lucrar' está ativo. Bloquear a carteira interromperá o serviço. Você pode fechar a janela do navegador para deixá-lo rodar em segundo plano.", "confirm_locking_modal_body_jam": "Uma transação colaborativa está sendo executada. Bloquear a carteira interromperá o serviço. Você pode fechar a janela do navegador para deixá-lo rodar em segundo plano.", diff --git a/src/i18n/locales/zh_Hans/translation.json b/src/i18n/locales/zh_Hans/translation.json index 398e54d0..1ad7cd35 100644 --- a/src/i18n/locales/zh_Hans/translation.json +++ b/src/i18n/locales/zh_Hans/translation.json @@ -222,7 +222,6 @@ "matrix": "Matrix", "telegram": "Telegram", "jm_twitter": "JoinMarket 推特", - "jam_twitter": "Jam 推特", "confirm_locking_modal_title": "锁上钱包", "confirm_locking_modal_body_earn": "收益处于活跃状态。钱包上锁将停止服务。你可以关闭浏览器窗口并让它在背景中运行。", "confirm_locking_modal_body_jam": "协作式交易正在进行中。钱包上锁将停止服务。你可以关闭浏览器窗口并让它在背景中运行。", diff --git a/src/i18n/locales/zh_Hant/translation.json b/src/i18n/locales/zh_Hant/translation.json index 2af6771d..5f70b5b1 100644 --- a/src/i18n/locales/zh_Hant/translation.json +++ b/src/i18n/locales/zh_Hant/translation.json @@ -222,7 +222,6 @@ "matrix": "Matrix", "telegram": "Telegram", "jm_twitter": "JoinMarket 推特", - "jam_twitter": "Jam 推特", "confirm_locking_modal_title": "鎖上錢包", "confirm_locking_modal_body_earn": "收益處於活躍狀態。錢包上鎖將停止服務。你可以關閉瀏覽器窗口並讓它在背景中運行。", "confirm_locking_modal_body_jam": "協作式交易正在進行中。錢包上鎖將停止服務。你可以關閉瀏覽器窗口並讓它在背景中運行。",