Merge branch 'master' of github.com:GoodDollar/GoodDAPP

Author: L03TJ3

CHANGELOG.md

@@ -4,11 +4,11 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-#### [v2.52.1-0](https://github.com/GoodDollar/GoodDAPP/compare/v2.52.6...v2.52.1-0)
+#### [v2.53.0](https://github.com/GoodDollar/GoodDAPP/compare/v2.52.6...v2.53.0)
 
-- fix: broken sdk-v2 package for android [`d4a22f4`](https://github.com/GoodDollar/GoodDAPP/commit/d4a22f4d21e44d7f2336465db1540c6935fc69d9)
-- add: goodid error tracking, bump gd sdks [`238b8ed`](https://github.com/GoodDollar/GoodDAPP/commit/238b8ed0951c300f6b8342eedf7de8d4df993cdd)
-- fixes: [`15b8e63`](https://github.com/GoodDollar/GoodDAPP/commit/15b8e63092540759a7f8918efd9d9d98d4d6a5ab)
+- chore: release qa version 2.52.1-0 [skip build] [`102b5a4`](https://github.com/GoodDollar/GoodDAPP/commit/102b5a4ae6b697f6a00b9d79f89272289c9439b8)
+- fix: goodid fixes, bump gd sdk"s [`b779dcc`](https://github.com/GoodDollar/GoodDAPP/commit/b779dcc76439b6874da57ee449902a63aa67ea07)
+- fix for onboard flow, styling fixes. bump gd sdk's [`1fb2312`](https://github.com/GoodDollar/GoodDAPP/commit/1fb23127e18ce61d2305028f6acdc6b901ca3a52)
 
 #### [v2.52.6](https://github.com/GoodDollar/GoodDAPP/compare/v2.52.5...v2.52.6)
 

package.json

@@ -1,12 +1,13 @@
 {
   "name": "@gooddollar/gooddapp",
-  "version": "2.52.1-0",
+  "version": "2.53.0",
   "engines": {
     "node": "18.x",
     "npm": "9.x"
   },
   "scripts": {
     "web": "npm run lingui:compile && NODE_OPTIONS=\"--openssl-legacy-provider\" vite",
+    "goodid": "export REACT_APP_INDEXJS='./src/index.fv.jsx' && NODE_OPTIONS=\"--openssl-legacy-provider\" vite",
     "android": "npm run lingui:compile && ENVFILE=.env; npm run copy:gdfont && npm run animation:assets && NODE_OPTIONS=\"--openssl-legacy-provider\" react-native run-android",
     "ios": "npm run lingui:compile && ENVFILE=.env; npm run animation:assets && NODE_OPTIONS=\"--openssl-legacy-provider\" react-native run-ios",
     "start:native": "react-native start",
@@ -145,6 +146,7 @@
     "lottie-ios": "^3.4.0",
     "lottie-react-native": "^5",
     "lottie-web": "^5.12.2",
+    "lz-string": "^1.5.0",
     "mnid": "^0.1.3",
     "mobile-device-detect": "^0.4.3",
     "moment": "^2.29.4",

src/components/faceVerification/screens/VerificationScreen.jsx

@@ -40,8 +40,11 @@ const FaceVerification = ({ screenProps, navigation }) => {
   const userStorage = useUserStorage()
   const { account, isFVFlow } = useContext(FVFlowContext)
   const payload = useFlagWithPayload('uat-goodid-flow')
-  const { countries, whitelist } = payload ?? {}
-  const [isEligible] = usePromise(() => supportedCountries(countries, whitelist, account))
+  const { enabled = false, countries = '', whitelist = [] } = payload ?? {}
+  const [isEligible] = usePromise(
+    () => supportedCountries(countries, whitelist, account, enabled),
+    [countries, whitelist, account, enabled],
+  )
 
   const { faceIdentifier: enrollmentIdentifier, chainId, v1FaceIdentifier: fvSigner } = useEnrollmentIdentifier()
 

src/components/faceVerification/standalone/context/FVFlowContext.jsx

@@ -1,6 +1,6 @@
 // @flow
 import React, { createContext, useEffect, useRef } from 'react'
-
+import { decompressFromEncodedURIComponent } from 'lz-string'
 import useFVFlow from '../hooks/useFVFlow'
 import DeepLinking from '../../../../lib/utils/deepLinking'
 
@@ -28,6 +28,10 @@ export const FVFlowContext = createContext({
 const FVFlowProvider = props => {
   const unsupportedCopyUrl = DeepLinking.link
 
+  const params = useRef(DeepLinking.params).current
+
+  // new version compresses params to support large signatures
+  const decompressed = JSON.parse(decompressFromEncodedURIComponent(params.lz) || '{}')
   const {
     sig,
     nonce,
@@ -38,7 +42,8 @@ const FVFlowProvider = props => {
     account,
     chain,
     isDelta,
-  } = useRef(DeepLinking.params).current
+  } = { ...params, ...decompressed }
+
   const { jwt, error } = useFVFlow(sig, nonce, faceIdentifier, account)
 
   useEffect(() => {

src/config/config.js

@@ -231,7 +231,6 @@ const Config = {
   graphQlUrl: env.REACT_APP_GRAPHQL_URL || 'https://api.thegraph.com/subgraphs/name/gooddollar',
   chainIdUrl: env.REACT_APP_CHAINID_URL || 'https://chainid.network',
   networkId,
-  isFVFlow: env.REACT_APP_BUILD_TARGET === 'FV',
   estimateGasPrice: env.REACT_APP_ESTIMATE_GAS_PRICE === 'true',
   defaultGasPrice: parseInt(env.REACT_APP_DEFAULT_GAS_PRICE || 11),
   defaultTxGas: parseInt(env.REACT_APP_DEFAULT_TX_GAS || 1000000),

src/lib/utils/supportedCountries.js

@@ -1,11 +1,15 @@
 import { retry } from './async'
 
-export const supportedCountries = async (supportedCountries = '', whitelist = [], account) => {
+export const supportedCountries = async (supportedCountries = '', whitelist = [], account, enabled) => {
+  if (enabled || whitelist?.includes(account)) {
+    return true
+  }
+  if (!supportedCountries) {
+    return false
+  }
   const country = await retry(async () => (await fetch('https://get.geojs.io/v1/ip/country.json')).json(), 3, 2000)
     .then(data => data.country)
     .catch(() => false)
 
-  const isEligible = supportedCountries?.split(',')?.includes(country) || whitelist?.includes(account)
-
-  return isEligible
+  return supportedCountries?.split(',')?.includes(country)
 }

src/lib/wallet/GoodWalletProvider.jsx

@@ -97,10 +97,10 @@ export const GoodWalletProvider = ({ children, disableLoginAndWatch = false }) =
   const [hasGoodIdEnabled, setHasGoodIdEnabled] = useState(false)
   const [shouldLoginAndWatch] = usePropsRefs([disableLoginAndWatch === false])
   const posthog = usePostHog()
-  const { countries, whitelist } = useFlagWithPayload('uat-goodid-flow') ?? {}
+  const { enabled = false, countries = '', whitelist = [] } = useFlagWithPayload('uat-goodid-flow') ?? {}
   const [isEligible] = usePromise(
-    () => supportedCountries(countries, whitelist, goodWallet?.account),
-    [countries, whitelist, goodWallet?.account],
+    () => supportedCountries(countries, whitelist, goodWallet?.account, enabled),
+    [countries, whitelist, goodWallet?.account, enabled],
   )
 
   const db = getDB()

src/lib/wallet/MultipleHttpProvider.js

@@ -53,21 +53,24 @@ export class MultipleHttpProvider extends HttpProvider {
         log.trace('Sending request to peer', { payload })
         return await this._sendRequest(payload)
       } catch (exception) {
+        const error = exception?.error ? JSON.stringify(exception?.error) : exception?.message
+        const notTxError = !isTxError(error)
+
         // log error to analytics if last peer failed, ie all rpcs failed
-        if (!isTxError(exception?.message) && !loggedProviders.has(provider) && peers[peers.length - 1] === item) {
+        if (notTxError && !loggedProviders.has(provider) && peers[peers.length - 1] === item) {
           loggedProviders.set(provider, true)
 
           const { message: originalMessage } = exception
           const errorMessage = 'Failed all RPCs' // so in analytics all errors are grouped under same message
 
           // log.exception bypass network error filtering
-          log.exception('MultiHttpProvider:', errorMessage, exception, { provider, originalMessage })
+          log.exception('MultiHttpProvider:', errorMessage, exception, { error, provider, originalMessage })
         } else if (isRateLimitError(exception)) {
           log.warn('MultiHttpProvider rate limit error', exception.message, exception, { provider })
           endpoints.splice(endpoints.indexOf(item, 1))
           setTimeout(() => endpoints.push(item), 60000)
-        } else {
-          log.warn('MultiHttpProvider failed to send:', exception.message, exception, { provider })
+        } else if (notTxError) {
+          log.warn('MultiHttpProvider failed to send:', exception.message, exception, { error, provider })
         }
 
         throw exception
@@ -86,17 +89,24 @@ export class MultipleHttpProvider extends HttpProvider {
     }
 
     // if not connection issue - stop fallback, throw error
-    const onFallback = error => {
-      const { message, code } = error
-
-      const txError = isTxError(message)
+    const onFallback = exception => {
+      const { message, code, error } = exception
+      const errorMessage = error ? JSON.stringify(error) : message
+      const txError = isTxError(errorMessage)
       const conError = isConnectionError(message)
 
       // retry if not tx issue and network error or if rpc responded with error (error.error)
-      const willFallback = !txError && !!(code || error.error || !message || conError)
+      const willFallback = !txError && !!(code || error || !message || conError)
 
       if (!willFallback) {
-        log.warn('send: got error without fallback', { message, error, willFallback, txError, conError })
+        log.warn('send: got error without fallback', {
+          message,
+          exception,
+          errorMessage,
+          willFallback,
+          txError,
+          conError,
+        })
       }
 
       return willFallback

vercel-goodid-ignore-build.sh

@@ -3,7 +3,7 @@
 # this is for vercel to prevent builds of feature branches. it is used in settings/git/ignored build step
 echo "VERCEL_GIT_COMMIT_REF: $VERCEL_GIT_COMMIT_REF"
 
-if [[ "$VERCEL_GIT_COMMIT_REF" == "goodid/dev" || "$VERCEL_GIT_COMMIT_REF" == "goodid/qa"  || "$VERCEL_GIT_COMMIT_REF" == "goodid/prod" ]] ; then
+if [[ "$VERCEL_GIT_COMMIT_REF" == "master" || "$VERCEL_GIT_COMMIT_REF" == "staging" || "$VERCEL_GIT_COMMIT_REF" == "goodid/dev" || "$VERCEL_GIT_COMMIT_REF" == "goodid/qa"  || "$VERCEL_GIT_COMMIT_REF" == "goodid/prod" ]] ; then
   # Proceed with the build
     echo "✅ - Build can proceed"
   exit 1;

yarn.lock

@@ -6880,6 +6880,7 @@ __metadata:
     lottie-ios: ^3.4.0
     lottie-react-native: ^5
     lottie-web: ^5.12.2
+    lz-string: ^1.5.0
     metro: 0.80.5
     metro-core: ^0.80.5
     metro-react-native-babel-preset: ^0.77.0
@@ -35458,6 +35459,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lz-string@npm:^1.5.0":
+  version: 1.5.0
+  resolution: "lz-string@npm:1.5.0"
+  bin:
+    lz-string: bin/bin.js
+  checksum: 1ee98b4580246fd90dd54da6e346fb1caefcf05f677c686d9af237a157fdea3fd7c83a4bc58f858cd5b10a34d27afe0fdcbd0505a47e0590726a873dc8b8f65d
+  languageName: node
+  linkType: hard
+
 "magic-string@npm:0.27.0":
   version: 0.27.0
   resolution: "magic-string@npm:0.27.0"