Merge pull request #20 from zingolabs/updated_symbols_to_new_name_DAO

Updated Symbols - New DAO name
zingolabs · May 17, 2022 · cd76351 · cd76351
2 parents f1852e8 + 50b9d38
commit cd76351
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 23 deletions.
diff --git a/App.tsx b/App.tsx
@@ -138,7 +138,7 @@ class LoadingView extends Component<LoadingProps, LoadingState> {
             justifyContent: 'center',
           },
         ]}>
-        {screen === 0 && <Text style={{color: '#FFFFFF', fontSize: 36, fontWeight: 'bold'}}>Zecwallet Lite</Text>}
+        {screen === 0 && <Text style={{color: '#FFFFFF', fontSize: 36, fontWeight: 'bold'}}>zecwallet DAO</Text>}
         {screen === 1 && (
           <View
             style={[
@@ -154,7 +154,7 @@ class LoadingView extends Component<LoadingProps, LoadingState> {
                 source={require('./assets/img/logobig.png')}
                 style={{width: 100, height: 100, resizeMode: 'contain'}}
               />
-              <BoldText>Zecwallet Lite</BoldText>
+              <BoldText>zecwallet DAO</BoldText>
             </View>
 
             <Button type="Primary" title="Create New Wallet" disabled={actionButtonsDisabled} onPress={this.createNewWallet} />

diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">Zecwallet Lite</string>
+    <string name="app_name">zecwallet DAO</string>
 </resources>
diff --git a/app/LoadedApp.tsx b/app/LoadedApp.tsx
@@ -76,7 +76,7 @@ function Menu({onItemSelected}: any) {
         </RegText>
 
         <RegText onPress={() => onItemSelected('About')} style={styles.item}>
-          About Zecwallet Lite
+          About zecwallet DAO
         </RegText>
       </View>
     </ScrollView>

diff --git a/components/About.tsx b/components/About.tsx
@@ -21,7 +21,7 @@ const AboutModal: React.FunctionComponent<AboutModalProps> = ({closeModal}) => {
       }}>
       <View>
         <View style={{alignItems: 'center', backgroundColor: colors.card, paddingBottom: 25, paddingTop: 25}}>
-          <Text style={{marginTop: 5, padding: 5, color: colors.text, fontSize: 28}}>Zecwallet Lite v1.7.8</Text>
+          <Text style={{marginTop: 5, padding: 5, color: colors.text, fontSize: 28}}>zecwallet DAO v1.7.8</Text>
         </View>
         <View style={{display: 'flex', alignItems: 'center', marginTop: -25}}>
           <Image source={require('../assets/img/logobig.png')} style={{width: 50, height: 50, resizeMode: 'contain'}} />

diff --git a/components/InfoModal.tsx b/components/InfoModal.tsx
@@ -58,7 +58,7 @@ const InfoModal: React.FunctionComponent<InfoModalProps> = ({info, closeModal})
         </View>
 
         <View style={{display: 'flex', margin: 10}}>
-          <DetailLine label="Wallet Version" value="Zecwallet Lite v1.7.8" />
+          <DetailLine label="Wallet Version" value="zecwallet DAO v1.7.8" />
           <DetailLine label="Server Version" value={info?.version} />
           <DetailLine label="Lightwallet Server URL" value={info?.serverUri} />
           <DetailLine label="Network" value={info?.testnet ? 'Testnet' : 'Mainnet'} />

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -256,6 +256,8 @@ PODS:
   - React-jsinspector (0.64.1)
   - react-native-appearance (0.3.4):
     - React
+  - react-native-biometrics (2.1.4):
+    - React
   - react-native-camera (3.44.1):
     - React-Core
     - react-native-camera/RCT (= 3.44.1)
@@ -421,6 +423,7 @@ DEPENDENCIES:
   - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
   - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
   - react-native-appearance (from `../node_modules/react-native-appearance`)
+  - react-native-biometrics (from `../node_modules/react-native-biometrics`)
   - react-native-camera (from `../node_modules/react-native-camera`)
   - react-native-pager-view (from `../node_modules/react-native-pager-view`)
   - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
@@ -497,6 +500,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/jsinspector"
   react-native-appearance:
     :path: "../node_modules/react-native-appearance"
+  react-native-biometrics:
+    :path: "../node_modules/react-native-biometrics"
   react-native-camera:
     :path: "../node_modules/react-native-camera"
   react-native-pager-view:
@@ -551,7 +556,7 @@ SPEC CHECKSUMS:
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
   FBLazyVector: 7b423f9e248eae65987838148c36eec1dbfe0b53
-  FBReactNativeSpec: 364b6771de32b25d979b5b2e76065e9ec01703af
+  FBReactNativeSpec: 69275c078f660322f2df6b27d5d863a482765199
   Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021
   Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
   Flipper-Folly: 755929a4f851b2fb2c347d533a23f191b008554c
@@ -575,6 +580,7 @@ SPEC CHECKSUMS:
   React-jsiexecutor: 124e8f99992490d0d13e0649d950d3e1aae06fe9
   React-jsinspector: 500a59626037be5b3b3d89c5151bc3baa9abf1a9
   react-native-appearance: 0f0e5fc2fcef70e03d48c8fe6b00b9158c2ba8aa
+  react-native-biometrics: 9d3306e5d29c3bc4e6a3c912d759a94e76a2f683
   react-native-camera: 7bf59f2728ffb019fa25e60a225d2c57e1a8f0f6
   react-native-pager-view: 2864530d861ab2970beb2cd0b4cf2292cd30cd84
   react-native-safe-area-context: f0906bf8bc9835ac9a9d3f97e8bde2a997d8da79
@@ -604,4 +610,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 16d9b8743d81976fd242188201758f6cfce4466a
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.11.2
diff --git a/ios/ZecwalletMobile.xcodeproj/project.pbxproj b/ios/ZecwalletMobile.xcodeproj/project.pbxproj
@@ -36,7 +36,7 @@
 		00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		00E356F21AD99517003FC87E /* ZecwalletMobileTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZecwalletMobileTests.m; sourceTree = "<group>"; };
 		139FC776D22970EDA9C040D6 /* Pods-ZecwalletMobile.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ZecwalletMobile.debug.xcconfig"; path = "Target Support Files/Pods-ZecwalletMobile/Pods-ZecwalletMobile.debug.xcconfig"; sourceTree = "<group>"; };
-		13B07F961A680F5B00A75B9A /* Zecwallet Lite.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Zecwallet Lite.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		13B07F961A680F5B00A75B9A /* zecwallet DAO.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "zecwallet DAO.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = ZecwalletMobile/AppDelegate.h; sourceTree = "<group>"; };
 		13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = ZecwalletMobile/AppDelegate.m; sourceTree = "<group>"; };
 		13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = ZecwalletMobile/Images.xcassets; sourceTree = "<group>"; };
@@ -148,7 +148,7 @@
 		83CBBA001A601CBA00E9B192 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				13B07F961A680F5B00A75B9A /* Zecwallet Lite.app */,
+				13B07F961A680F5B00A75B9A /* zecwallet DAO.app */,
 				00E356EE1AD99517003FC87E /* ZecwalletMobileTests.xctest */,
 			);
 			name = Products;
@@ -208,7 +208,7 @@
 			);
 			name = ZecwalletMobile;
 			productName = ZecwalletMobile;
-			productReference = 13B07F961A680F5B00A75B9A /* Zecwallet Lite.app */;
+			productReference = 13B07F961A680F5B00A75B9A /* zecwallet DAO.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -451,6 +451,7 @@
 			baseConfigurationReference = 65B24C2E2D48C83D6B5DDF6E /* Pods-ZecwalletMobile-ZecwalletMobileTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
+				DEVELOPMENT_TEAM = Z89CFRJ62L;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -479,6 +480,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				COPY_PHASE_STRIP = NO;
+				DEVELOPMENT_TEAM = Z89CFRJ62L;
 				INFOPLIST_FILE = ZecwalletMobileTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -504,7 +506,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = 48;
-				DEVELOPMENT_TEAM = 5N76B7JDDT;
+				DEVELOPMENT_TEAM = Z89CFRJ62L;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = ZecwalletMobile/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -521,8 +523,8 @@
 					"-ObjC",
 					"-lc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = co.zecwallet.lite.ios;
-				PRODUCT_NAME = "Zecwallet Lite";
+				PRODUCT_BUNDLE_IDENTIFIER = app.zecwalletdao.zecwalletdao;
+				PRODUCT_NAME = "zecwallet DAO";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -537,7 +539,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = 48;
-				DEVELOPMENT_TEAM = 5N76B7JDDT;
+				DEVELOPMENT_TEAM = Z89CFRJ62L;
 				INFOPLIST_FILE = ZecwalletMobile/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -553,8 +555,8 @@
 					"-ObjC",
 					"-lc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = co.zecwallet.lite.ios;
-				PRODUCT_NAME = "Zecwallet Lite";
+				PRODUCT_BUNDLE_IDENTIFIER = app.zecwalletdao.zecwalletdao;
+				PRODUCT_NAME = "zecwallet DAO";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";

diff --git a/ios/ZecwalletMobile.xcodeproj/xcshareddata/xcschemes/ZecwalletMobile.xcscheme b/ios/ZecwalletMobile.xcodeproj/xcshareddata/xcschemes/ZecwalletMobile.xcscheme
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-               BuildableName = "Zecwallet Lite.app"
+               BuildableName = "zecwallet DAO.app"
                BlueprintName = "ZecwalletMobile"
                ReferencedContainer = "container:ZecwalletMobile.xcodeproj">
             </BuildableReference>
@@ -55,7 +55,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-            BuildableName = "Zecwallet Lite.app"
+            BuildableName = "zecwallet DAO.app"
             BlueprintName = "ZecwalletMobile"
             ReferencedContainer = "container:ZecwalletMobile.xcodeproj">
          </BuildableReference>
@@ -72,7 +72,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
-            BuildableName = "Zecwallet Lite.app"
+            BuildableName = "zecwallet DAO.app"
             BlueprintName = "ZecwalletMobile"
             ReferencedContainer = "container:ZecwalletMobile.xcodeproj">
          </BuildableReference>

diff --git a/ios/ZecwalletMobile/Base.lproj/LaunchScreen.xib b/ios/ZecwalletMobile/Base.lproj/LaunchScreen.xib
@@ -13,7 +13,7 @@
             <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Zecwallet Lite" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="zecwallet DAO" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
                     <rect key="frame" x="20" y="128" width="441" height="55"/>
                     <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

diff --git a/ios/ZecwalletMobile/Info.plist b/ios/ZecwalletMobile/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
-	<string>$(PRODUCT_NAME)</string>
+	<string>Zecwallet DAO</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>

diff --git a/ios/ZecwalletMobile/LaunchScreen.storyboard b/ios/ZecwalletMobile/LaunchScreen.storyboard
@@ -16,7 +16,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Zecwallet Lite" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="zecwallet DAO" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
                                 <rect key="frame" x="0.0" y="202" width="375" height="43"/>
                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
                                 <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

diff --git a/package.json b/package.json
@@ -31,6 +31,7 @@
     "react-moment": "^1.1.1",
     "react-native": "0.64.1",
     "react-native-appearance": "^0.3.4",
+    "react-native-biometrics": "^2.1.4",
     "react-native-camera": "^3.43.6",
     "react-native-gesture-handler": "^1.10.3",
     "react-native-localize": "^2.0.3",

diff --git a/yarn.lock b/yarn.lock
@@ -6196,6 +6196,11 @@ react-native-appearance@^0.3.4:
     invariant "^2.2.4"
     use-subscription "^1.0.0"
 
+react-native-biometrics@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/react-native-biometrics/-/react-native-biometrics-2.1.4.tgz#e201e9f18baeb560eeaba8d41fbd4f90d04152fe"
+  integrity sha512-Ek7NmzgHB4rot2DdzV9Q3pzxFjnEFipGSFsmWZw5vcM9vkMoebhz8d8UYgsp0efroyeLITDNHwcFGEzq8XW9Kg==
+
 react-native-camera@^3.43.6:
   version "3.44.1"
   resolved "https://registry.yarnpkg.com/react-native-camera/-/react-native-camera-3.44.1.tgz#60e7d60fe778c1fc59d0579b64c63c3c1a59865a"