Merge branch 'master' of github.com:GoodDollar/GoodDAPP into 4318-ngw…

…-android-modal

.env.development

@@ -32,4 +32,11 @@ REACT_APP_HCAPTCHA_SITE_KEY=29995010-7ec0-47e1-ae21-df462e14b7e7
 REACT_APP_GOOGLE_CLIENT_ID=1015336103925-reqktqs0ns9vfaeh7nbt8mi634u9157k.apps.googleusercontent.com
 REACT_APP_AUTH0_CLIENT_ID=tkEmIIdd8eAkLGSnNWcRdA0ARI92NxHr
 REACT_APP_POSTHOG_KEY=phc_LdONpa7dZNYaP8AZSgZVRW02BZU4FSyHQcm7YFM2FEB
+# REACT_APP_TORUS_WEB3AUTH_CLIENT_ID=
+# SUBGRAPH_API=
+# REACT_APP_WALLET2_PROMO_URL="https://good-wallet-v2.vercel.app/en/promo"
+REACT_APP_WALLET2_PROMO_URL="https://staging-good-wallet-v2.vercel.app/en/promo"
+REACT_APP_GOODID_FEATURE_BRANCH="true"
+REACT_APP_UBIPOOL_ADDRESSES="0xa6d77aa130e729886c90a48e0ee539d6c6795df7,0x77253761353271813c1aca275de8eec768b217c5,0x627dbf00ce1a54067f5a34d6596a217a029c1532"
+REACT_APP_GOOD_GOODCOLLECTIVE_EXPLORER='https://dev-goodcollective.vercel.app/'
 #needs to end with newline

CHANGELOG.md

