+
{t("no_transactions")}
) : ( @@ -87,8 +87,8 @@ export default function TransactionsTable({ className={classNames( "text-sm", type == "incoming" - ? "text-green-600 dark:color-green-400" - : "text-orange-600 dark:color-orange-400" + ? "text-green-600 dark:text-emerald-500" + : "text-orange-600 dark:text-amber-600" )} > {type == "outgoing" ? "-" : "+"}{" "} diff --git a/src/extension/background-script/connectors/lnd.ts b/src/extension/background-script/connectors/lnd.ts index 75f376b3a8..f9fef3e3a3 100644 --- a/src/extension/background-script/connectors/lnd.ts +++ b/src/extension/background-script/connectors/lnd.ts @@ -277,11 +277,12 @@ class Lnd implements Connector { if (data.payment_error) { throw new Error(data.payment_error); } + const { total_amt, total_fees } = data.payment_route; return { data: { preimage: utils.base64ToHex(data.payment_preimage), paymentHash: utils.base64ToHex(data.payment_hash), - route: data.payment_route, + route: { total_amt: total_amt - total_fees, total_fees }, }, }; }); diff --git a/src/extension/background-script/connectors/nwc.ts b/src/extension/background-script/connectors/nwc.ts index edc5a592a6..e70aaaaabe 100644 --- a/src/extension/background-script/connectors/nwc.ts +++ b/src/extension/background-script/connectors/nwc.ts @@ -163,7 +163,9 @@ class NWCConnector implements Connector { const data = await this.nwc.payKeysend({ pubkey: args.pubkey, amount: args.amount * 1000, - tlv_records: this.customRecordsToTlv(args.customRecords), + ...(args.customRecords && { + tlv_records: this.customRecordsToTlv(args.customRecords), + }), }); const paymentHash = SHA256(data.preimage).toString(Hex); diff --git a/src/extension/background-script/events/notifications.ts b/src/extension/background-script/events/notifications.ts index e23f936c79..631124be9a 100644 --- a/src/extension/background-script/events/notifications.ts +++ b/src/extension/background-script/events/notifications.ts @@ -22,7 +22,7 @@ const paymentSuccessNotification = async ( const route = paymentResponseData?.data.route; const { total_amt, total_fees } = route; - const paymentAmount = total_amt - total_fees; + const paymentAmount = total_amt; const { settings } = state.getState(); const { showFiat, currency, locale } = settings; diff --git a/src/i18n/locales/bg/translation.json b/src/i18n/locales/bg/translation.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/src/i18n/locales/bg/translation.json @@ -0,0 +1 @@ +{} diff --git a/src/i18n/locales/id/translation.json b/src/i18n/locales/id/translation.json index d114d8aa5d..18299cb1f3 100644 --- a/src/i18n/locales/id/translation.json +++ b/src/i18n/locales/id/translation.json @@ -12,7 +12,9 @@ "enter_password": "Mohon masukan kode sandi.", "confirm_password": "Mohon konfirmasi kode sandi Anda.", "mismatched_password": "Kode sandi tidak sama." - } + }, + "title": "Atur kode sandi ekstensi", + "description1": "Atur kode sandi untuk membuka ekstensi Alby pada peramban ini" }, "test_connection": { "initializing": "Menginisialisasi akun Anda. Mohon tunggu, ini mungkin akan memakan waktu beberapa menit...", diff --git a/src/i18n/locales/pt_BR/translation.json b/src/i18n/locales/pt_BR/translation.json index 57e0185af6..df355aede3 100644 --- a/src/i18n/locales/pt_BR/translation.json +++ b/src/i18n/locales/pt_BR/translation.json @@ -579,7 +579,7 @@ "subtitle": "Exibe no navegador notificações da Alby relacionadas a pagamentos e autenticação.", "title": "Notificações do navegador" }, - "title": "Configurações da extensão", + "title": "Configurações", "general": { "title": "Geral" }, @@ -744,8 +744,18 @@ }, "30023": { "title": "nota longa" + }, + "7": { + "title": "reagir" + }, + "22242": { + "title": "autenticar" + }, + "10002": { + "title": "atualizar relays" } - } + }, + "allow": "Permitir {{publisher}} {{action}}" }, "confirm_request_permission": { "title": "Aprovar solicitação", @@ -755,11 +765,19 @@ "choose_path": { "alby": { "title": "Conta Alby", - "point1": "Necessita de convite para criar conta" + "point1": "Nova carteira com autocustódia — <0>Alby Hub", + "connect": "Conecte-se com a Alby", + "point3": "Necessita de convite para criar conta", + "point2": "Endereço relâmpago e nostr exclusivos", + "description": "Ideal para iniciantes que procuram uma ótima carteira para gastos do dia a dia." }, "other": { "title": "Outras carteiras", - "point1": "Acesso instantâneo, não precisa de convite" + "point1": "Opções de autocustódia e custódia delegada", + "connect": "Escolher carteira", + "point2": "Sem endereço relâmpago e nostr", + "description": "Ideal para quem já possui uma carteira e deseja conectá-la na extensão.", + "point3": "Pronta para o uso, não precisa de convite" }, "title": "Conecte carteiras na extensão Alby" }, @@ -1042,9 +1060,9 @@ "apps": "Apps", "full_screen": "Tela cheia", "hide_advanced": "Ocultar configurações avançadas", - "settings": "Configurações da extensão", + "settings": "Configurações", "details": "Detalhes", - "wallet_settings": "Configurações da carteira", + "wallet_settings": "Preferências da carteira", "general": "Geral" }, "components": { diff --git a/static/views/popup.html b/static/views/popup.html index 6a0602a2b4..ca1b482649 100644 --- a/static/views/popup.html +++ b/static/views/popup.html @@ -13,6 +13,7 @@ diff --git a/tailwind.config.js b/tailwind.config.js index a648c2a6de..0e2b026c4e 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,5 +1,6 @@ const defaultTheme = require("tailwindcss/defaultTheme"); const colors = require("tailwindcss/colors"); +const plugin = require("tailwindcss/plugin"); function lighten(color, percent) { var num = parseInt(color.replace("#", ""), 16), @@ -25,7 +26,17 @@ const surfaceColor = "#121212"; module.exports = { darkMode: "class", content: ["./static/views/**/*.html", "./src/app/**/*.{js,ts,jsx,tsx}"], - plugins: [require("tailwindcss-3d"), require("@tailwindcss/forms")], + plugins: [ + plugin(function ({ addUtilities }) { + const newUtilities = { + ".translate-z-0": { + transform: "translateZ(0)", + }, + }; + addUtilities(newUtilities); + }), + require("@tailwindcss/forms"), + ], theme: { extend: { animation: { diff --git a/yarn.lock b/yarn.lock index 8d2bbdab32..3f8f24ae48 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1324,13 +1324,6 @@ resolved "https://registry.yarnpkg.com/@swc/counter/-/counter-0.1.1.tgz#e8d066c653883238c291d8fdd8b36ed932e87920" integrity sha512-xVRaR4u9hcYjFvcSg71Lz5Bo4//CyjAAfMxa7UsaDSYxAshflUkVJWiyVWrfxC59z2kP1IzI4/1BEpnhI9o3Mw== -"@swc/helpers@0.5.3": - version "0.5.3" - resolved "https://registry.yarnpkg.com/@swc/helpers/-/helpers-0.5.3.tgz#98c6da1e196f5f08f977658b80d6bd941b5f294f" - integrity sha512-FaruWX6KdudYloq1AHD/4nU+UsMTdNE8CKyrseXWEcgjDAbvkwJg2QGPAnfIJLIWsjZOSPLOAykK6fuYp4vp4A== - dependencies: - tslib "^2.4.0" - "@swc/jest@^0.2.29": version "0.2.29" resolved "https://registry.yarnpkg.com/@swc/jest/-/jest-0.2.29.tgz#b27d647ec430c909f9bb567d1df2a47eaa3841f4" @@ -6838,7 +6831,7 @@ lodash.upperfirst@^4.3.1: resolved "https://registry.npmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz" integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg== -lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0: +lodash@^4.17.11, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0: version "4.17.21" resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -9359,14 +9352,6 @@ symbol-tree@^3.2.4: resolved "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== -tailwindcss-3d@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/tailwindcss-3d/-/tailwindcss-3d-1.0.2.tgz#2ae554d792e5f34a490e87451a9f945d15c1b160" - integrity sha512-e1BIJKzLOiZ2lEK9L3eO9Geb9/zJ+zkCqRiYuIu6/01wPNcy1XEMqCs/MNNPdcJELresvpbxEhCq6AsJXSWNBw== - dependencies: - "@swc/helpers" "0.5.3" - lodash "4.17.21" - tailwindcss@^3.4.3: version "3.4.3" resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.3.tgz#be48f5283df77dfced705451319a5dffb8621519" @@ -9629,7 +9614,7 @@ tsconfig-paths@^4.1.2: minimist "^1.2.6" strip-bom "^3.0.0" -tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.0: +tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0: version "2.6.2" resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz" integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==