Skip to content

Commit

Permalink
Merge branch 'master' of github.com:GoodDollar/GoodDAPP
Browse files Browse the repository at this point in the history
  • Loading branch information
L03TJ3 committed Oct 4, 2024
2 parents cf8f4d2 + 76617cf commit bc51242
Show file tree
Hide file tree
Showing 24 changed files with 751 additions and 764 deletions.
1 change: 1 addition & 0 deletions src/components/auth/__tests__/__util__/index.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable prettier/prettier */
import React from 'react'
import { createSwitchNavigator } from '@react-navigation/core'
import { createBrowserApp } from '@react-navigation/web'
Expand Down
1 change: 1 addition & 0 deletions src/components/backupWallet/__tests__/__util__/index.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable prettier/prettier */
import React from 'react'
import { createSwitchNavigator } from '@react-navigation/core'
import { createBrowserApp } from '@react-navigation/web'
Expand Down
1 change: 1 addition & 0 deletions src/components/common/layout/Wrapper.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// @flow
import React, { useContext } from 'react'
import { Platform, View } from 'react-native'
// eslint-disable-next-line import/no-named-as-default
import LinearGradient from 'react-native-linear-gradient'
import { isMobileOnly } from '../../../lib/utils/platform'
import { withStyles } from '../../../lib/styles'
Expand Down
42 changes: 0 additions & 42 deletions src/components/dashboard/Tasks/hooks/useTasks.jsx

This file was deleted.

1 change: 1 addition & 0 deletions src/components/dashboard/__tests__/__util__/index.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable prettier/prettier */
import React from 'react'
import { createSwitchNavigator } from '@react-navigation/core'
import { createBrowserApp } from '@react-navigation/web'
Expand Down
4 changes: 2 additions & 2 deletions src/components/permissions/api/PermissionsAPI.native.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import PushNotification from 'react-native-push-notification'
import { type Permission, Permissions, type PermissionStatus, PermissionStatuses } from '../types'
import { isAndroidNative } from '../../../lib/utils/platform'

