Merge branch 'joinmarket-webui:master' into epic/redesign

joinmarket-webui · Jul 7, 2024 · ccf1e9a · ccf1e9a
2 parents bf25a49 + 4a5bf20
commit ccf1e9a
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 22 deletions.
diff --git 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
@@ -1,4 +1,3 @@
-version: "3"
 
 services:
 

diff --git 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
@@ -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",

diff --git 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) {
     <>
       <PageTitle title={t('scheduler.title')} subtitle={t('scheduler.subtitle')} />
       {alert && <rb.Alert variant={alert.variant}>{alert.message}</rb.Alert>}
-
       {isLoading || !serviceInfo || !walletInfo || isWaitingSchedulerStart || isWaitingSchedulerStop ? (
         <rb.Placeholder as="div" animation="wave">
           <rb.Placeholder xs={12} className={styles['input-loader']} />
@@ -545,6 +545,7 @@ export default function Jam({ wallet }: JamProps) {
                           >
                             <div className="d-flex justify-content-center align-items-center">
                               {t('scheduler.button_start')}
+                              <Sprite symbol="caret-right" width="24" height="24" className="ms-1" />
                             </div>
                           </rb.Button>
                         </rb.Form>

diff --git a/src/components/Settings.tsx b/src/components/Settings.tsx
@@ -256,12 +256,6 @@ export default function Settings({ wallet, stopWallet }: SettingsProps) {
               {t('settings.telegram')}
             </div>
           </a>
-          <a href="https://twitter.com/jamapporg" target="_blank" rel="noopener noreferrer" className="link-dark">
-            <div className="d-flex align-items-center">
-              <Sprite symbol="twitter" width="24" height="24" className="me-2 p-1" />
-              {t('settings.jam_twitter')}
-            </div>
-          </a>
           <a href="https://twitter.com/joinmarket" target="_blank" rel="noopener noreferrer" className="link-dark">
             <div className="d-flex align-items-center">
               <Sprite symbol="twitter" width="24" height="24" className="me-2 p-1" />

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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": "協作式交易正在進行中。錢包上鎖將停止服務。你可以關閉瀏覽器窗口並讓它在背景中運行。",