diff --git a/src/Components/AuthInput/styles.ts b/src/Components/AuthInput/styles.ts
index 4aba543b..e408fbb9 100644
--- a/src/Components/AuthInput/styles.ts
+++ b/src/Components/AuthInput/styles.ts
@@ -10,12 +10,12 @@ export default StyleSheet.create({
},
inputBox: {
height: 40,
- width: 310,
+ width: '100%',
borderBottomWidth: 0.75,
borderColor: colors.darkGrey,
},
halfWidth: {
- width: 140,
+ width: '100%',
},
inputFocused: {
borderBottomWidth: 2,
diff --git a/src/app/(Authentication)/Login/Email/styles.ts b/src/app/(Authentication)/Login/Email/styles.ts
index ad53bbb7..83958404 100644
--- a/src/app/(Authentication)/Login/Email/styles.ts
+++ b/src/app/(Authentication)/Login/Email/styles.ts
@@ -46,7 +46,6 @@ export default StyleSheet.create({
errorMessageBox: {
marginTop: 13,
height: 50,
- width: 310,
},
errorMessageText: {
color: colors.darkRed,
@@ -57,7 +56,6 @@ export default StyleSheet.create({
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'space-between',
- width: 310,
marginTop: 70,
},
ButtonLine: {
diff --git a/src/app/(Authentication)/Login/Password/index.tsx b/src/app/(Authentication)/Login/Password/index.tsx
index 1b635c74..565f6cb3 100644
--- a/src/app/(Authentication)/Login/Password/index.tsx
+++ b/src/app/(Authentication)/Login/Password/index.tsx
@@ -38,44 +38,51 @@ export default function LoginScreen() {
return (
- router.back()}>
-
-
- Please enter your password.
-
-
-
-
+
+ router.back()}
+ >
+
+
+ Please enter your password.
-
-
- {errorExists ? errorMessage : ' '}
-
-
+
+
+
-
- router.push('/OTPFlow/OTPEmailInput')}>
- Forgot password?
-
+
+
+ {errorExists ? errorMessage : ' '}
+
+
-
- signIn()}
- disabled={password === '' || errorExists}
+
+ router.push('/OTPFlow/OTPEmailInput')}
>
-
- Next
-
-
-
+ Forgot password?
+
+
+
+ signIn()}
+ disabled={password === '' || errorExists}
+ >
+
+ Next
+
+
+
+
diff --git a/src/app/(Authentication)/Login/Password/styles.ts b/src/app/(Authentication)/Login/Password/styles.ts
index eaa07d05..c4fffe00 100644
--- a/src/app/(Authentication)/Login/Password/styles.ts
+++ b/src/app/(Authentication)/Login/Password/styles.ts
@@ -11,6 +11,9 @@ export default StyleSheet.create({
height: '100%',
width: '100%',
},
+ contentContainer: {
+ width: '81%',
+ },
backText: {
color: colors.midGrey,
fontSize: 16,
@@ -37,7 +40,6 @@ export default StyleSheet.create({
errorMessageBox: {
marginTop: 13,
height: 50,
- width: 310,
},
errorMessageText: {
color: colors.darkRed,
@@ -51,7 +53,6 @@ export default StyleSheet.create({
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'space-between',
- width: 310,
marginTop: 70,
},
forgotPasswordText: {
diff --git a/src/app/(Authentication)/OTPFlow/OTPEmailInput/styles.tsx b/src/app/(Authentication)/OTPFlow/OTPEmailInput/styles.tsx
index 72ef5f57..d61a1e65 100644
--- a/src/app/(Authentication)/OTPFlow/OTPEmailInput/styles.tsx
+++ b/src/app/(Authentication)/OTPFlow/OTPEmailInput/styles.tsx
@@ -56,7 +56,6 @@ export default StyleSheet.create({
errorMessageBox: {
marginTop: 13,
height: 50,
- width: 310,
},
errorMessageText: {
color: colors.darkRed,
@@ -70,7 +69,6 @@ export default StyleSheet.create({
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'space-between',
- width: 310,
marginTop: 70,
},
forgotPasswordText: {
diff --git a/src/app/(Authentication)/OTPFlow/OTPNewPassword/index.tsx b/src/app/(Authentication)/OTPFlow/OTPNewPassword/index.tsx
index e4e9552a..251057de 100644
--- a/src/app/(Authentication)/OTPFlow/OTPNewPassword/index.tsx
+++ b/src/app/(Authentication)/OTPFlow/OTPNewPassword/index.tsx
@@ -69,54 +69,56 @@ export default function SignUpScreen() {
return (
-
- router.back()}
- >
- Back
-
-
- Create a new password.
+
+
+ router.back()}
+ >
+ Back
+
+
+ Create a new password.
-
-
-
+
+
+
-
-
-
+
+
+
-
-
- {disableButton ? errorMessage : ' '}
-
-
+
+
+ {disableButton ? errorMessage : ' '}
+
+
-
- Continue
-
-
+
+ Continue
+
+
+
);
}
diff --git a/src/app/(Authentication)/OTPFlow/OTPNewPassword/styles.tsx b/src/app/(Authentication)/OTPFlow/OTPNewPassword/styles.tsx
index 4603c060..f099af85 100644
--- a/src/app/(Authentication)/OTPFlow/OTPNewPassword/styles.tsx
+++ b/src/app/(Authentication)/OTPFlow/OTPNewPassword/styles.tsx
@@ -10,6 +10,9 @@ export default StyleSheet.create({
alignItems: 'center',
justifyContent: 'flex-start',
},
+ contentContainer: {
+ width: '81%',
+ },
header: {
justifyContent: 'flex-start',
flexDirection: 'row',
@@ -47,17 +50,14 @@ export default StyleSheet.create({
fontSize: 14,
opacity: 1,
fontWeight: '600',
+ marginLeft: 15,
},
nextButton: {
- backgroundColor: colors.black,
- alignItems: 'center',
borderRadius: 3,
- borderColor: colors.black,
borderWidth: 1,
- width: 310,
height: 50,
- padding: 15,
flexDirection: 'row',
+ justifyContent: 'space-between',
},
errorMessage: {
color: colors.darkRed,
@@ -66,11 +66,9 @@ export default StyleSheet.create({
marginTop: 10,
marginBottom: 65,
justifyContent: 'flex-start',
- width: 310,
},
inputBox: {
marginTop: 11,
width: '100%',
- alignItems: 'center',
},
});
diff --git a/src/app/(Authentication)/SignUp/Address/index.tsx b/src/app/(Authentication)/SignUp/Address/index.tsx
index 22d971fc..560ec6fa 100644
--- a/src/app/(Authentication)/SignUp/Address/index.tsx
+++ b/src/app/(Authentication)/SignUp/Address/index.tsx
@@ -99,7 +99,7 @@ export default function SignUpScreen() {
-
+
-
+
-
+
router.back()}
diff --git a/src/app/(Authentication)/SignUp/Email/styles.ts b/src/app/(Authentication)/SignUp/Email/styles.ts
index 43543638..981cc751 100644
--- a/src/app/(Authentication)/SignUp/Email/styles.ts
+++ b/src/app/(Authentication)/SignUp/Email/styles.ts
@@ -13,14 +13,12 @@ export default StyleSheet.create({
flexDirection: 'column',
},
contentContainer: {
- marginTop: 100,
+ marginTop: 30,
width: '81%',
- alignItems: 'center',
},
backButton: {
marginTop: 80,
marginBottom: 40,
- marginRight: 180,
},
displayText: {
marginRight: 253,
@@ -46,7 +44,6 @@ export default StyleSheet.create({
},
nextButton: {
borderWidth: 1,
- width: 310,
height: 50,
padding: 15,
flexDirection: 'row',
diff --git a/src/app/(Authentication)/SignUp/Password/index.tsx b/src/app/(Authentication)/SignUp/Password/index.tsx
index 58ada04e..9bf26b9f 100644
--- a/src/app/(Authentication)/SignUp/Password/index.tsx
+++ b/src/app/(Authentication)/SignUp/Password/index.tsx
@@ -71,54 +71,56 @@ export default function SignUpScreen() {
return (
-
- router.back()}
- >
-
-
-
- Next, make a password.
+
+
+ router.back()}
+ >
+
+
+
+ Next, make a password.
-
-
-
+
+
+
-
-
-
+
+
+
-
-
- {disableButton ? errorMessage : ' '}
-
-
+
+
+ {disableButton ? errorMessage : ' '}
+
+
-
- Continue
-
-
+
+ Continue
+
+
+
);
}
diff --git a/src/app/(Authentication)/SignUp/Password/styles.ts b/src/app/(Authentication)/SignUp/Password/styles.ts
index 35f6fccf..68494d4c 100644
--- a/src/app/(Authentication)/SignUp/Password/styles.ts
+++ b/src/app/(Authentication)/SignUp/Password/styles.ts
@@ -10,6 +10,9 @@ export default StyleSheet.create({
alignItems: 'center',
justifyContent: 'flex-start',
},
+ contentContainer: {
+ width: '81%',
+ },
header: {
justifyContent: 'flex-start',
flexDirection: 'row',
@@ -44,14 +47,13 @@ export default StyleSheet.create({
},
nextText: {
color: colors.white,
- marginRight: 200,
+ marginLeft: 15,
fontSize: 14,
opacity: 1,
fontWeight: '600',
},
nextButton: {
- alignItems: 'center',
- width: 310,
+ justifyContent: 'space-between',
height: 50,
padding: 15,
flexDirection: 'row',
@@ -68,6 +70,5 @@ export default StyleSheet.create({
inputBox: {
marginTop: 11,
width: '100%',
- alignItems: 'center',
},
});
diff --git a/src/app/(Authentication)/Welcome/styles.ts b/src/app/(Authentication)/Welcome/styles.ts
index 23c7182b..29f8f572 100644
--- a/src/app/(Authentication)/Welcome/styles.ts
+++ b/src/app/(Authentication)/Welcome/styles.ts
@@ -37,6 +37,7 @@ export default StyleSheet.create({
orLine: {
flexDirection: 'row',
marginBottom: 7.5,
+ width: '89%',
},
orStyle: {
fontWeight: '200',
@@ -57,7 +58,6 @@ export default StyleSheet.create({
marginLeft: 10,
},
baseButton: {
- width: 310,
height: 55,
borderRadius: 3,
borderBottomWidth: 2.25,
diff --git a/src/app/(BottomTabNavigation)/Profile/EditAddress/index.tsx b/src/app/(BottomTabNavigation)/Profile/EditAddress/index.tsx
index 68b86ee7..a89d6495 100644
--- a/src/app/(BottomTabNavigation)/Profile/EditAddress/index.tsx
+++ b/src/app/(BottomTabNavigation)/Profile/EditAddress/index.tsx
@@ -95,7 +95,7 @@ function EditNameScreen() {
/>
-
+
-
+