Merge branch 'main' of github.com:ikascom/ikas-examples

ikascom · Nov 29, 2022 · befbb72 · befbb72
2 parents 6b1ddd6 + d5cddaa
commit befbb72
Show file tree

Hide file tree

Showing 10 changed files with 342 additions and 741 deletions.
diff --git a/ikas-theme/.ikas/settings-1663766627346.json b/ikas-theme/.ikas/settings-1663766627346.json
diff --git a/ikas-theme/public/locales/en/account.json b/ikas-theme/public/locales/en/account.json
@@ -36,7 +36,6 @@
     "noAddressPlaceholder": "You do not have a registered address. Please create an address below.",
     "form": {
       "title": "Address Title",
-      "titlePlaceholder": "home, work etc...",
       "firstName": "Name",
       "lastName": "Surname",
       "addressLine1": "Address",
@@ -47,14 +46,27 @@
       "city": "City",
       "district": "District",
       "phone": "Phone",
-      "phonePlaceholder": "example: +905551112233"
+      "placeholder": {
+        "title": "home, work etc...",
+        "firstName": "Name",
+        "lastName": "Surname",
+        "addressLine1": "Address",
+        "addressLine2": "Apartment",
+        "postalCode": "Zip code",
+        "country": "Country",
+        "state": "State",
+        "city": "City",
+        "district": "District",
+        "phone": "example: +905551112233"
+      }
     },
     "email": "Email",
     "save": "Save",
     "delete": "Delete",
     "deleteConfirm": "Do you really want to delete this address?",
     "requiredRule": "Required",
-    "phoneRule": "{{ phoneNumber }} is not a valid phone number"
+    "phoneRule": "{{ phoneNumber }} is not a valid phone number",
+    "invalidRule": "Field is invalid"
   },
   "favoriteProducts": {
     "title": "My Favorites",

diff --git a/ikas-theme/src/components/account/address/index.tsx b/ikas-theme/src/components/account/address/index.tsx
@@ -9,12 +9,12 @@ import useAddress from "./useAddress";
 import AlertComponent from "src/components/components/alert";
 import Button from "src/components/components/button";
 import CloseIcon from "src/components/svg/close";
+import Header from "../components/header";
+import { useScreen } from "src/utils/hooks/useScreen";
 
 import { NS } from "../";
 
 import * as S from "./style";
-import Header from "../components/header";
-import { useScreen } from "src/utils/hooks/useScreen";
 
 const Address = () => {
   const store = useStore();