feat(mosip#625):[Tilak/Adityan] fix Verify Button going behind the sc…

…reen and Purple theme button being large in multiple places
tw-mosip · Mar 10, 2023 · 5f30f7b · 5f30f7b
1 parent fa142c6
commit 5f30f7b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/components/ui/themes/PurpleTheme.ts b/components/ui/themes/PurpleTheme.ts
@@ -345,7 +345,6 @@ export const PurpleTheme = {
       backgroundColor: Colors.Transparent,
     },
     radius: {
-      flex: 1,
       borderRadius: 10,
       backgroundColor: Colors.Purple,
     },

diff --git a/screens/QrLogin/MyBindedVcs.tsx b/screens/QrLogin/MyBindedVcs.tsx
@@ -25,7 +25,7 @@ export const MyBindedVcs: React.FC<MyBindedVcsProps> = (props) => {
         <Column fill style={{ display: props.isVisible ? 'flex' : 'none' }}>
           <Column fill>
             {controller.vcKeys.length > 0 && (
-              <React.Fragment>
+              <>
                 <Column
                   fill
                   backgroundColor={Theme.Colors.lightGreyBackgroundColor}>
@@ -45,24 +45,25 @@ export const MyBindedVcs: React.FC<MyBindedVcsProps> = (props) => {
                         ))}
                     </Column>
                   </Column>
-                  <Column
-                    style={{
-                      borderTopRightRadius: 27,
-                      borderTopLeftRadius: 27,
-                    }}
-                    padding="16 24"
-                    margin="2 0 0 0"
-                    elevation={2}>
-                    <Button
-                      title={t('verify')}
-                      margin="0 0 12 0"
-                      styles={Theme.ButtonStyles.radius}
-                      disabled={controller.selectedIndex == null}
-                      onPress={controller.VERIFY}
-                    />
-                  </Column>
                 </Column>
-              </React.Fragment>
+                <Column
+                  fill
+                  align="flex-end"
+                  style={{
+                    borderTopRightRadius: 27,
+                    borderTopLeftRadius: 27,
+                  }}
+                  padding="16 24"
+                  margin="2 0 0 0"
+                  elevation={2}>
+                  <Button
+                    title={t('verify')}
+                    styles={Theme.ButtonStyles.radius}
+                    disabled={controller.selectedIndex == null}
+                    onPress={controller.VERIFY}
+                  />
+                </Column>
+              </>
             )}
             {controller.vcKeys.length === 0 && (
               <React.Fragment>