export default new class {
export default new (class {
// permissions enum to platform permissions map
platformPermissions = {
[Permissions.Clipboard]: null, // accessing clipboard doesn't requires permissions on native
Expand Down Expand Up @@ -93,4 +93,4 @@ export default new class {

return isAndroidNative || status.authorizationStatus === 1 ? RESULTS.BLOCKED : RESULTS.DENIED
}
}({ request, check })
})({ request, check })
1 change: 1 addition & 0 deletions src/components/signup/__tests__/__util__/index.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable prettier/prettier */
import { createSwitchNavigator } from '@react-navigation/core'
import { createBrowserApp } from '@react-navigation/web'
import React from 'react'
Expand Down
48 changes: 30 additions & 18 deletions src/language/locales/ar/catalog.json

Large diffs are not rendered by default.

48 changes: 30 additions & 18 deletions src/language/locales/bn/catalog.json

Large diffs are not rendered by default.

60 changes: 30 additions & 30 deletions src/language/locales/en-gb/catalog.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
"Backup my wallet": "Backup my wallet",
"Backup your wallet. Now.": "Backup your wallet. Now.",
"Begin receiving real crypto, totally for free, \nand without having to risk any money to start.": "Begin receiving real crypto, totally for free, \nand without having to risk any money to start.",
"Bought G$": "",
"Bought G$": "Bought G$",
"Bridge": "Bridge",
"Bridged G$": "Bridged G$",
"BuyGD": "",
"BuyGD": "BuyGD",
"By clicking the 'Create a wallet' button,\nyou are accepting our": "By clicking the 'Create a wallet' button,\nyou are accepting our",
"By clicking your": "By clicking your",
"By signing up and entering, you are accepting our": "By signing up and entering, you are accepting our",
Expand All @@ -58,7 +58,7 @@
"Chain:": "Chain:",
"Change Network:": "Change Network:",
"Change it via your device settings": "Change it via your device settings",
"Changing your information here will not change how you log in to your wallet.": "",
"Changing your information here will not change how you log in to your wallet.": "Changing your information here will not change how you log in to your wallet.",
"Check your internet connection": "Check your internet connection",
"Choose Authentication Method": "Choose Authentication Method",
"Choose a Contact": "Choose a Contact",
Expand All @@ -71,7 +71,7 @@
"Claim transaction failed": "Claim transaction failed",
"Claim your G$'s today!": "Claim your G$'s today!",
"Claim your first G$s": "Claim your first G$s",
"Claiming unavailable": "",
"Claiming unavailable": "Claiming unavailable",
"Click the": "Click the",
"Click ‘update’": "Click ‘update’",
"Collecting Bonus": "Collecting Bonus",
Expand Down Expand Up @@ -143,7 +143,7 @@
"GoodDollar is a global community and a web application to help people join the digital economy.": "GoodDollar is a global community and a web application to help people join the digital economy.",
"GoodDollar is a payment system with a built-in small basic income based on blockchain technology.": "GoodDollar is a payment system with a built-in small basic income based on blockchain technology.",
"GoodDollars are transferred": "GoodDollars are transferred",
"GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser": "",
"GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser": "GoodWallet might not work correctly on this browser\nFor the best experience, use Chrome, Safari or your phone's native browser",
"Help & Feedback": "Help & Feedback",
"Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.": "Help expand the network by inviting family, friends, and colleagues to participate and claim their daily income.\nThe more people join, the more effective GoodDollar will be, for everyone.",
"Hi {firstName},\nyour wallet was recovered successfully": "Hi {firstName},\nyour wallet was recovered successfully",
Expand All @@ -154,14 +154,14 @@
"How much?": "How much?",
"How to do that?": "How to do that?",
"I UNDERSTAND": "I UNDERSTAND",
"I don't have time for this": "",
"I don't trust this project": "",
"I don't understand what I'm doing": "",
"I don't want my face scanned for privacy concerns": "",
"I don't have time for this": "I don't have time for this",
"I don't trust this project": "I don't trust this project",
"I don't understand what I'm doing": "I don't understand what I'm doing",
"I don't want my face scanned for privacy concerns": "I don't want my face scanned for privacy concerns",
"I give up": "I give up",
"I think I have another account I forgot about": "",
"I'm just checking what GoodDollar is": "",
"I'm not able to put my face in the circle": "",
"I think I have another account I forgot about": "I think I have another account I forgot about",
"I'm just checking what GoodDollar is": "I'm just checking what GoodDollar is",
"I'm not able to put my face in the circle": "I'm not able to put my face in the circle",
"INVITE": "INVITE",
"If this is your only active \naccount - please contact our support": "If this is your only active \naccount - please contact our support",
"If you delete your account": "If you delete your account",
Expand All @@ -178,10 +178,10 @@
"Invite friends": "Invite friends",
"Invite friends and earn G$'s": "Invite friends and earn G$'s",
"Invite your friends now": "Invite your friends now",
"It keeps saying I have a twin but have never registered before": "",
"It keeps saying I have a twin but have never registered before": "It keeps saying I have a twin but have never registered before",
"It might take a few seconds": "It might take a few seconds",
"It says I need to switch to another device": "",
"It says it needs a clearer video selfie": "",
"It says I need to switch to another device": "It says I need to switch to another device",
"It says it needs a clearer video selfie": "It says it needs a clearer video selfie",
"It seems there is already an account for\nthat {usedText} using {registeredBy}": "It seems there is already an account for\nthat {usedText} using {registeredBy}",
"It’s a nice landscape, but we need \nto see your face": "It’s a nice landscape, but we need \nto see your face",
"Join the GoodDAO": "Join the GoodDAO",
Expand All @@ -196,14 +196,14 @@
"Language": "Language",
"Later": "Later",
"Learn More": "Learn More",
"Learn about gas": "",
"Learn about gas": "Learn about gas",
"Let someone scan your wallet address": "Let someone scan your wallet address",
"Let's change the world, for good.": "Let's change the world, for good.",
"Light Your Face Evenly": "Light Your Face Evenly",
"Link copied to clipboard": "Link copied to clipboard",
"Link generation failed. Please try again": "Link generation failed. Please try again",
"Location": "Location",
"Login Method": "",
"Login Method": "Login Method",
"Login information is missing, for instructions please visit:": "Login information is missing, for instructions please visit:",
"Logout": "Logout",
"MAYBE LATER": "MAYBE LATER",
Expand All @@ -217,12 +217,12 @@
"Minted G$": "Minted G$",
"Mobile": "Mobile",
"More G$'s Coming Soon": "More G$'s Coming Soon",
"My Face Record ID": "",
"My Face Record ID": "My Face Record ID",
"My Private Key": "My Private Key",
"My Profile": "My Profile",
"My Wallet Address": "My Wallet Address",
"My account details": "My account details",
"My camera isn't working \nor I have other technical problems": "",
"My camera isn't working \nor I have other technical problems": "My camera isn't working \nor I have other technical problems",
"My profile": "My profile",
"NOW": "NOW",
"Name": "Name",
Expand All @@ -233,15 +233,15 @@
"Next time\nyou can sign in\nfrom any device\nusing your": "Next time\nyou can sign in\nfrom any device\nusing your",
"Not Verified": "Not Verified",
"Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}": "Not enough balance to execute transaction. Balance: {balance} Required: {gasRequired}",
"Note:": "",
"Note:": "Note:",
"Notifications": "Notifications",
"OK": "OK",
"OK, GOT IT": "OK, GOT IT",
"OK, VERIFY ME": "OK, VERIFY ME",
"Ok": "Ok",
"Ooops ...": "Ooops ...",
"Ooops,\nYou're out of gas...": "Ooops,\nYou're out of gas...",
"Oops! GoodWallet might not work correctly on this browser": "",
"Oops! GoodWallet might not work correctly on this browser": "Oops! GoodWallet might not work correctly on this browser",
"Oops! This browser/app cannot run identity verification": "Oops! This browser/app cannot run identity verification",
"Oops! You need to enable notifications on your phone.": "Oops! You need to enable notifications on your phone.",
"Oops! Your iOS is outdated": "Oops! Your iOS is outdated",
Expand Down Expand Up @@ -297,12 +297,12 @@
"Rewards": "Rewards",
"Rewards pool is sponsored by": "Rewards pool is sponsored by",
"Right here is where you will claim your basic income in GoodDollar coins every day.\nTogether, we will build a better financial future for all of us!": "Right here is where you will claim your basic income in GoodDollar coins every day.\nTogether, we will build a better financial future for all of us!",
"SEND VIA LINK": "",
"SEND VIA LINK": "SEND VIA LINK",
"SETTINGS": "SETTINGS",
"SIGN IN": "SIGN IN",
"SUCCESS!": "SUCCESS!",
"Save": "Save",
"Save your G$ and earn rewards with GoodDollar saving challenges with HaloFi": "",
"Save your G$ and earn rewards with GoodDollar saving challenges with HaloFi": "Save your G$ and earn rewards with GoodDollar saving challenges with HaloFi",
"Scan Code": "Scan Code",
"Scan QR Code": "Scan QR Code",
"Search contact name / phone": "Search contact name / phone",
Expand All @@ -328,7 +328,7 @@
"Sign up (one last time, we promise {0})": "Sign up (one last time, we promise {0})",
"Skip mobile verification": "Skip mobile verification",
"So, let’s give it another shot...": "So, let’s give it another shot...",
"Something else \n(Contact Support)": "",
"Something else \n(Contact Support)": "Something else \n(Contact Support)",
"Something went wrong \non our side...": "Something went wrong \non our side...",
"Something went wrong on our side,\nplease try again.": "Something went wrong on our side,\nplease try again.",
"Something went wrong on our side. Please try again": "Something went wrong on our side. Please try again",
Expand All @@ -338,7 +338,7 @@
"Sorry, Something unexpected happened, please try again.": "Sorry, Something unexpected happened, please try again.",
"Sorry, minimum amount to bridge is {min} {token}'s": "Sorry, minimum amount to bridge is {min} {token}'s",
"Sorry, something unexpected happened, please try again.\nError: {codeString}": "Sorry, something unexpected happened, please try again.\nError: {codeString}",
"Sorry, this is not a valid address.": "",
"Sorry, this is not a valid address.": "Sorry, this is not a valid address.",
"Sorry, you don't have enough {token}s": "Sorry, you don't have enough {token}s",
"Sponsored by": "Sponsored by",
"Start Claiming G$ Daily": "Start Claiming G$ Daily",
Expand Down Expand Up @@ -403,7 +403,7 @@
"We sent an email with recovery instructions for your wallet": "We sent an email with recovery instructions for your wallet",
"We sent you an email with your Magic Link": "We sent you an email with your Magic Link",
"We were unable to load the wallet.": "We were unable to load the wallet.",
"We're Preparing \nYour Wallet": "",
"We're Preparing \nYour Wallet": "We're Preparing \nYour Wallet",
"We're giving it to you for FREE, FOREVER.": "We're giving it to you for FREE, FOREVER.",
"We're sorry.": "We're sorry.",
"We're sorry.\nThis transaction failed.": "We're sorry.\nThis transaction failed.",
Expand All @@ -416,7 +416,7 @@
"What Is The\nTransaction For?": "What Is The\nTransaction For?",
"What happened?": "What happened?",
"What is your full name?": "What is your full name?",
"Why didn't you complete the GoodDollar verification?": "",
"Why didn't you complete the GoodDollar verification?": "Why didn't you complete the GoodDollar verification?",
"Would you like to be reminded of your daily claims?": "Would you like to be reminded of your daily claims?",
"Wrong payment link or payment details": "Wrong payment link or payment details",
"YAY!": "YAY!",
Expand All @@ -437,7 +437,7 @@
"You will receive": "You will receive",
"You'll pay {feeToPay} G$ in fees to use the bridge": "You'll pay {feeToPay} G$ in fees to use the bridge",
"You'll pay {nativeFee} {token} in fees for this transaction": "You'll pay {nativeFee} {token} in fees for this transaction",
"You've claimed today!": "",
"You've claimed today!": "You've claimed today!",
"Your Next Claim:": "Your Next Claim:",
"Your address is being whitelisted across all chains.\nPlease wait.\nYou'll be redirected when it's complete.": "Your address is being whitelisted across all chains.\nPlease wait.\nYou'll be redirected when it's complete.",
"Your balance will be updated in a minute": "Your balance will be updated in a minute",
Expand Down Expand Up @@ -486,8 +486,8 @@
"{buttonPrefix} Facebook": "{buttonPrefix} Facebook",
"{buttonPrefix} Google": "{buttonPrefix} Google",
"{buttonPrefix} Passwordless": "{buttonPrefix} Passwordless",
"{dialogText}": "",
"{dialogTitle}": "",
"{dialogText}": "{dialogText}",
"{dialogTitle}": "{dialogTitle}",
"{firstName},\nwe need to verify your \n{fieldToShow} again…": "{firstName},\nwe need to verify your \n{fieldToShow} again…",
"{label} RPC Address": "{label} RPC Address",
"{language}": "{language}",
Expand Down
Loading

0 comments on commit bc51242

Please sign in to comment.