fix: rebased

app/graphql/generated.gql

@@ -1468,27 +1468,6 @@ query setDefaultWalletScreen {
   }
 }
 
-query settingsScreen {
-  me {
-    id
-    phone
-    username
-    language
-    defaultAccount {
-      id
-      defaultWalletId
-      wallets {
-        id
-        balance
-        walletCurrency
-        __typename
-      }
-      __typename
-    }
-    __typename
-  }
-}
-
 query supportChat {
   me {
     id
@@ -1622,4 +1601,4 @@ subscription myLnUpdates {
     }
     __typename
   }
-}
+}

app/screens/settings-screen/account/account-screen.tsx

@@ -3,6 +3,7 @@ import { ScrollView } from "react-native-gesture-handler"
 import { Screen } from "@app/components/screen"
 import { useLevel } from "@app/graphql/level-context"
 import { useI18nContext } from "@app/i18n/i18n-react"
+import { testProps } from "@app/utils/testProps"
 import { makeStyles } from "@rneui/themed"
 
 import { SettingsGroup } from "../group"
@@ -25,7 +26,10 @@ export const AccountScreen: React.FC = () => {
   return (
     <AccountDeleteContextProvider>
       <Screen keyboardShouldPersistTaps="handled">
-        <ScrollView contentContainerStyle={styles.outer}>
+        <ScrollView
+          contentContainerStyle={styles.outer}
+          {...testProps("account-screen-scroll-view")}
+        >
           <AccountBanner />
           <AccountId />
           <UpgradeTrialAccount />

app/screens/settings-screen/account/id.tsx

@@ -4,7 +4,6 @@ import { View } from "react-native"
 import { GaloyIconButton } from "@app/components/atomic/galoy-icon-button"
 import { useSettingsScreenQuery } from "@app/graphql/generated"
 import { useI18nContext } from "@app/i18n/i18n-react"
-import { testProps } from "@app/utils/testProps"
 import { toastShow } from "@app/utils/toast"
 import Clipboard from "@react-native-clipboard/clipboard"
 import { Skeleton, Text, makeStyles } from "@rneui/themed"

app/screens/settings-screen/button.tsx

@@ -1,3 +1,4 @@
+import { testProps } from "@app/utils/testProps"
 import { Button, Skeleton, makeStyles } from "@rneui/themed"
 
 type Props = {
@@ -15,6 +16,7 @@ export const SettingsButton: React.FC<Props> = ({ title, onPress, variant, loadi
   return (
     <Button
       title={title}
+      {...testProps(title)}
       onPress={onPress}
       titleStyle={styles.titleStyle}
       containerStyle={styles.containerStyle}

app/screens/settings-screen/group.tsx

@@ -17,7 +17,7 @@ export const SettingsGroup: React.FC<{
   return (
     <View>
       {name && (
-        <Text {...testProps(name)} type="p2" bold>
+        <Text {...testProps(name + "-group")} type="p2" bold>
           {name}
         </Text>
       )}

app/screens/settings-screen/settings-screen.tsx

@@ -1,11 +1,7 @@
 import { ScrollView } from "react-native-gesture-handler"
 
 import { gql } from "@apollo/client"
-import ContactModal, {
-  SupportChannels,
-} from "@app/components/contact-modal/contact-modal"
 import { Screen } from "@app/components/screen"
-import { SetLightningAddressModal } from "@app/components/set-lightning-address-modal"
 import { VersionComponent } from "@app/components/version"
 import { AccountLevel, useLevel } from "@app/graphql/level-context"
 import { useI18nContext } from "@app/i18n/i18n-react"

e2e/detox/01-auth.test.ts

@@ -74,8 +74,8 @@ describe("Login/Register Flow", () => {
 
   it("add an email", async () => {
     await tap(by.id("menu"))
-    await tap(by.text(LL.common.account()))
-    await tap(by.text(LL.AccountScreen.emailAuthentication()))
+    await tap(by.id(LL.common.account()))
+    await tap(by.id(LL.AccountScreen.tapToAddEmail()))
 
     const emailInput = element(by.id(LL.EmailRegistrationInitiateScreen.placeholder()))
     await waitFor(emailInput).toBeVisible().withTimeout(timeout)
@@ -130,7 +130,7 @@ describe("Login/Register Flow", () => {
 
   it("verify we are in the same account as we started with", async () => {
     await tap(by.id("menu"))
-    await tap(by.text(LL.common.account()))
+    await tap(by.id(LL.common.account()))
 
     const phoneNumber = element(by.text(ALICE_PHONE))
     await waitFor(phoneNumber).toBeVisible().withTimeout(timeout)

e2e/detox/utils/common-flows.ts

@@ -3,7 +3,7 @@ import { timeout } from "./config"
 import { tap } from "./controls"
 
 export const waitForAccountScreen = async (LL: TranslationFunctions) => {
-  const el = element(by.id(LL.AccountScreen.yourAccountId()))
+  const el = element(by.text(LL.AccountScreen.accountId()))
   await waitFor(el)
     .toBeVisible()
     .withTimeout(timeout * 3)

ios/Podfile.lock

@@ -960,7 +960,7 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  AppCheckCore: 4687c03428947d5b26a6bf9bb5566b39f5473bf1
+  AppCheckCore: d0d4bcb6f90fd9f69958da5350467b79026b38c7
   boost: 57d2868c099736d80fcd648bf211b4431e51a558
   BVLinearGradient: 880f91a7854faff2df62518f0281afb1c60d49a3
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54

typos.toml

@@ -4,6 +4,10 @@ hace = "hace"
 "BA" = "BA"
 "FO" = "FO"
 "Thier" = "Thier"
+"was" = "ws"
+"Was" = "Ws"
+"WAS" = "WS"
+"Enjoing" = "Enjoying"
 
 [files]
 extend-exclude = [
@@ -17,4 +21,5 @@ extend-exclude = [
   "patches",
   "ci/tasks/*",
   "dev/*",
+  "utils/countryInfo.json",
 ]