@@ -4,8 +4,53 @@ 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.49.0](https://github.com/GoodDollar/GoodDAPP/compare/v2.48.6...v2.49.0)
+
+- fixes --> [`dd3cb1a`](https://github.com/GoodDollar/GoodDAPP/commit/dd3cb1aad01591887e7908dc0736f080f36032d8)
+- fix: profile page styling [`cd31064`](https://github.com/GoodDollar/GoodDAPP/commit/cd31064e82509e61e97a19f402a1fa0fcbd035ac)
+- chore: release qa version 2.48.1-0 [skip build] [`2b5bede`](https://github.com/GoodDollar/GoodDAPP/commit/2b5bedede1bc2c52bf032dd41fd0ef499a03d108)
+
+#### [v2.48.6](https://github.com/GoodDollar/GoodDAPP/compare/v2.48.5...v2.48.6)
+
+> 29 October 2024
+
+- fix: fv-flow buttons not visible on small-width screens [`9e2bd94`](https://github.com/GoodDollar/GoodDAPP/commit/9e2bd94a956b3db1cfdb52896c547f4de71af0fa)
+
+#### [v2.48.5](https://github.com/GoodDollar/GoodDAPP/compare/v2.48.4...v2.48.5)
+
+> 26 October 2024
+
+- fix: add missing configuration for goodid production [`a7a0d53`](https://github.com/GoodDollar/GoodDAPP/commit/a7a0d531ba82c66990c8fb1848fafc863cd32c77)
+- fix: fixes for redtent offer flow + camera support on android [`cbbf57a`](https://github.com/GoodDollar/GoodDAPP/commit/cbbf57a33ad6cb5b997fc449dea712366bc955df)
+
+#### [v2.48.4](https://github.com/GoodDollar/GoodDAPP/compare/v2.48.3...v2.48.4)
+
+> 16 October 2024
+
+- hotfix: return face-id for production [`635fc89`](https://github.com/GoodDollar/GoodDAPP/commit/635fc89e2edac583947ccc7403caf9e5f759b349)
+
+#### [v2.48.3](https://github.com/GoodDollar/GoodDAPP/compare/v2.48.2...v2.48.3)
+
+> 16 October 2024
+
+- hotfix includes: [`d07c493`](https://github.com/GoodDollar/GoodDAPP/commit/d07c4934a51d78a5dd30c9366d0370eb3ef3a928)
+
+#### [v2.48.2](https://github.com/GoodDollar/GoodDAPP/compare/v2.48.1...v2.48.2)
+
+> 15 October 2024
+
+- fix: profile page styling [`e104f68`](https://github.com/GoodDollar/GoodDAPP/commit/e104f68abadc74ab9becaa2efce059bbd622d750)
+
+#### [v2.48.1](https://github.com/GoodDollar/GoodDAPP/compare/v2.48.0...v2.48.1)
+
+> 15 October 2024
+
+- hotfix: default config values, don't show goodid details in prod [`b26c45c`](https://github.com/GoodDollar/GoodDAPP/commit/b26c45c1139c0931c34792c06f04dede3bf88a57)
+
 #### [v2.48.0](https://github.com/GoodDollar/GoodDAPP/compare/v2.47.3...v2.48.0)
 
+> 14 October 2024
+
 - New Crowdin Updates [`#4310`](https://github.com/GoodDollar/GoodDAPP/pull/4310)
 - re-verification screen [`#4303`](https://github.com/GoodDollar/GoodDAPP/pull/4303)
 - New Crowdin updates [`#4277`](https://github.com/GoodDollar/GoodDAPP/pull/4277)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/gooddapp",
-  "version": "2.48.0",
+  "version": "2.49.0",
   "engines": {
     "node": "18.x",
     "npm": "9.x"
@@ -74,12 +74,12 @@
     "@ethersproject/wallet": "^5.7.0",
     "@expo/react-native-action-sheet": "^3.9.0",
     "@fingerprintjs/fingerprintjs-pro": "^3.8.1",
-    "@gooddollar/good-design": "0.1.58-beta.d4ddc54b",
+    "@gooddollar/good-design": "0.1.60-beta.6bdc3f93",
     "@gooddollar/goodcontracts": "^2.6.2",
     "@gooddollar/goodprotocol": "^2.0.24",
     "@gooddollar/react-native-facetec": "^1.0.45",
     "@gooddollar/react-native-side-menu": "^2.0.2",
-    "@gooddollar/web3sdk-v2": "0.2.35-beta.d4ddc54b",
+    "@gooddollar/web3sdk-v2": "0.2.35-beta.6bdc3f93",
     "@hcaptcha/react-hcaptcha": "^1.6.0",
     "@indexeddbshim/indexeddbshim": "^6.5.0",
     "@lingui/react": "^3.13.0",
@@ -184,6 +184,7 @@
     "react-native-gesture-handler": "^1.10.3",
     "react-native-get-random-values": "^1.9.0",
     "react-native-image-crop-picker": "^0.36.4",
+    "react-native-image-picker": "5.3.1",
     "react-native-image-resizer": "^1.4.5",
     "react-native-level-fs": "^3.0.1",
     "react-native-linear-gradient": "^2.8.3",

src/components/common/layout/Wrapper.jsx

@@ -70,7 +70,7 @@ const getStylesFromProps = ({ theme }) => {
       ...styles.container,
       maxHeight: theme.sizes.maxContentHeightForTabletAndDesktop,
       ...Platform.select({
-        web: { overflowY: 'auto', overflowX: 'auto' },
+        web: { overflowY: 'auto' },
       }),
     }
   }

src/components/faceVerification/screens/IntroScreen.jsx

@@ -69,7 +69,7 @@ const WalletDeletedPopupText = ({ styles }) => (
 )
 
 const IntroReVerification = ({ styles, firstName, ready, onVerify, onLearnMore }) => (
-  <Wrapper>
+  <Wrapper withMaxHeight={false}>
     <Section style={styles.topContainer} grow>
       <View style={styles.mainContent}>
         <Section.Title fontWeight="bold" textTransform="none" style={styles.mainTitle}>
@@ -111,7 +111,7 @@ const IntroReVerification = ({ styles, firstName, ready, onVerify, onLearnMore }
 )
 
 const Intro = ({ styles, firstName, ready, onVerify, onLearnMore }) => (
-  <Wrapper>
+  <Wrapper withMaxHeight={false}>
     <Section style={styles.topContainer} grow>
       <View style={styles.mainContent}>
         <Section.Title fontWeight="bold" textTransform="none" style={styles.mainTitle}>

src/components/goodid/Claim.jsx

@@ -1,7 +1,7 @@
 import React, { useCallback, useContext } from 'react'
 import { ClaimProvider, ClaimWizard, GoodIdProvider } from '@gooddollar/good-design'
 import { NewsFeedProvider, SupportedChains } from '@gooddollar/web3sdk-v2'
-import { noop } from 'lodash'
+import { isEmpty, noop } from 'lodash'
 import { Platform, View } from 'react-native'
 import { t } from '@lingui/macro'
 import moment from 'moment'
@@ -43,11 +43,16 @@ const ClaimPageWrapper = ({ screenProps, styles }) => {
   const { switchNetwork } = useSwitchNetwork()
   const { showDialog } = useDialog()
 
-  const payload = useFlagWithPayload('next-tasks')
+  const nxTasks = useFlagWithPayload('next-tasks')
+  const feedEnabled = useFlagWithPayload('goodid-newsfeed')
 
-  const { tasks } = payload
+  const { tasks } = nxTasks
 
   const onClaimSuccess = useCallback(async () => {
+    if (isEmpty(tasks)) {
+      return
+    }
+
     const today = moment().format('YYYY-MM-DD')
     const shownTasksToday = await AsyncStorage.getItem('shownTasksToday')
 
@@ -82,7 +87,7 @@ const ClaimPageWrapper = ({ screenProps, styles }) => {
           activePoolAddresses={Config.UBIPoolAddresses}
           explorerEndPoints={Config.goodIdExplorerUrls}
           onSwitchChain={switchNetwork}
-          withNewsFeed={false}
+          withNewsFeed={feedEnabled}
           onSuccess={onClaimSuccess}
           onUpgrade={onUpgrade}
         >

src/lib/hooks/useFeatureFlags.js

@@ -12,6 +12,8 @@ const defaultFeatureFlags = {
   'micro-bridge': true,
   'send-receive-feature': true,
   'dashboard-buttons': true,
+  'goodid-newsfeed': false,
+  'gw-deprecation-dialog': false,
 }
 
 const defaultFlagsWithPayload = {

yarn.lock

@@ -6648,9 +6648,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@gooddollar/good-design@npm:0.1.58-beta.d4ddc54b":
-  version: 0.1.58-beta.d4ddc54b
-  resolution: "@gooddollar/good-design@npm:0.1.58-beta.d4ddc54b"
+"@gooddollar/good-design@npm:0.1.60-beta.6bdc3f93":
+  version: 0.1.60-beta.6bdc3f93
+  resolution: "@gooddollar/good-design@npm:0.1.60-beta.6bdc3f93"
   dependencies:
     "@babel/core": ^7.18.10
     "@babel/runtime": ^7.18.9
@@ -6678,7 +6678,7 @@ __metadata:
     react-inlinesvg: 2.3.0
     react-native: 0.70.4
     react-native-fs: ^2.20.0
-    react-native-image-picker: ^7.1.2
+    react-native-image-picker: 5.3.1
     react-native-mask-input: ^1.2.2
     react-native-paper: 3.12.0
     react-native-safe-area-context: ^3.3.2
@@ -6694,29 +6694,29 @@ __metadata:
     react-use-promise: ^0.5.0
     react-use-wizard: ^2.3.0
     require-from-string: ^2.0.2
-  checksum: 7c4bc3d42b2261029a9bb449f95935e7929cb68fefb439e34dee26412b199f1f40670e30d26a0dd3209527a3eb984a66d6da0a7541d60f57e36550b87dcd856e
+  checksum: a3a64ccae68d95932d12d94cf60e5044c1648db8cced7e5ce87945cb54e3fc7a4cabe924a7f35e4514bcac82f2d553f030d233d906865225c4f04584046c50d8
   languageName: node
   linkType: hard
 
-"@gooddollar/goodcollective-contracts@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "@gooddollar/goodcollective-contracts@npm:1.1.0"
-  checksum: a62c05c62db405b1ed21540916cc13a896e1610da88e6b3a45ecad296b803a9bbeb551f1205089579bbfad1daa4e6e8328d712d5bfaa54462af65763cd0f4749
+"@gooddollar/goodcollective-contracts@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "@gooddollar/goodcollective-contracts@npm:1.2.0"
+  checksum: a4acf64ebcaebc6621d90d0c599075a629aa5e2f91c720874d6aa5520d87043f617d2030c5fdf422eb018b9436b6bcd29c6c826a147c1da2a56f937ddd3a8c5d
   languageName: node
   linkType: hard
 
-"@gooddollar/goodcollective-sdk@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "@gooddollar/goodcollective-sdk@npm:1.1.2"
+"@gooddollar/goodcollective-sdk@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "@gooddollar/goodcollective-sdk@npm:1.2.1"
   dependencies:
-    "@gooddollar/goodcollective-contracts": ^1.1.0
+    "@gooddollar/goodcollective-contracts": ^1.2.0
     "@superfluid-finance/sdk-core": ^0.6.12
     "@web3-storage/w3up-client": ^15.0.0
     ethereum-multicall: ^2.24.0
     graphql: ^16.7.1
   peerDependencies:
     ethers: ^5.*
-  checksum: d68e2033ef1c8f600ef12d4d12cf4d3f2d593e562eabb6df0ea07e02c9257276db72f8c63e3f5706e4ad504d0623c2e27a7135ff190a55540e5de9cee77c877c
+  checksum: 5637adb5ee8651e8a0b0dc37984ec27fefe73d427116bb1498b19de6ce440d391be209184a68c323f3b2a2ab09f1cd6bd88d0b0e99c1572b2e4815167cb31caf
   languageName: node
   linkType: hard
 
@@ -6753,12 +6753,12 @@ __metadata:
     "@ethersproject/wallet": ^5.7.0
     "@expo/react-native-action-sheet": ^3.9.0
     "@fingerprintjs/fingerprintjs-pro": ^3.8.1
-    "@gooddollar/good-design": 0.1.58-beta.d4ddc54b
+    "@gooddollar/good-design": 0.1.60-beta.6bdc3f93
     "@gooddollar/goodcontracts": ^2.6.2
     "@gooddollar/goodprotocol": ^2.0.24
     "@gooddollar/react-native-facetec": ^1.0.45
     "@gooddollar/react-native-side-menu": ^2.0.2
-    "@gooddollar/web3sdk-v2": 0.2.35-beta.d4ddc54b
+    "@gooddollar/web3sdk-v2": 0.2.35-beta.6bdc3f93
     "@hcaptcha/react-hcaptcha": ^1.6.0
     "@indexeddbshim/indexeddbshim": ^6.5.0
     "@lingui/cli": ^3.13.0
@@ -6930,6 +6930,7 @@ __metadata:
     react-native-gesture-handler: ^1.10.3
     react-native-get-random-values: ^1.9.0
     react-native-image-crop-picker: ^0.36.4
+    react-native-image-picker: 5.3.1
     react-native-image-resizer: ^1.4.5
     react-native-level-fs: ^3.0.1
     react-native-linear-gradient: ^2.8.3
@@ -7061,9 +7062,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@gooddollar/web3sdk-v2@npm:0.2.35-beta.d4ddc54b":
-  version: 0.2.35-beta.d4ddc54b
-  resolution: "@gooddollar/web3sdk-v2@npm:0.2.35-beta.d4ddc54b"
+"@gooddollar/web3sdk-v2@npm:0.2.35-beta.6bdc3f93":
+  version: 0.2.35-beta.6bdc3f93
+  resolution: "@gooddollar/web3sdk-v2@npm:0.2.35-beta.6bdc3f93"
   dependencies:
     "@amplitude/analytics-browser": ^1.6.4
     "@amplitude/analytics-react-native": ^0.7.0
@@ -7072,8 +7073,8 @@ __metadata:
     "@ceramicnetwork/stream-tile": ^2.31.0
     "@gooddollar/bridge-app": ^1.5.0
     "@gooddollar/bridge-contracts": ^1.0.17
-    "@gooddollar/goodcollective-contracts": ^1.1.0
-    "@gooddollar/goodcollective-sdk": ^1.1.2
+    "@gooddollar/goodcollective-contracts": ^1.2.0
+    "@gooddollar/goodcollective-sdk": ^1.2.1
     "@gooddollar/goodprotocol": ^2.0.24
     "@orbisclub/orbis-sdk": ^0.4.87
     "@react-native-community/geolocation": 3.1.0
@@ -7114,7 +7115,7 @@ __metadata:
     "@usedapp/core": "*"
     react-native: "*"
     react-native-web: "*"
-  checksum: f6d5cf4f5c73ad7aec59b63e45200035ce0b2117b95761fa70f99243f02c45c8918e20d4dc509bd6d2e831b5d0b5c932e9ec8a776ed5cfdaed7d8054f54c82c2
+  checksum: e83f091c969194017f729703abf3c0e81544bad8737c084fdb5fc846096619451d72b6c5da3a2d7a05418763bcd2737460d13d354c46d7b7fbe7c909660726ee
   languageName: node
   linkType: hard
 
@@ -42355,13 +42356,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-image-picker@npm:^7.1.2":
-  version: 7.1.2
-  resolution: "react-native-image-picker@npm:7.1.2"
+"react-native-image-picker@npm:5.3.1":
+  version: 5.3.1
+  resolution: "react-native-image-picker@npm:5.3.1"
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: af52328b7cb06c28549442f0d923cfa92dde8d5a968a642336df4c882f81adbf0e5e606a14de27f96883a76fa1e03230061c4080011c9107942edebc8e09c478
+  checksum: 183485e9bab619938ab608fbca019c53c049e73bc798ea5ab4ab38d54ee2b7b9dc923b27f26ae070c9b4844af2b521fbd310e1c2f5aea99e851b7abbbcf7f166
   languageName: node
   linkType: hard