Merge pull request #322 from EdgeApp/william/rn-cleanup

RN cleanup

Author: thehobbit85

localizeLanguage.js

@@ -1,6 +1,8 @@
-const fs = require('fs')
-const masterStrings = require('./packages/edge-login-ui-rn/src/common/locales/en_US.js')
-fs.writeFileSync(
+import { writeFileSync } from 'fs'
+
+import strings from './packages/edge-login-ui-rn/src/common/locales/en_US'
+
+writeFileSync(
   './packages/edge-login-ui-rn/src/common/locales/strings/enUS.json',
-  JSON.stringify(masterStrings, null, 2)
+  JSON.stringify(strings, null, 2)
 )

package.json

@@ -7,7 +7,7 @@
     "fix": "npm run lint -- --fix",
     "flow": "flow",
     "lint": "eslint .",
-    "precommit": "node localizeLanguage.js && lint-staged && flow",
+    "precommit": "node -r sucrase/register localizeLanguage.js && lint-staged && flow",
     "prepare": "lerna exec yarn prepare"
   },
   "husky": {
@@ -38,6 +38,7 @@
     "husky": "^4.3.0",
     "lerna": "^3.16.4",
     "lint-staged": "^10.5.3",
-    "prettier": "^2.2.0"
+    "prettier": "^2.2.0",
+    "sucrase": "^3.19.0"
   }
 }

packages/edge-login-ui-rn/package.json

@@ -33,7 +33,7 @@
     "cleaners": "^0.3.1",
     "qrcode-generator": "^1.4.4",
     "react-native-airship": "^0.2.6",
-    "react-native-extra-dimensions-android": "^1.2.5",
+    "react-native-gesture-handler": "^1.10.3",
     "react-native-keyboard-aware-scroll-view": "^0.9.1",
     "react-native-linear-gradient": "^2.0.0",
     "react-native-localize": "^2.0.2",

packages/edge-login-ui-rn/src/actions/CreateAccountActions.js

@@ -8,7 +8,6 @@ import * as Constants from '../constants/index.js'
 import { enableTouchId, isTouchDisabled } from '../keychain.js'
 import type { Dispatch, GetState, Imports } from '../types/ReduxTypes.js'
 import { logEvent } from '../util/analytics.js'
-import { isASCII } from '../util/ASCIIUtil.js'
 import { getPreviousUsers, setMostRecentUsers } from './PreviousUsersActions.js'
 
 export type CreateUserData = {
@@ -56,6 +55,11 @@ export function checkUsernameForAvailabilty(data: string) {
       })
 }
 
