Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TKAI-3679] Add service fee on withdraw instead of percentage #56

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions lib/locales/br/frontend/api-messages.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
{
"E628": "O usuário não possui uma conta do Twitter vinculada",
"E629": "Falha ao obter o nome de usuário do Twitter, URL do Twitter inválida",
"E630": "O usuário não segue a Taikai no Twitter",
"E631": "Usuário do Twitter não encontrado",
"E632": "Algo deu errado ao verificar se o usuário segue a Taikai no Twitter",
"E633": "O usuário já reivindicou os pontos por seguir a Taikai no Twitter, você só pode reivindicar uma vez",
"E634": "Por favor, reconecte sua conta do Twitter e tente novamente mais tarde ou entre em contato com o suporte",
"W1": "Você não segue nenhuma das contas do Twitter da Taikai",
"W2": "Você não curtiu nenhum dos tweets recentes da LayerX",
"S1": "Pontos do Twitter reivindicados com sucesso",
"S2": "Conta do Twitter desconectada com sucesso",
"E700": "Você não está autorizado a enviar novas mensagens",
"E610": "Falha ao seguir {{entity}}",
"E611": "Não permitido seguir este(a) {{entity}}",
Expand Down
1 change: 1 addition & 0 deletions lib/locales/br/frontend/navigation.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"notifications_empty": "Sem notificações",
"guest_user": "Usuário convidado",
"user_menu_balance": "Saldo",
"user_menu_view_profile": "Ver Perfil",
"user_menu_dashboard": "Meu Painel",
"user_menu_activity": "Atividade",
"user_menu_deposit_withdraw": "Depósito & Saque",
Expand Down
2 changes: 1 addition & 1 deletion lib/locales/br/frontend/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
"make_a_deposit": "Fazer depósito",
"make_a_withdraw": "Fazer saque",
"recipient_address": "Endereço do destinatário",
"transaction_fee": "Taxa de transação ({{fee}}%)",
"transaction_fee": "Taxa de transação",
"available_amount": "Quantidade disponível:",
"you_will_get": "Você receberá",
"balance_description_1": "O valor acima é o seu saldo atual que reflete o total do tokens $TKAI em sua carteira na TAIKAI.",
Expand Down
11 changes: 11 additions & 0 deletions lib/locales/en/frontend/api-messages.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
{
"E628": "User does not have a linked twitter account",
"E629": "Failed getting the twitter username, invalid twitter url",
"E630": "User is not following Taikai on twitter",
"E631": "Twitter user not found",
"E632": "Something went wrong while checking if the user is following Taikai on twitter",
"E633": "User already claimed the points for following Taikai on twitter, you can only claim once",
"E634": "Please reconnect your twitter account and try again later or contact support",
"W1": "You dont follow any of the Taikai twitter accounts",
"W2": "You have not liked any of the LayerX tweets recently",
"S1": "Twitter points claimed with success",
"S2": "Twitter Account Disconnected with success",
"E700": "You are not authorized to send new messages",
"E610": "Failed following {{entity}}",
"E611": "Not allowed to follow this {{entity}}",
Expand Down
1 change: 1 addition & 0 deletions lib/locales/en/frontend/navigation.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"notifications_empty": "No notifications",
"guest_user": "Guest user",
"user_menu_balance": "Balance",
"user_menu_view_profile": "View Profile",
"user_menu_dashboard": "Dashboard",
"user_menu_activity": "Activity",
"user_menu_deposit_withdraw": "Deposit & Withdraw",
Expand Down
2 changes: 1 addition & 1 deletion lib/locales/en/frontend/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
"make_a_deposit": "Make a deposit",
"make_a_withdraw": "Make a withdraw",
"recipient_address": "Recipient’s address",
"transaction_fee": "Transaction fee ({{fee}}%)",
"transaction_fee": "Transaction fee",
"available_amount": "Available amount:",
"you_will_get": "You will get",
"balance_description_1": "The amount above is your current balance that reflects the total of the TKAI token in your TAIKAI wallet.",
Expand Down
11 changes: 11 additions & 0 deletions lib/locales/es/frontend/api-messages.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
{
"E628": "El usuario no tiene una cuenta de Twitter vinculada",
"E629": "Error al obtener el nombre de usuario de Twitter, URL de Twitter inválida",
"E630": "El usuario no sigue a Taikai en Twitter",
"E631": "Usuario de Twitter no encontrado",
"E632": "Algo salió mal al verificar si el usuario sigue a Taikai en Twitter",
"E633": "El usuario ya reclamó los puntos por seguir a Taikai en Twitter, solo puedes reclamar una vez",
"E634": "Por favor, vuelve a conectar tu cuenta de Twitter y intenta nuevamente más tarde o contacta al soporte",
"W1": "No sigues ninguna de las cuentas de Twitter de Taikai",
"W2": "No has dado 'me gusta' a ninguno de los tweets recientes de LayerX",
"S1": "Puntos de Twitter reclamados con éxito",
"S2": "Cuenta de Twitter desconectada con éxito",
"E700": "No estás autorizado para enviar nuevos mensajes",
"E610": "Fallo al seguir {{entity}}",
"E611": "No permitido seguir este(a) {{entity}}",
Expand Down
1 change: 1 addition & 0 deletions lib/locales/es/frontend/navigation.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"notifications_empty": "Sin notificaciones",
"guest_user": "Usuario invitado",
"user_menu_balance": "Saldo",
"user_menu_view_profile": "Ver Perfil",
"user_menu_dashboard": "Tablero",
"user_menu_activity": "Actividad",
"user_menu_deposit_withdraw": "Depositar y Retirar",
Expand Down
2 changes: 1 addition & 1 deletion lib/locales/es/frontend/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
"make_a_deposit": "Realizar un depósito",
"make_a_withdraw": "Realizar una transferencia",
"recipient_address": "Dirección del destinatario",
"transaction_fee": "Fee de transacción ({{fee}}%)",
"transaction_fee": "Fee de transacción",
"available_amount": "Monto disponible:",
"you_will_get": "Recibirás",
"balance_description_1": "El monto anterior es tu saldo actual, que refleja el total de tokens TKAI en tu billetera de TAIKAI",
Expand Down
11 changes: 11 additions & 0 deletions lib/locales/fr/frontend/api-messages.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
{
"E628": "L'utilisateur n'a pas de compte Twitter associé",
"E629": "Échec de l'obtention du nom d'utilisateur Twitter, URL Twitter invalide",
"E630": "L'utilisateur ne suit pas Taikai sur Twitter",
"E631": "Utilisateur Twitter introuvable",
"E632": "Une erreur s'est produite lors de la vérification si l'utilisateur suit Taikai sur Twitter",
"E633": "L'utilisateur a déjà réclamé les points pour avoir suivi Taikai sur Twitter, vous ne pouvez réclamer qu'une seule fois",
"E634": "Veuillez reconnecter votre compte Twitter et réessayer plus tard ou contacter le support",
"W1": "Vous ne suivez aucun des comptes Twitter de Taikai",
"W2": "Vous n'avez aimé aucun des tweets récents de LayerX",
"S1": "Points Twitter réclamés avec succès",
"S2": "Compte Twitter déconnecté avec succès",
"E700": "Vous n'êtes pas autorisé(e) à envoyer de nouveaux messages",
"E610": "Échec de la suite de {{entity}}",
"E611": "Non autorisé à suivre ce(a) {{entity}}",
Expand Down
1 change: 1 addition & 0 deletions lib/locales/fr/frontend/navigation.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"notifications_empty": "Aucune notification",
"guest_user": "Utilisateur invité",
"user_menu_balance": "Solde",
"user_menu_view_profile": "Voir le Profil",
"user_menu_dashboard": "Tableau de bord",
"user_menu_activity": "Activité",
"user_menu_deposit_withdraw": "Dépôt et retrait",
Expand Down
2 changes: 1 addition & 1 deletion lib/locales/fr/frontend/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
"make_a_deposit": "Effectuer un dépôt",
"make_a_withdraw": "Effectuer un retrait",
"recipient_address": "Adresse du destinataire",
"transaction_fee": "Frais de transaction ({{fee}}%)",
"transaction_fee": "Frais de transaction",
"available_amount": "Montant disponible :",
"you_will_get": "Vous obtiendrez",
"balance_description_1": "Le montant ci-dessus est votre solde actuel, qui reflète le total des jetons TKAI dans votre portefeuille TAIKAI.",
Expand Down
2 changes: 1 addition & 1 deletion lib/locales/index.ts

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions lib/types/enums.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export enum i18nKey {
ALERT_MESSAGES__AN_ERROR_HAPPENED = "alert-messages:an_error_happened",
ALERT_MESSAGES__WALLET_CONNECTED = "alert-messages:wallet_connected",
ALERT_MESSAGES__WALLET_DISCONNECTED = "alert-messages:wallet_disconnected",
ALERT_MESSAGES__ACCOUNT_DISCONNECTED = "alert-messages:account_disconnected",
ALERT_MESSAGES__TRY_AGAIN_LATER_OR_CONTACT_SUPPORT_TEAM = "alert-messages:try_again_later_or_contact_support_team",
ALERT_MESSAGES__USER_SETTINGS_CHANGED_USERNAME = "alert-messages:user_settings_changed_username",
ALERT_MESSAGES__USER_SETTINGS_CHANGE_TO_SAME_USERNAME = "alert-messages:user_settings_change_to_same_username",
Expand Down Expand Up @@ -634,6 +635,7 @@ export enum i18nKey {
CHALLENGES__INNOVATORS = "challenges:innovators",
CHALLENGES__JURIES = "challenges:juries",
CHALLENGES__MENTORS = "challenges:mentors",
CHALLENGES__MENTOR = "challenges:mentor",
CHALLENGES__TRANSACTIONS = "challenges:transactions",
CHALLENGES__UPDATES = "challenges:updates",
CHALLENGES__HACKATHON_OVERVIEW = "challenges:hackathon_overview",
Expand Down Expand Up @@ -1771,6 +1773,7 @@ export enum i18nKey {
NAVIGATION__NOTIFICATIONS_EMPTY = "navigation:notifications_empty",
NAVIGATION__GUEST_USER = "navigation:guest_user",
NAVIGATION__USER_MENU_BALANCE = "navigation:user_menu_balance",
NAVIGATION__USER_MENU_VIEW_PROFILE = "navigation:user_menu_view_profile",
NAVIGATION__USER_MENU_DASHBOARD = "navigation:user_menu_dashboard",
NAVIGATION__USER_MENU_ACTIVITY = "navigation:user_menu_activity",
NAVIGATION__USER_MENU_DEPOSIT_WITHDRAW = "navigation:user_menu_deposit_withdraw",
Expand Down Expand Up @@ -2114,6 +2117,9 @@ export enum i18nKey {
SETTINGS__CONNECTED_ACCOUNTS__DISCONNECT_WALLET = "settings:connected_accounts.disconnect_wallet",
SETTINGS__CONNECTED_ACCOUNTS__DISCONNECT_METAMASK_WALLET_DESCRIPTION = "settings:connected_accounts.disconnect_metamask_wallet_description",
SETTINGS__CONNECTED_ACCOUNTS__CANT_DISCONNECT_ETHEREUM_ACCOUNT = "settings:connected_accounts.cant_disconnect_ethereum_account",
SETTINGS__CONNECTED_ACCOUNTS__X__CONNECT = "settings:connected_accounts.x.connect",
SETTINGS__CONNECTED_ACCOUNTS__X__DISCONNECT = "settings:connected_accounts.x.disconnect",
SETTINGS__CONNECTED_ACCOUNTS__X__DISCONNECT_DESCRIPTION = "settings:connected_accounts.x.disconnect_description",
SETTINGS__CHANGE_USERNAME__LABEL = "settings:change_username.label",
SETTINGS__CHANGE_USERNAME__DESCRIPTION = "settings:change_username.description",
SETTINGS__CHANGE_USERNAME__DESCRIPTION_PROCEDURE_1 = "settings:change_username.description_procedure_1",
Expand Down
Loading