Skip to content

Commit

Permalink
fixes for redtent flow and android styling, chore: bump gd sdk's
Browse files Browse the repository at this point in the history
  • Loading branch information
L03TJ3 committed Dec 3, 2024
1 parent c0b8e50 commit 2583f5b
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .env.development
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ REACT_APP_POSTHOG_KEY=phc_LdONpa7dZNYaP8AZSgZVRW02BZU4FSyHQcm7YFM2FEB
# 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_UBIPOOL_ADDRESSES='{"ALT": "0xa6d77aa130e729886c90a48e0ee539d6c6795df7", "NG": "0x77253761353271813c1aca275de8eec768b217c5", "CO": "0x627dbf00ce1a54067f5a34d6596a217a029c1532"}'
REACT_APP_GOOD_GOODCOLLECTIVE_EXPLORER='https://dev-goodcollective.vercel.app/'
#needs to end with newline
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.4.1-beta.beeff9d3",
"@gooddollar/good-design": "0.4.1-beta.8725c620",
"@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.4.1-beta.beeff9d3",
"@gooddollar/web3sdk-v2": "0.4.1-beta.8725c620",
"@hcaptcha/react-hcaptcha": "^1.6.0",
"@indexeddbshim/indexeddbshim": "^6.5.0",
"@lingui/react": "^3.13.0",
Expand Down
2 changes: 1 addition & 1 deletion src/components/goodid/Claim.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ const ClaimPageWrapper = ({ screenProps, styles }) => {
<View style={styles.wrapper}>
<GoodIdProvider>
<ClaimProvider
activePoolAddresses={Config.UBIPoolAddresses.split(',')}
activePoolAddresses={Config.UBIPoolAddresses}
explorerEndPoints={Config.goodIdExplorerUrls}
onSwitchChain={switchNetwork}
withNewsFeed={feedEnabled}
Expand Down
8 changes: 5 additions & 3 deletions src/components/profile/Profile.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,11 @@ const ProfileWrapper = ({ screenProps, styles }) => {
<ProfileDataTable profile={profile} showCustomFlag />

<Section grow justifyContent="flex-end" style={{ width: '100%', paddingLeft: 0, paddingRight: 0, margin: 0 }}>
<Section.Row>
<IdentifierRow title="FaceId" address={faceRecordId} withCopy />
</Section.Row>
{Config.env === 'development' || whitelist?.includes(account) ? (
<Section.Row>
<IdentifierRow title="FaceId" address={faceRecordId} withCopy />
</Section.Row>
) : null}
{logMethod ? (
<Section.Row>
<IdentifierRow title="LoginM" text={logMethod} />
Expand Down
2 changes: 1 addition & 1 deletion src/config/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ const ethereum = {
},
}

const UBIPoolAddresses = env.REACT_APP_UBIPOOL_ADDRESSES ?? ''
const UBIPoolAddresses = env.REACT_APP_UBIPOOL_ADDRESSES ? JSON.parse(env.REACT_APP_UBIPOOL_ADDRESSES) : {}

const notifyOptsTest = {
notificationSchedule: 'minute', // repeat in each minute
Expand Down
23 changes: 11 additions & 12 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6648,9 +6648,9 @@ __metadata:
languageName: node
linkType: hard

"@gooddollar/good-design@npm:0.4.1-beta.beeff9d3":
version: 0.4.1-beta.beeff9d3
resolution: "@gooddollar/good-design@npm:0.4.1-beta.beeff9d3"
"@gooddollar/good-design@npm:0.4.1-beta.8725c620":
version: 0.4.1-beta.8725c620
resolution: "@gooddollar/good-design@npm:0.4.1-beta.8725c620"
dependencies:
"@babel/core": ^7.18.10
"@babel/runtime": ^7.18.9
Expand Down Expand Up @@ -6680,7 +6680,6 @@ __metadata:
react-native-fs: ^2.20.0
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
react-native-svg: 13.14.0
react-native-svg-transformer: ^1.5.0
Expand All @@ -6694,7 +6693,7 @@ __metadata:
react-use-promise: ^0.5.0
react-use-wizard: ^2.3.0
require-from-string: ^2.0.2
checksum: b83b0da8e8d6ce2131063b8f4d4dcea3b36884961b4577118589eacb18ee1dfba56ef905d02ecc40f1625e37a048a98e552754ca2d5e169571998795d33a3433
checksum: 41bd1d0ea7cb494df3a41c2e8f269f16b0238aa0db395112917115cec36f9469164a6ed541ea68aed1dd14d0c14b93d17ee2162e9f3d472796db8b04829e5dde
languageName: node
linkType: hard

Expand Down Expand Up @@ -6753,12 +6752,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.4.1-beta.beeff9d3
"@gooddollar/good-design": 0.4.1-beta.8725c620
"@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.4.1-beta.beeff9d3
"@gooddollar/web3sdk-v2": 0.4.1-beta.8725c620
"@hcaptcha/react-hcaptcha": ^1.6.0
"@indexeddbshim/indexeddbshim": ^6.5.0
"@lingui/cli": ^3.13.0
Expand Down Expand Up @@ -7062,9 +7061,9 @@ __metadata:
languageName: node
linkType: hard

"@gooddollar/web3sdk-v2@npm:0.4.1-beta.beeff9d3":
version: 0.4.1-beta.beeff9d3
resolution: "@gooddollar/web3sdk-v2@npm:0.4.1-beta.beeff9d3"
"@gooddollar/web3sdk-v2@npm:0.4.1-beta.8725c620":
version: 0.4.1-beta.8725c620
resolution: "@gooddollar/web3sdk-v2@npm:0.4.1-beta.8725c620"
dependencies:
"@amplitude/analytics-browser": ^1.6.4
"@amplitude/analytics-react-native": ^0.7.0
Expand Down Expand Up @@ -7115,7 +7114,7 @@ __metadata:
"@usedapp/core": "*"
react-native: "*"
react-native-web: "*"
checksum: d2909a0aee38970cc88c162f421993d0dac3a4fe5688f5f8a39026d9c57904170b135dc2003e0bf5a2ecbcbc55dedec439088470c7502e19357feb5e161daf3a
checksum: bdcac962bb0afb0fd01ed2280b2275d28e09e9a16067dcc32d7b55491c3206c50aa784b06d94d162e17c60718e23396f4d1b12cdff24c6e18dffe04f31132487
languageName: node
linkType: hard

Expand Down Expand Up @@ -42287,7 +42286,7 @@ __metadata:
languageName: node
linkType: hard

"react-native-paper@npm:3.12.0, react-native-paper@npm:^3.4.0":
"react-native-paper@npm:^3.4.0":
version: 3.12.0
resolution: "react-native-paper@npm:3.12.0"
dependencies:
Expand Down

0 comments on commit 2583f5b

Please sign in to comment.