+function isASCII(str: string) {
+  // eslint-disable-next-line no-control-regex
+  return /^[\x00-\x7F]*$/.test(str)
+}
+
 export function validateUsername(data: string) {
   return (dispatch: Dispatch, getState: GetState, imports: Imports) => {
     // TODO evaluate client side evaluations.

packages/edge-login-ui-rn/src/assets/index.js

@@ -1,39 +1,20 @@
 // @flow
 
-const LOGO_DOT = require('./logoHolderDot.png')
-const LOGO_BIG = require('./edgeLogo/Edge_logo_L.png')
-const LOGO_SMALL = require('./edgeLogo/Edge_logo_S.png')
-const REVIEW_CHECKED = require('./icons/review/check.png')
-const REVIEW_UNCHECKED = require('./icons/review/unchecked.png')
-const STANDARD_CHECKED = require('./icons/standard/password_show.png')
-const STANDARD_UNCHECKED = require('./icons/standard/password_hide.png')
-const PASSWORD_REQ_CHECKED = require('./icons/passwordRequirements/checked.png')
-const PASSWORD_REQ_UNCHECKED = require('./icons/passwordRequirements/unchecked.png')
-const PERMISSIONS_CAMREA = require('./icons/permissions/permissions-camera.png')
-const WELCOME_LOCK = require('./icons/welcome/lock.png')
-const WELCOME_SHIELD_KEY = require('./icons/welcome/shield_key.png')
-const TOUCH = require('./touch/touchid.png')
-const OTP = require('./icons/otp/OTP-badge.png')
-const OTP_SMALL = require('./icons/otp/OTP-badge_sm.png')
-const OTP_DISABLE = require('./icons/otp/OTP-disable.png')
-const FACE_ID = require('./touch/face-id.png')
-const TOUCH_ID = require('./touch/touch-id.png')
-
-export { LOGO_BIG }
-export { LOGO_DOT }
-export { LOGO_SMALL }
-export { REVIEW_CHECKED }
-export { REVIEW_UNCHECKED }
-export { STANDARD_CHECKED }
-export { STANDARD_UNCHECKED }
-export { PASSWORD_REQ_CHECKED }
-export { PASSWORD_REQ_UNCHECKED }
-export { PERMISSIONS_CAMREA }
-export { WELCOME_LOCK }
-export { WELCOME_SHIELD_KEY }
-export { TOUCH }
-export { OTP }
-export { OTP_SMALL }
-export { OTP_DISABLE }
-export { FACE_ID }
-export { TOUCH_ID }
+export const LOGO_DOT = require('./logoHolderDot.png')
+export const LOGO_BIG = require('./edgeLogo/Edge_logo_L.png')
+export const LOGO_SMALL = require('./edgeLogo/Edge_logo_S.png')
+export const REVIEW_CHECKED = require('./icons/review/check.png')
+export const REVIEW_UNCHECKED = require('./icons/review/unchecked.png')
+export const STANDARD_CHECKED = require('./icons/standard/password_show.png')
+export const STANDARD_UNCHECKED = require('./icons/standard/password_hide.png')
+export const PASSWORD_REQ_CHECKED = require('./icons/passwordRequirements/checked.png')
+export const PASSWORD_REQ_UNCHECKED = require('./icons/passwordRequirements/unchecked.png')
+export const PERMISSIONS_CAMREA = require('./icons/permissions/permissions-camera.png')
+export const WELCOME_LOCK = require('./icons/welcome/lock.png')
+export const WELCOME_SHIELD_KEY = require('./icons/welcome/shield_key.png')
+export const TOUCH = require('./touch/touchid.png')
+export const OTP = require('./icons/otp/OTP-badge.png')
+export const OTP_SMALL = require('./icons/otp/OTP-badge_sm.png')
+export const OTP_DISABLE = require('./icons/otp/OTP-disable.png')
+export const FACE_ID = require('./touch/face-id.png')
+export const TOUCH_ID = require('./touch/touch-id.png')

packages/edge-login-ui-rn/src/common/locales/en_US.js

@@ -1,5 +1,6 @@
 // @flow
-const strings = {
+
+export default {
   app_name_default: 'Edge',
   edge_site: 'https://edge.app/',
   login_button: 'Login',
@@ -280,5 +281,3 @@ const strings = {
     'Name the make, model, and year of your dream car?',
   change_recovery_question13: 'Who is your childhood sports hero?'
 }
-
-module.exports = strings

packages/edge-login-ui-rn/src/components/abSpecific/ImageHeaderComponent.js

@@ -20,7 +20,7 @@ type Props = {
   onDelete(string): void
 }
 
-class UserListItem extends React.Component<Props> {
+export class UserListItem extends React.Component<Props> {
   handleDelete = () => {
     this.props.onDelete(this.props.data)
   }
@@ -65,5 +65,3 @@ class UserListItem extends React.Component<Props> {
     )
   }
 }
-
-export { UserListItem }

packages/edge-login-ui-rn/src/components/abSpecific/UserListItem.js

@@ -22,7 +22,7 @@ type State = {
   pressed: boolean
 }
 
-class Button extends React.Component<Props, State> {
+export class Button extends React.Component<Props, State> {
   constructor(props: Props) {
     super(props)
     this.state = {
@@ -92,5 +92,3 @@ class Button extends React.Component<Props, State> {
     }
   }
 }
-
-export { Button }

packages/edge-login-ui-rn/src/components/common/Button.js

@@ -17,7 +17,7 @@ type Props = {
 type State = {
   onOff: boolean
 }
-class Checkbox extends React.Component<Props, State> {
+export class Checkbox extends React.Component<Props, State> {
   constructor(props: Props) {
     super(props)
     this.state = {
@@ -80,5 +80,3 @@ class Checkbox extends React.Component<Props, State> {
     this.props.onChange(this.state.onOff)
   }
 }
-
-export { Checkbox }