diff --git a/app/screens/settings-screen/account/login-methods-hook.ts b/app/screens/settings-screen/account/login-methods-hook.ts index 07284bac91..52adbd3598 100644 --- a/app/screens/settings-screen/account/login-methods-hook.ts +++ b/app/screens/settings-screen/account/login-methods-hook.ts @@ -17,7 +17,6 @@ gql` export const useLoginMethods = () => { const { isAtLeastLevelZero } = useLevel() const { data, loading } = useLoginMethodsQuery({ - fetchPolicy: "cache-and-network", skip: !isAtLeastLevelZero, }) diff --git a/app/screens/settings-screen/account/show-warning-secure-account-hook.ts b/app/screens/settings-screen/account/show-warning-secure-account-hook.ts index 7dd9d05869..18171dafeb 100644 --- a/app/screens/settings-screen/account/show-warning-secure-account-hook.ts +++ b/app/screens/settings-screen/account/show-warning-secure-account-hook.ts @@ -39,7 +39,7 @@ export const useShowWarningSecureAccount = () => { skip: !isAuthed, }) - if (data?.me?.defaultAccount.level !== "ZERO") return false + if (data?.me?.defaultAccount?.level !== "ZERO") return false const btcWallet = getBtcWallet(data?.me?.defaultAccount?.wallets) const usdWallet = getUsdWallet(data?.me?.defaultAccount?.wallets) diff --git a/app/screens/settings-screen/settings/account-default-wallet.tsx b/app/screens/settings-screen/settings/account-default-wallet.tsx index 110de09f68..df77bac8c7 100644 --- a/app/screens/settings-screen/settings/account-default-wallet.tsx +++ b/app/screens/settings-screen/settings/account-default-wallet.tsx @@ -9,6 +9,7 @@ import { RootStackParamList } from "@app/navigation/stack-param-lists" import { gql } from "@apollo/client" import { getBtcWallet } from "@app/graphql/wallets-utils" import { useDefaultWalletQuery } from "@app/graphql/generated" +import { useIsAuthed } from "@app/graphql/is-authed-context" gql` query DefaultWallet { @@ -27,9 +28,14 @@ gql` export const DefaultWallet: React.FC = () => { const { LL } = useI18nContext() + const isAuthed = useIsAuthed() const { navigate } = useNavigation>() - const { data, loading } = useDefaultWalletQuery() + const { data, loading } = useDefaultWalletQuery({ + fetchPolicy: "cache-first", + skip: !isAuthed, + }) + const btcWallet = getBtcWallet(data?.me?.defaultAccount?.wallets) const btcWalletId = btcWallet?.id diff --git a/app/screens/settings-screen/totp.tsx b/app/screens/settings-screen/totp.tsx index 9ceba57b85..85bf7fd7d8 100644 --- a/app/screens/settings-screen/totp.tsx +++ b/app/screens/settings-screen/totp.tsx @@ -43,13 +43,7 @@ export const TotpSetting: React.FC = () => { const [spinner, setSpinner] = useState(false) - const { - data, - loading, - refetch: refetchTotpSettings, - } = useTotpSettingQuery({ - fetchPolicy: "no-cache", - }) + const { data, loading, refetch: refetchTotpSettings } = useTotpSettingQuery() const [totpDeleteMutation] = useUserTotpDeleteMutation() const totpEnabled = Boolean(data?.me?.totpEnabled) diff --git a/ios/GaloyApp.xcodeproj/project.pbxproj b/ios/GaloyApp.xcodeproj/project.pbxproj index c0a0d1c82d..0e760dbb45 100644 --- a/ios/GaloyApp.xcodeproj/project.pbxproj +++ b/ios/GaloyApp.xcodeproj/project.pbxproj @@ -562,7 +562,8 @@ OTHER_CPLUSPLUSFLAGS = "$(inherited)"; OTHER_LDFLAGS = ( "$(inherited)", - " ", + "-Wl", + "-ld_classic", ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; @@ -628,7 +629,8 @@ OTHER_CPLUSPLUSFLAGS = "$(inherited)"; OTHER_LDFLAGS = ( "$(inherited)", - " ", + "-Wl", + "-ld_classic", ); REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; diff --git a/ios/Podfile.lock b/ios/Podfile.lock index f39a6ff737..dd2880ff18 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -659,7 +659,7 @@ PODS: - React-Core - RNSecureRandom (1.0.1): - React - - RNShare (9.4.1): + - RNShare (10.0.2): - React-Core - RNSVG (14.0.0): - React-Core @@ -944,7 +944,7 @@ SPEC CHECKSUMS: AppCheckCore: 4687c03428947d5b26a6bf9bb5566b39f5473bf1 boost: 57d2868c099736d80fcd648bf211b4431e51a558 BVLinearGradient: 880f91a7854faff2df62518f0281afb1c60d49a3 - DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953 + DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 FBLazyVector: 5fbbff1d7734827299274638deb8ba3024f6c597 FBReactNativeSpec: 638095fe8a01506634d77b260ef8a322019ac671 Firebase: 414ad272f8d02dfbf12662a9d43f4bba9bec2a06 @@ -962,7 +962,7 @@ SPEC CHECKSUMS: FirebaseSessions: f90fe9212ee2818641eda051c0835c9c4e30d9ae FirebaseSharedSwift: 62e248642c0582324d0390706cadd314687c116b fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 - glog: 035f1e36e53b355cf70f6434d161b36e7d21fecd + glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b GoogleAppMeasurement: 70ce9aa438cff1cfb31ea3e660bcc67734cb716e GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2 GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34 @@ -1036,7 +1036,7 @@ SPEC CHECKSUMS: RNReanimated: ab2e96c6d5591c3dfbb38a464f54c8d17fb34a87 RNScreens: 3c2d122f5e08c192e254c510b212306da97d2581 RNSecureRandom: 07efbdf2cd99efe13497433668e54acd7df49fef - RNShare: 32e97adc8d8c97d4a26bcdd3c45516882184f8b6 + RNShare: 859ff710211285676b0bcedd156c12437ea1d564 RNSVG: 255767813dac22db1ec2062c8b7e7b856d4e5ae6 RNVectorIcons: 23b6e11af4aaf104d169b1b0afa7e5cf96c676ce SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17